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/walker.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libidu/walker.c') diff --git a/libidu/walker.c b/libidu/walker.c index 80d1b59..63fba09 100644 --- a/libidu/walker.c +++ b/libidu/walker.c @@ -46,7 +46,7 @@ struct file_link *make_link_from_dirent __P((struct dirent *dirent, struct file_ struct file_link *get_link_from_string __P((char const *name, struct file_link *parent)); struct file_link *make_link_from_string __P((char const *name, struct file_link *parent)); int lang_wanted __P((char const *lang_name)); -char **append_strings_to_vector __P((char **vector_0, char *string, char *delimiter_class)); +char **append_strings_to_vector __P((char **vector_0, char *string, char const *delimiter_class)); int vector_length __P((char **vector)); int string_in_vector __P((char const *string, char **vector)); static int same_as_dot __P((char const *cwd)); @@ -77,7 +77,7 @@ struct member_file *maybe_get_member_file __P((struct file_link *flink, struct s static struct file_link *current_dir_link = 0; -static char white_space[] = " \t\r\n\v\f"; +static char const white_space[] = " \t\r\n\v\f"; char* xgetcwd __P((void)); @@ -242,7 +242,7 @@ mark_member_file_links (struct idhead *idhp) 0, member_file_qsort_compare); struct member_file **end = &members_0[idhp->idh_member_file_table.ht_fill]; struct member_file **members; - int new_index = 0; + long new_index = 0; for (members = members_0; members < end; members++) { @@ -467,7 +467,7 @@ exclude_languages (char *lang_names) } char ** -append_strings_to_vector (char **vector_0, char *string, char *delimiter_class) +append_strings_to_vector (char **vector_0, char *string, char const *delimiter_class) { char **vector; if (vector_0) @@ -650,7 +650,7 @@ chdir_to_link (struct file_link *dir_link) } char ** -vectorize_string (char *string, char *delimiter_class) +vectorize_string (char *string, char const *delimiter_class) { char **vector_0 = MALLOC (char *, 2 + strlen (string) / 2); char **vector = vector_0; -- cgit v1.2.3