hashmap: convert sha1hash() to oidhash()

There are no callers left of sha1hash() that do not simply pass the
"hash" member of a "struct object_id". Let's get rid of the outdated
sha1-specific function and provide one that operates on the whole struct
(even though the technique, taking the first few bytes of the hash, will
remain the same).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/describe.c b/builtin/describe.c
index 0a5cde00a20bae2997dfe2e9b26cc10190d3d186..200154297d5ea8baddda52e39cd4de302595bfcc 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -76,7 +76,7 @@ static int commit_name_neq(const void *unused_cmp_data,
 
 static inline struct commit_name *find_commit_name(const struct object_id *peeled)
 {
 
 static inline struct commit_name *find_commit_name(const struct object_id *peeled)
 {

-       return hashmap_get_from_hash(&names, sha1hash(peeled->hash), peeled);
+       return hashmap_get_from_hash(&names, oidhash(peeled), peeled);

 }
 
 static int replace_name(struct commit_name *e,
 }
 
 static int replace_name(struct commit_name *e,


@@ -123,7 +123,7 @@ static void add_to_known_names(const char *path,
                if (!e) {
                        e = xmalloc(sizeof(struct commit_name));
                        oidcpy(&e->peeled, peeled);
                if (!e) {
                        e = xmalloc(sizeof(struct commit_name));
                        oidcpy(&e->peeled, peeled);

-                       hashmap_entry_init(e, sha1hash(peeled->hash));
+                       hashmap_entry_init(e, oidhash(peeled));

                        hashmap_add(&names, e);
                        e->path = NULL;
                }
                        hashmap_add(&names, e);
                        e->path = NULL;
                }

diff --git a/decorate.c b/decorate.c
index de31331fa425429cf3c05078761b9bcf52fb0a45..a605b1b5f4ac7844693919ca8afee3a699d1b424 100644 (file)
--- a/decorate.c
+++ b/decorate.c
@@ -8,7 +8,7 @@
 
 static unsigned int hash_obj(const struct object *obj, unsigned int n)
 {
 
 static unsigned int hash_obj(const struct object *obj, unsigned int n)
 {

-       return sha1hash(obj->oid.hash) % n;
+       return oidhash(&obj->oid) % n;

 }
 
 static void *insert_decoration(struct decoration *n, const struct object *base, void *decoration)
 }
 
 static void *insert_decoration(struct decoration *n, const struct object *base, void *decoration)

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 07bd34b63145e1dc179afebcc7af351c34c2ab07..1e50d491c12af19b91268451a5c88f82bd27e272 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -266,7 +266,7 @@ static unsigned int hash_filespec(struct repository *r,
                hash_object_file(filespec->data, filespec->size, "blob",
                                 &filespec->oid);
        }
                hash_object_file(filespec->data, filespec->size, "blob",
                                 &filespec->oid);
        }

-       return sha1hash(filespec->oid.hash);
+       return oidhash(&filespec->oid);

 }
 
 static int find_identical_files(struct hashmap *srcs,
 }
 
 static int find_identical_files(struct hashmap *srcs,

diff --git a/hashmap.h b/hashmap.h
index f95593b6cfd7cecfbcc4584d74ac040cb355c767..84249115664b4a3d576c619075cb8ca396fff0ed 100644 (file)
--- a/hashmap.h
+++ b/hashmap.h
@@ -1,6 +1,8 @@
 #ifndef HASHMAP_H
 #define HASHMAP_H
 
 #ifndef HASHMAP_H
 #define HASHMAP_H
 

+#include "hash.h"
+

 /*
  * Generic implementation of hash-based key-value mappings.
  *
 /*
  * Generic implementation of hash-based key-value mappings.
  *


@@ -118,14 +120,14 @@ unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len);
  * the results will be different on big-endian and little-endian
  * platforms, so they should not be stored or transferred over the net.
  */
  * the results will be different on big-endian and little-endian
  * platforms, so they should not be stored or transferred over the net.
  */

-static inline unsigned int sha1hash(const unsigned char *sha1)
+static inline unsigned int oidhash(const struct object_id *oid)

 {
        /*
 {
        /*

-        * Equivalent to 'return *(unsigned int *)sha1;', but safe on
+        * Equivalent to 'return *(unsigned int *)oid->hash;', but safe on

         * platforms that don't support unaligned reads.
         */
        unsigned int hash;
         * platforms that don't support unaligned reads.
         */
        unsigned int hash;

-       memcpy(&hash, sha1, sizeof(hash));
+       memcpy(&hash, oid->hash, sizeof(hash));

        return hash;
 }
 
        return hash;
 }
 

diff --git a/khash.h b/khash.h
index f911d2b0050581c0d926f819d21091fdd3e806b1..21c2095216cb5dcb8be372d82443a8dd1c1435c8 100644 (file)
--- a/khash.h
+++ b/khash.h
@@ -326,7 +326,7 @@ static const double __ac_HASH_UPPER = 0.77;
 
 static inline unsigned int oidhash_by_value(struct object_id oid)
 {
 
 static inline unsigned int oidhash_by_value(struct object_id oid)
 {

-       return sha1hash(oid.hash);
+       return oidhash(&oid);

 }
 
 static inline int oideq_by_value(struct object_id a, struct object_id b)
 }
 
 static inline int oideq_by_value(struct object_id a, struct object_id b)

diff --git a/object.c b/object.c
index 317647da3e55985a23194229926af1ecaae4b65f..94db02214acfe788b567c9a9c277438a8b59f2a4 100644 (file)
--- a/object.c
+++ b/object.c
@@ -61,7 +61,7 @@ int type_from_string_gently(const char *str, ssize_t len, int gentle)
  */
 static unsigned int hash_obj(const struct object_id *oid, unsigned int n)
 {
  */
 static unsigned int hash_obj(const struct object_id *oid, unsigned int n)
 {

-       return sha1hash(oid->hash) & (n - 1);
+       return oidhash(oid) & (n - 1);

 }
 
 /*
 }
 
 /*

diff --git a/pack-objects.c b/pack-objects.c
index 00a5f6e0ec575af5a172f9771df52877eeaf664c..52560293b6268b792803e5b2c89b3a96840c0bf9 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -11,7 +11,7 @@ static uint32_t locate_object_entry_hash(struct packing_data *pdata,
 {
        uint32_t i, mask = (pdata->index_size - 1);
 
 {
        uint32_t i, mask = (pdata->index_size - 1);
 

-       i = sha1hash(oid->hash) & mask;
+       i = oidhash(oid) & mask;

 
        while (pdata->index[i] > 0) {
                uint32_t pos = pdata->index[i] - 1;
 
        while (pdata->index[i] > 0) {
                uint32_t pos = pdata->index[i] - 1;

diff --git a/patch-ids.c b/patch-ids.c
index f70d3966542d0d5b9b0e749bbe4b61968a30bcac..e8c150d0c92a5f796011e811b750c783d1eee9db 100644 (file)
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -83,7 +83,7 @@ static int init_patch_id_entry(struct patch_id *patch,
        if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))
                return -1;
 
        if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))
                return -1;
 

-       hashmap_entry_init(patch, sha1hash(header_only_patch_id.hash));
+       hashmap_entry_init(patch, oidhash(&header_only_patch_id));

        return 0;
 }
 
        return 0;
 }