Merge branch 'bb/compat-util-comment-fix'

[thirdparty/git.git] / oidmap.c

diff --git a/oidmap.c b/oidmap.c
index b0841a0f5870bafdcaf3482ed725e43ddaf5d461..423aa014a33eda2c6b695906eb0c349552d9e2b8 100644 (file)
--- a/oidmap.c
+++ b/oidmap.c
@@ -2,21 +2,18 @@
 #include "oidmap.h"
 
 static int oidmap_neq(const void *hashmap_cmp_fn_data,
-                     const void *entry, const void *entry_or_key,
+                     const struct hashmap_entry *e1,
+                     const struct hashmap_entry *e2,
                      const void *keydata)
 {
-       const struct oidmap_entry *entry_ = entry;
-       if (keydata)
-               return !oideq(&entry_->oid, (const struct object_id *) keydata);
-       return !oideq(&entry_->oid,
-                     &((const struct oidmap_entry *) entry_or_key)->oid);
-}
+       const struct oidmap_entry *a, *b;
 
-static int hash(const struct object_id *oid)
-{
-       int hash;
-       memcpy(&hash, oid->hash, sizeof(hash));
-       return hash;
+       a = container_of(e1, const struct oidmap_entry, internal_entry);
+       b = container_of(e2, const struct oidmap_entry, internal_entry);
+
+       if (keydata)
+               return !oideq(&a->oid, (const struct object_id *) keydata);
+       return !oideq(&a->oid, &b->oid);
 }
 
 void oidmap_init(struct oidmap *map, size_t initial_size)
@@ -28,7 +25,9 @@ void oidmap_free(struct oidmap *map, int free_entries)
 {
        if (!map)
                return;
-       hashmap_free(&map->map, free_entries);
+
+       /* TODO: make oidmap itself not depend on struct layouts */
+       hashmap_free_(&map->map, free_entries ? 0 : -1);
 }
 
 void *oidmap_get(const struct oidmap *map, const struct object_id *key)
@@ -36,7 +35,7 @@ void *oidmap_get(const struct oidmap *map, const struct object_id *key)
        if (!map->map.cmpfn)
                return NULL;
 
-       return hashmap_get_from_hash(&map->map, hash(key), key);
+       return hashmap_get_from_hash(&map->map, oidhash(key), key);
 }
 
 void *oidmap_remove(struct oidmap *map, const struct object_id *key)
@@ -46,7 +45,7 @@ void *oidmap_remove(struct oidmap *map, const struct object_id *key)
        if (!map->map.cmpfn)
                oidmap_init(map, 0);
 
-       hashmap_entry_init(&entry, hash(key));
+       hashmap_entry_init(&entry, oidhash(key));
        return hashmap_remove(&map->map, &entry, key);
 }
 
@@ -57,6 +56,6 @@ void *oidmap_put(struct oidmap *map, void *entry)
        if (!map->map.cmpfn)
                oidmap_init(map, 0);
 
-       hashmap_entry_init(&to_put->internal_entry, hash(&to_put->oid));
-       return hashmap_put(&map->map, to_put);
+       hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));
+       return hashmap_put(&map->map, &to_put->internal_entry);
 }