Use Bob Jenkins lookup3 hash instead of FNV.

[pspp-builds.git] / src / libpspp / i18n.c

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 74ec1f1fdeb18c0116c95d8e30b6e12cd57381e6..f10a52a50e271a4081bfff8252429d4b3edc856f 100644 (file)
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -57,7 +57,7 @@ create_iconv (const char* tocode, const char* fromcode)
   struct hmapx_node *node;
   struct converter *converter;
 
-  hash = hsh_hash_string (tocode) ^ hsh_hash_string (fromcode);
+  hash = hash_string (tocode, hash_string (fromcode, 0));
   HMAPX_FOR_EACH_WITH_HASH (converter, node, hash, &map)
     if (!strcmp (tocode, converter->tocode)
         && !strcmp (fromcode, converter->fromcode))
@@ -263,9 +263,12 @@ void
 i18n_done (void)
 {
   struct hmapx_node *node;
-  iconv_t conv;
-  HMAPX_FOR_EACH (conv, node, &map)
-    iconv_close (conv);
+  struct converter *cvtr;
+  HMAPX_FOR_EACH (cvtr, node, &map)
+    {
+      iconv_close (cvtr->conv);
+      free (cvtr);
+    }
 
   hmapx_destroy (&map);