The index into object hash was computed in two different places,
risking them to diverge. Implement a single helper function and
use it in these two locations.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
object.c | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/object.c b/object.c
index 35ff130..4ff2d7d 100644
--- a/object.c
+++ b/object.c
@@ -43,23 +43,16 @@ struct object *get_indexed_object(unsigned int idx)
return obj_hash[idx];
}
-static unsigned int hash_obj(struct object *obj, unsigned int n)
+static unsigned int hash_val(const unsigned char *sha1)
{
unsigned int hash;
- memcpy(&hash, obj->sha1, sizeof(unsigned int));
- return hash % n;
-}
-
-static unsigned int hashtable_index(const unsigned char *sha1)
-{
- unsigned int i;
- memcpy(&i, sha1, sizeof(unsigned int));
- return i % obj_hash_size;
+ memcpy(&hash, sha1, sizeof(unsigned int));
+ return hash;
}
static void insert_obj_hash(struct object *obj, struct object **hash, unsigned int size)
{
- unsigned int j = hash_obj(obj, size);
+ unsigned int j = hash_val(obj->sha1) % size;
while (hash[j]) {
j++;
@@ -77,7 +70,7 @@ struct object *lookup_object(const unsigned char *sha1)
if (!obj_hash)
return NULL;
- i = hashtable_index(sha1);
+ i = hash_val(sha1) % obj_hash_size;
while ((obj = obj_hash[i]) != NULL) {
if (!hashcmp(sha1, obj->sha1))
break;
--
1.7.6.433.g1421f
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html