X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fhash.h;h=fc1af28a97cddf854b96d54e1910cd2e0b83d836;hb=9a261f6811c5c700c952d8e08022e31c75305342;hp=77e76d0850008ea413e99a80c23d49a9f7610e4a;hpb=68af56be3e061b97cf97150094bc50b0aa364cbb;p=gnulib.git

diff --git a/lib/hash.h b/lib/hash.h
index 77e76d085..fc1af28a9 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -2,10 +2,10 @@
    Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
    Written by Jim Meyering <meyering@ascend.com>, 1998.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* A generic hash table package.  */
 
@@ -25,8 +24,9 @@
 # define HASH_H_
 
 # include <stdio.h>
+# include <stdbool.h>
 
-typedef unsigned (*Hash_hasher) (const void *, unsigned);
+typedef size_t (*Hash_hasher) (const void *, size_t);
 typedef bool (*Hash_comparator) (const void *, const void *);
 typedef void (*Hash_data_freer) (void *);
 typedef bool (*Hash_processor) (void *, void *);
@@ -56,10 +56,10 @@ struct hash_table;
 typedef struct hash_table Hash_table;
 
 /* Information and lookup.  */
-unsigned hash_get_n_buckets (const Hash_table *);
-unsigned hash_get_n_buckets_used (const Hash_table *);
-unsigned hash_get_n_entries (const Hash_table *);
-unsigned hash_get_max_bucket_length (const Hash_table *);
+size_t hash_get_n_buckets (const Hash_table *);
+size_t hash_get_n_buckets_used (const Hash_table *);
+size_t hash_get_n_entries (const Hash_table *);
+size_t hash_get_max_bucket_length (const Hash_table *);
 bool hash_table_ok (const Hash_table *);
 void hash_print_statistics (const Hash_table *, FILE *);
 void *hash_lookup (const Hash_table *, const void *);
@@ -67,20 +67,20 @@ void *hash_lookup (const Hash_table *, const void *);
 /* Walking.  */
 void *hash_get_first (const Hash_table *);
 void *hash_get_next (const Hash_table *, const void *);
-unsigned hash_get_entries (const Hash_table *, void **, unsigned);
-unsigned hash_do_for_each (const Hash_table *, Hash_processor, void *);
+size_t hash_get_entries (const Hash_table *, void **, size_t);
+size_t hash_do_for_each (const Hash_table *, Hash_processor, void *);
 
 /* Allocation and clean-up.  */
-unsigned hash_string (const char *, unsigned);
+size_t hash_string (const char *, size_t);
 void hash_reset_tuning (Hash_tuning *);
-Hash_table *hash_initialize (unsigned, const Hash_tuning *,
+Hash_table *hash_initialize (size_t, const Hash_tuning *,
 			     Hash_hasher, Hash_comparator,
 			     Hash_data_freer);
 void hash_clear (Hash_table *);
 void hash_free (Hash_table *);
 
 /* Insertion and deletion.  */
-bool hash_rehash (Hash_table *, unsigned);
+bool hash_rehash (Hash_table *, size_t);
 void *hash_insert (Hash_table *, const void *);
 void *hash_delete (Hash_table *, const void *);