X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fhash.c;h=1d7a59d113d6bf1c5a000ebf147cdcf888e834d2;hb=eeedc1da55cffb2f03fe8eaaad1a595ed698d668;hp=e26d0d047602e92c841cc686a71150c89664820d;hpb=b6044c6ab01d1b8131d6310f6341b4bf1d052a75;p=gnulib.git diff --git a/lib/hash.c b/lib/hash.c index e26d0d047..1d7a59d11 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -1,5 +1,5 @@ /* hash - hashing table processing. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. Written by Jim Meyering, 1992. This program is free software; you can redistribute it and/or modify @@ -35,9 +35,16 @@ typedef enum {false = 0, true = 1} bool; #include #include +#ifndef HAVE_DECL_FREE +"this configure-time declaration test was not run" +#endif #if !HAVE_DECL_FREE void free (); #endif + +#ifndef HAVE_DECL_MALLOC +"this configure-time declaration test was not run" +#endif #if !HAVE_DECL_MALLOC char *malloc (); #endif @@ -445,8 +452,8 @@ hash_reset_tuning (Hash_tuning *tuning) /* For the given hash TABLE, check the user supplied tuning structure for reasonable values, and return true if there is no gross error with it. - Otherwise, definitvely reset the TUNING field to some acceptable default in - the hash table (that is, the user loses the right of further modifying + Otherwise, definitively reset the TUNING field to some acceptable default + in the hash table (that is, the user loses the right of further modifying tuning arguments), and return false. */ static bool @@ -468,15 +475,14 @@ check_tuning (Hash_table *table) return false; } -/* Allocate and return a new hash table, or NULL upon failure. The - initial number of buckets is automatically selected so as to _guarantee_ that - you may insert at least CANDIDATE different user entries before any growth - of the hash table size occurs. So, if have a reasonably tight a-priori - upper bound on the - number of entries you intend to insert in the hash table, you may save some - table memory and insertion time, by specifying it here. If the - IS_N_BUCKETS field of the TUNING structure is true, the CANDIDATE argument - has its meaning changed to the wanted number of buckets. +/* Allocate and return a new hash table, or NULL upon failure. The initial + number of buckets is automatically selected so as to _guarantee_ that you + may insert at least CANDIDATE different user entries before any growth of + the hash table size occurs. So, if have a reasonably tight a-priori upper + bound on the number of entries you intend to insert in the hash table, you + may save some table memory and insertion time, by specifying it here. If + the IS_N_BUCKETS field of the TUNING structure is true, the CANDIDATE + argument has its meaning changed to the wanted number of buckets. TUNING points to a structure of user-supplied values, in case some fine tuning is wanted over the default behavior of the hasher. If TUNING is @@ -769,8 +775,8 @@ hash_find_entry (Hash_table *table, const void *entry, /* For an already existing hash table, change the number of buckets through specifying CANDIDATE. The contents of the hash table are preserved. The - new number of buckets is automatically selected so as to _guarantee_ that the - table may receive at least CANDIDATE different user entries, including + new number of buckets is automatically selected so as to _guarantee_ that + the table may receive at least CANDIDATE different user entries, including those already in the table, before any other growth of the hash table size occurs. If TUNING->IS_N_BUCKETS is true, then CANDIDATE specifies the exact number of buckets desired. */