X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flibpspp%2Fhash-functions.c;h=cb97ba37edc99b34718ee9eaeaea94adfd2ad49f;hb=5905c43031658415a3d013e1572bd70e734e3813;hp=af8b4c2c83a68f51423a2e934ed483f6fffa3f1f;hpb=871dc2a4ffe7bd1c1b0a7c5a451ce9e23d4b7969;p=pspp
diff --git a/src/libpspp/hash-functions.c b/src/libpspp/hash-functions.c
index af8b4c2c83..cb97ba37ed 100644
--- 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, 2019 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,50 @@
along with this program. If not, see . */
#include
-#include
+
+#include "libpspp/hash-functions.h"
+
+#if 0
+/* Enable this code only for testing! Theoretically everything
+ should still work, but very inefficient hash tables will result,
+ meaning that the code will be slow. */
+#warning "HASHING FUNCTIONS ARE DISABLED! EXPECT LOTS OF HASH COLLISIONS!!!"
+
+#include "libpspp/compiler.h"
+
+
+unsigned int
+hash_bytes (const void *b UNUSED, size_t s UNUSED, unsigned int basis UNUSED)
+{
+ return 0;
+}
+
+unsigned int
+hash_string (const char *s UNUSED, unsigned int basis UNUSED)
+{
+ return 0;
+}
+
+unsigned int
+hash_int (int i UNUSED, unsigned int basis UNUSED)
+{
+ return 0;
+}
+
+unsigned int
+hash_double (double d UNUSED, unsigned int basis UNUSED)
+{
+ return 0;
+}
+
+unsigned int
+hash_pointer (const void *p UNUSED, unsigned int basis UNUSED)
+{
+ return 0;
+}
+
+#else
+
#include
#include
#include
@@ -100,45 +143,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)
@@ -162,7 +166,7 @@ hash_double (double d, unsigned int basis)
uint32_t tmp[2];
uint32_t a, b, c;
- a = b = c = 0xdeadbeef + 8 + basis;
+ a = b = c = 0xdeadbeefU + 8 + basis;
memcpy (tmp, &d, 8);
a += tmp[0];
@@ -182,3 +186,5 @@ hash_pointer (const void *p, unsigned int basis)
on 64-bit platforms. */
return hash_int ((int) (uintptr_t) p, basis);
}
+
+#endif