* libidu/idfile.h (struct member_file) [mf_index]: Change

type to long.
* libidu/scanners.h (MAX_LEVELS): Remove constant.
(struct token) [tok_hits, tok_name]: Remove members.
[tok_hits_name]: Add member.
(TOKEN_HITS, TOKEN_NAME, OFFSETOF_TOKEN_NAME): Add macros.
* libidu/scanners.c (log_8_member_files): Add variable definition.
(get_token_c, get_token_asm, get_token_text): Use OFFSETOF_TOKEN_NAME.
* libidu/walker.c (mark_member_file_links) [new_index]: Change
variable type to long.
* src/idx.c (scan_member_file): Use TOKEN_NAME.
* src/mkid.c (ceil_log_8) Add function.
(current_hits_signature): Change variable type to (char *).
(main) [log_8_member_files]: Initialize new variable.
[current_hits_signature] Allocate storage.
(scan_member_file): Print member->mf_index as long.
(scan_member_file_1, write_id_file, token_hash_1, token_hash_2,
token_hash_cmp, token_qsort_cmp, summarize, write_hits):
use TOKEN_NAME & TOKEN_HITS.
(init_hits_signature, write_hits): Replace MAX_LEVELS
with log_8_member_files.
* src/xtokid.c (scan_member_file): Use TOKEN_NAME.

* libidu/idfile.h (vectorize_string) [delimiter_class]:
Declare as pointer to const.
* libidu/walker.c (append_strings_to_vector, vectorize_string)
[delimiter_class]: Declare as pointer to const.
(white_space): Declare as array of const.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/idx.c b/src/idx.c
index 60ca5fc..a6fb8c7 100644
--- a/src/idx.c
+++ b/src/idx.c
@@ -106,7 +106,7 @@ main (int argc, char **argv)
 
   if (show_help)
     help_me ();
-  
+
   argc -= optind;
   argv += optind;
 
@@ -159,7 +159,7 @@ scan_member_file (struct member_file const *member)
 
       while ((token = (*get_token) (source_FILE, args, &flags)) != NULL)
 	{
-	  puts (token->tok_name);
+	  puts (TOKEN_NAME (token));
 	  obstack_free (&tokens_obstack, token);
 	}
       close_source_FILE (source_FILE);