prototype of hasher functions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4374dbd794f6d8340ba62bd774a3ba3a3fed6089..675186d345101d52c03b7b71aa7a33ddc3025391 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-05  François Pinard  <pinard@iro.umontreal.ca>
+
+       * combine.c, html.c, names.c, recode.c, testdump.c: Declare the
+       various hasher functions according to the prototype in hash.h.
+       Reported by Bruno Haible.
+
 2008-02-27  François Pinard  <pinard@iro.umontreal.ca>
 
        * hash.c: Revert last change (2008-02-21).  The renaming of symbols

diff --git a/src/combine.c b/src/combine.c
index d5626ee1a99926492fb912ae35ba57995b86d727..5263b6fe53629e97e703284f0579539a6cd1e1a3 100644 (file)
--- a/src/combine.c
+++ b/src/combine.c
@@ -62,8 +62,8 @@
 | Initialize for exploding.  |
 `---------------------------*/
 
-static unsigned
-combined_hash (const void *void_data, unsigned table_size)
+static size_t
+combined_hash (const void *void_data, size_t table_size)
 {
   const unsigned short *data = void_data;
 
@@ -262,8 +262,8 @@ struct state
 | Initialize for combining.  |
 `---------------------------*/
 
-static unsigned
-state_hash (const void *void_data, unsigned table_size)
+static size_t
+state_hash (const void *void_data, size_t table_size)
 {
   const struct state *data = void_data;
 

diff --git a/src/html.c b/src/html.c
index f8ba8d82622077593e186260d62aa11c4d8601bf..1808f7c8dd44497147e1e7f9f39bac1b9b2d798b 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -387,8 +387,8 @@ static struct ucs2_to_string translations [] =
 | Return hash value given TABLE_SIZE.  |
 `-------------------------------------*/
 
-static unsigned
-code_hash (const void *void_data, unsigned table_size)
+static size_t
+code_hash (const void *void_data, size_t table_size)
 {
   struct ucs2_to_string const *data = void_data;
 
@@ -568,8 +568,8 @@ transform_ucs2_html (RECODE_SUBTASK subtask)
 | Return hash value given TABLE_SIZE.  |
 `-------------------------------------*/
 
-static unsigned
-string_hash (const void *void_data, unsigned table_size)
+static size_t
+string_hash (const void *void_data, size_t table_size)
 {
   struct ucs2_to_string const *data = void_data;
 

diff --git a/src/names.c b/src/names.c
index 637c4b8b4cb33e04b895780b44da2e7607844324..8fcaa2863256e311f339341eea61d8a918d2075f 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -84,8 +84,8 @@ check_restricted (RECODE_CONST_OUTER outer,
 | Prepare aliases for initialisation.  |
 `-------------------------------------*/
 
-static unsigned
-alias_hasher (const void *void_alias, unsigned limit)
+static size_t
+alias_hasher (const void *void_alias, size_t limit)
 {
   RECODE_CONST_ALIAS alias = void_alias;
 

diff --git a/src/recode.c b/src/recode.c
index e56125e3e2b88ef419805b2a60e4dde5248da345..746da57c70ce50a775c541172b89ed959adc9b75 100644 (file)
--- a/src/recode.c
+++ b/src/recode.c
@@ -388,8 +388,8 @@ transform_byte_to_ucs2 (RECODE_SUBTASK subtask)
 | Recode a file from double byte UCS-2 characters to one byte characters.  |
 `-------------------------------------------------------------------------*/
 
-static unsigned
-ucs2_to_byte_hash (const void *void_data, unsigned table_size)
+static size_t
+ucs2_to_byte_hash (const void *void_data, size_t table_size)
 {
   const struct ucs2_to_byte *data = void_data;
 

diff --git a/src/testdump.c b/src/testdump.c
index 2f46742408285fc56754d717f0ff362338b565bf..a6907748e9386c434c9db0426b901bf9a8151061 100644 (file)
--- a/src/testdump.c
+++ b/src/testdump.c
@@ -118,8 +118,8 @@ struct ucs2_to_count
     unsigned count;            /* corresponding count */
   };
 
-static unsigned
-ucs2_to_count_hash (const void *void_data, unsigned table_size)
+static size_t
+ucs2_to_count_hash (const void *void_data, size_t table_size)
 {
   const struct ucs2_to_count *data = void_data;