Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / libpspp / hash-functions.c

diff --git a/src/libpspp/hash-functions.c b/src/libpspp/hash-functions.c
index af8b4c2c83a68f51423a2e934ed483f6fffa3f1f..7a8d8162ecaa5f364c984c1a42827994a7cdfd64 100644 (file)
--- a/src/libpspp/hash-functions.c
+++ b/src/libpspp/hash-functions.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
    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
@@ -15,7 +15,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <libpspp/hash-functions.h>
+
+#include "libpspp/hash-functions.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <math.h>
@@ -100,45 +102,6 @@ hash_string (const char *s, unsigned int basis)
   return hash_bytes (s, strlen (s), basis);
 }
 
-/* Returns a hash value for null-terminated string S, with
-   lowercase and uppercase letters treated as equal, starting
-   from BASIS. */
-unsigned int
-hash_case_string (const char *s, unsigned int basis)
-{
-  size_t n = strlen (s);
-  uint32_t a, b, c;
-  uint32_t tmp[3];
-  int i;
-
-  a = b = c = 0xdeadbeef + n + basis;
-
-  while (n >= 12)
-    {
-      for (i = 0; i < 12; i++)
-        ((unsigned char *)tmp)[i] = toupper ((unsigned char) s[i]);
-      a += tmp[0];
-      b += tmp[1];
-      c += tmp[2];
-      HASH_MIX (a, b, c);
-      n -= 12;
-      s += 12;
-    }
-
-  if (n > 0)
-    {
-      memset (tmp, 0, 12);
-      for (i = 0; i < n; i++)
-        ((unsigned char *)tmp)[i] = toupper ((unsigned char) s[i]);
-      a += tmp[0];
-      b += tmp[1];
-      c += tmp[2];
-    }
-
-  HASH_FINAL (a, b, c);
-  return c;
-}
-
 /* Returns a hash value for integer X, starting from BASIS. */
 unsigned int
 hash_int (int x, unsigned int basis)