From daa4c014d740a302d16c516f757e2071ff9c3ac0 Mon Sep 17 00:00:00 2001 From: Greg McGary Date: Mon, 29 Mar 1999 08:16:34 +0000 Subject: * 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. --- libidu/scanners.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libidu/scanners.c') diff --git a/libidu/scanners.c b/libidu/scanners.c index 65a002f..a4a0b70 100644 --- a/libidu/scanners.c +++ b/libidu/scanners.c @@ -40,6 +40,7 @@ struct obstack lang_args_obstack; struct lang_args *lang_args_default = 0; struct lang_args *lang_args_list = 0; struct obstack tokens_obstack; +int log_8_member_files = 0; extern void usage __P((void)); extern char *program_name; @@ -491,7 +492,7 @@ get_token_c (FILE *in_FILE, void const *args, int *flags) unsigned char *id = id_0; int c; - obstack_blank (&tokens_obstack, offsetof (struct token, tok_name)); + obstack_blank (&tokens_obstack, OFFSETOF_TOKEN_NAME); top: c = getc (in_FILE); @@ -876,7 +877,7 @@ get_token_asm (FILE *in_FILE, void const *args, int *flags) unsigned char *id = id_0; int c; - obstack_blank (&tokens_obstack, offsetof (struct token, tok_name)); + obstack_blank (&tokens_obstack, OFFSETOF_TOKEN_NAME); top: c = getc (in_FILE); @@ -1161,7 +1162,7 @@ get_token_text (FILE *in_FILE, void const *args, int *flags) int c; unsigned char *id = id_0; - obstack_blank (&tokens_obstack, offsetof (struct token, tok_name)); + obstack_blank (&tokens_obstack, OFFSETOF_TOKEN_NAME); top: c = getc (in_FILE); -- cgit v1.2.3