From c56e0e39803cbaf0211cedcee4c13e47dfe6f6f9 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Mon, 2 Sep 2013 16:32:27 -0700 Subject: Minor touchups. --- Objects/setobject.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Objects/setobject.c b/Objects/setobject.c index 524bda9..0aec100 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -11,8 +11,10 @@ #include "structmember.h" #include "stringlib/eq.h" -/* This must be >= 1. */ +/* This must be >= 1 */ #define PERTURB_SHIFT 5 + +/* This should be >= PySet_MINSIZE - 1 */ #define LINEAR_PROBES 9 /* Object used as dummy key to fill deleted entries */ @@ -123,7 +125,7 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash) } perturb >>= PERTURB_SHIFT; - i = i * 5 + perturb + 1; + i = i * 5 + 1 + perturb; entry = &table[i & mask]; if (entry->key == NULL) @@ -187,7 +189,7 @@ set_lookkey_unicode(PySetObject *so, PyObject *key, Py_hash_t hash) } perturb >>= PERTURB_SHIFT; - i = i * 5 + perturb + 1; + i = i * 5 + 1 + perturb; entry = &table[i & mask]; if (entry->key == NULL) @@ -257,7 +259,7 @@ set_insert_clean(PySetObject *so, PyObject *key, Py_hash_t hash) goto found_null; } perturb >>= PERTURB_SHIFT; - i = i * 5 + perturb + 1; + i = i * 5 + 1 + perturb; } found_null: so->fill++; -- cgit v0.12