summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-01-14 23:31:34 (GMT)
committerGregory P. Smith <greg@krypto.org>2012-01-14 23:31:34 (GMT)
commit63e6c3222f563cfb156de6e92199e9e35ad5d832 (patch)
treeaf145dbe59f9ec446a9892e94064bf6b989c4086 /Objects
parent515687a7eda26d733c747e08205a1d861bc70673 (diff)
downloadcpython-63e6c3222f563cfb156de6e92199e9e35ad5d832.zip
cpython-63e6c3222f563cfb156de6e92199e9e35ad5d832.tar.gz
cpython-63e6c3222f563cfb156de6e92199e9e35ad5d832.tar.bz2
Consolidate the occurrances of the prime used as the multiplier when hashing
to a single #define instead of having several copies in several files. This excludes the Modules/ tree (datetime and expat both have a copy for their own purposes with no need for it to be the same).
Diffstat (limited to 'Objects')
-rw-r--r--Objects/bytesobject.c2
-rw-r--r--Objects/tupleobject.c2
-rw-r--r--Objects/unicodeobject.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index b10cb5d..8249e5f 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -881,7 +881,7 @@ bytes_hash(PyBytesObject *a)
p = (unsigned char *) a->ob_sval;
x = *p << 7;
while (--len >= 0)
- x = (1000003*x) ^ *p++;
+ x = (_PyHASH_MULTIPLIER*x) ^ *p++;
x ^= Py_SIZE(a);
if (x == -1)
x = -2;
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 8aacd12..f6dbc31 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -315,7 +315,7 @@ tuplehash(PyTupleObject *v)
register Py_hash_t x, y;
register Py_ssize_t len = Py_SIZE(v);
register PyObject **p;
- Py_hash_t mult = 1000003L;
+ Py_hash_t mult = _PyHASH_MULTIPLIER;
x = 0x345678L;
p = v->ob_item;
while (--len >= 0) {
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index c4cfe1b..20528b9 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7666,7 +7666,7 @@ unicode_hash(PyUnicodeObject *self)
p = self->str;
x = *p << 7;
while (--len >= 0)
- x = (1000003*x) ^ *p++;
+ x = (_PyHASH_MULTIPLIER*x) ^ *p++;
x ^= Py_SIZE(self);
if (x == -1)
x = -2;