convert "hashcmp() == 0" to hasheq()

This is the partner patch to the previous one, but covering
the "hash" variants instead of "oid".  Note that our
coccinelle rule is slightly more complex to avoid triggering
the call in hasheq().

I didn't bother to add a new rule to convert:

- hasheq(E1->hash, E2->hash)
+ oideq(E1, E2)

Since these are new functions, there won't be any such
existing callers. And since most of the code is already
using oideq, we're not likely to introduce new ones.

We might still see "!hashcmp(E1->hash, E2->hash)" from topics
in flight. But because our new rule comes after the existing
ones, that should first get converted to "!oidcmp(E1, E2)"
and then to "oideq(E1, E2)".

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

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 32b1d5d38353e9b86215ad6f4a8d189ee3cca113..84e0e8080f3189468a78b9fd13564a5ed812ff65 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -238,7 +238,7 @@ static int will_fetch(struct ref **head, const unsigned char *sha1)
 {
        struct ref *rm = *head;
        while (rm) {
 {
        struct ref *rm = *head;
        while (rm) {

-               if (!hashcmp(rm->old_oid.hash, sha1))
+               if (hasheq(rm->old_oid.hash, sha1))

                        return 1;
                rm = rm->next;
        }
                        return 1;
                rm = rm->next;
        }

diff --git a/cache.h b/cache.h
index d090f717067c275ad4773b5547e6ee73be712388..d97db26bb671418e391c74f34f1e319170f87903 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1053,12 +1053,12 @@ static inline int oideq(const struct object_id *oid1, const struct object_id *oi
 
 static inline int is_null_sha1(const unsigned char *sha1)
 {
 
 static inline int is_null_sha1(const unsigned char *sha1)
 {

-       return !hashcmp(sha1, null_sha1);
+       return hasheq(sha1, null_sha1);

 }
 
 static inline int is_null_oid(const struct object_id *oid)
 {
 }
 
 static inline int is_null_oid(const struct object_id *oid)
 {

-       return !hashcmp(oid->hash, null_sha1);
+       return hasheq(oid->hash, null_sha1);

 }
 
 static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
 }
 
 static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)


@@ -1095,7 +1095,7 @@ static inline void oidread(struct object_id *oid, const unsigned char *hash)
 
 static inline int is_empty_blob_sha1(const unsigned char *sha1)
 {
 
 static inline int is_empty_blob_sha1(const unsigned char *sha1)
 {

-       return !hashcmp(sha1, the_hash_algo->empty_blob->hash);
+       return hasheq(sha1, the_hash_algo->empty_blob->hash);

 }
 
 static inline int is_empty_blob_oid(const struct object_id *oid)
 }
 
 static inline int is_empty_blob_oid(const struct object_id *oid)


@@ -1105,7 +1105,7 @@ static inline int is_empty_blob_oid(const struct object_id *oid)
 
 static inline int is_empty_tree_sha1(const unsigned char *sha1)
 {
 
 static inline int is_empty_tree_sha1(const unsigned char *sha1)
 {

-       return !hashcmp(sha1, the_hash_algo->empty_tree->hash);
+       return hasheq(sha1, the_hash_algo->empty_tree->hash);

 }
 
 static inline int is_empty_tree_oid(const struct object_id *oid)
 }
 
 static inline int is_empty_tree_oid(const struct object_id *oid)

diff --git a/contrib/coccinelle/object_id.cocci b/contrib/coccinelle/object_id.cocci
index 548c02336d66322892eda611d1a2995fee47ae39..d90ba8a0400b81cac8088bce10ed5b6a082e6402 100644 (file)
--- a/contrib/coccinelle/object_id.cocci
+++ b/contrib/coccinelle/object_id.cocci
@@ -114,3 +114,12 @@ expression E1, E2;
 @@
 - oidcmp(E1, E2) == 0
 + oideq(E1, E2)
 @@
 - oidcmp(E1, E2) == 0
 + oideq(E1, E2)

+
+@@
+identifier f != hasheq;
+expression E1, E2;
+@@
+  f(...) {<...
+- hashcmp(E1, E2) == 0
++ hasheq(E1, E2)
+  ...>}

diff --git a/http-walker.c b/http-walker.c
index 7cdfb2f24c76d2f09b39ae2fa97685ecec2d1630..3a8edc7f2fd47718f0a5d257d005e78e08d7d21c 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -483,7 +483,7 @@ static int fetch_object(struct walker *walker, unsigned char *sha1)
 
        list_for_each(pos, head) {
                obj_req = list_entry(pos, struct object_request, node);
 
        list_for_each(pos, head) {
                obj_req = list_entry(pos, struct object_request, node);

-               if (!hashcmp(obj_req->oid.hash, sha1))
+               if (hasheq(obj_req->oid.hash, sha1))

                        break;
        }
        if (obj_req == NULL)
                        break;
        }
        if (obj_req == NULL)

diff --git a/notes.c b/notes.c
index b3386d6c36f937cdfd796ff7116d3dd616e7f2e2..33d16c1ec30c7a904019a37c4262bfd3207b0b94 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -147,7 +147,7 @@ static struct leaf_node *note_tree_find(struct notes_tree *t,
        void **p = note_tree_search(t, &tree, &n, key_sha1);
        if (GET_PTR_TYPE(*p) == PTR_TYPE_NOTE) {
                struct leaf_node *l = (struct leaf_node *) CLR_PTR_TYPE(*p);
        void **p = note_tree_search(t, &tree, &n, key_sha1);
        if (GET_PTR_TYPE(*p) == PTR_TYPE_NOTE) {
                struct leaf_node *l = (struct leaf_node *) CLR_PTR_TYPE(*p);

-               if (!hashcmp(key_sha1, l->key_oid.hash))
+               if (hasheq(key_sha1, l->key_oid.hash))

                        return l;
        }
        return NULL;
                        return l;
        }
        return NULL;

diff --git a/object.c b/object.c
index 51c45945156c421ada403139faefdf145918f4f7..e54160550c5a8e864f2e2bbcc58a29ff73045f8f 100644 (file)
--- a/object.c
+++ b/object.c
@@ -95,7 +95,7 @@ struct object *lookup_object(struct repository *r, const unsigned char *sha1)
 
        first = i = hash_obj(sha1, r->parsed_objects->obj_hash_size);
        while ((obj = r->parsed_objects->obj_hash[i]) != NULL) {
 
        first = i = hash_obj(sha1, r->parsed_objects->obj_hash_size);
        while ((obj = r->parsed_objects->obj_hash[i]) != NULL) {

-               if (!hashcmp(sha1, obj->oid.hash))
+               if (hasheq(sha1, obj->oid.hash))

                        break;
                i++;
                if (i == r->parsed_objects->obj_hash_size)
                        break;
                i++;
                if (i == r->parsed_objects->obj_hash_size)

diff --git a/pack-objects.c b/pack-objects.c
index 6ef87e5683aacdf738c86679712078988c0899fd..2bc762699770d80a55d80a0231c04040973558cd 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -16,7 +16,7 @@ static uint32_t locate_object_entry_hash(struct packing_data *pdata,
        while (pdata->index[i] > 0) {
                uint32_t pos = pdata->index[i] - 1;
 
        while (pdata->index[i] > 0) {
                uint32_t pos = pdata->index[i] - 1;
 

-               if (!hashcmp(sha1, pdata->objects[pos].idx.oid.hash)) {
+               if (hasheq(sha1, pdata->objects[pos].idx.oid.hash)) {

                        *found = 1;
                        return i;
                }
                        *found = 1;
                        return i;
                }

diff --git a/packfile.c b/packfile.c
index ebcb5742ec748d730f8d730ad8b0744e9094d121..c2e96293adfdcf98bdc2eb77a0b1fd296aa632c7 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1015,7 +1015,7 @@ void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1)
 {
        unsigned i;
        for (i = 0; i < p->num_bad_objects; i++)
 {
        unsigned i;
        for (i = 0; i < p->num_bad_objects; i++)

-               if (!hashcmp(sha1, p->bad_object_sha1 + GIT_SHA1_RAWSZ * i))
+               if (hasheq(sha1, p->bad_object_sha1 + GIT_SHA1_RAWSZ * i))

                        return;
        p->bad_object_sha1 = xrealloc(p->bad_object_sha1,
                                      st_mult(GIT_MAX_RAWSZ,
                        return;
        p->bad_object_sha1 = xrealloc(p->bad_object_sha1,
                                      st_mult(GIT_MAX_RAWSZ,


@@ -1031,8 +1031,8 @@ const struct packed_git *has_packed_and_bad(const unsigned char *sha1)
 
        for (p = the_repository->objects->packed_git; p; p = p->next)
                for (i = 0; i < p->num_bad_objects; i++)
 
        for (p = the_repository->objects->packed_git; p; p = p->next)
                for (i = 0; i < p->num_bad_objects; i++)

-                       if (!hashcmp(sha1,
-                                    p->bad_object_sha1 + the_hash_algo->rawsz * i))
+                       if (hasheq(sha1,
+                                  p->bad_object_sha1 + the_hash_algo->rawsz * i))

                                return p;
        return NULL;
 }
                                return p;
        return NULL;
 }


@@ -1830,8 +1830,8 @@ static int fill_pack_entry(const struct object_id *oid,
        if (p->num_bad_objects) {
                unsigned i;
                for (i = 0; i < p->num_bad_objects; i++)
        if (p->num_bad_objects) {
                unsigned i;
                for (i = 0; i < p->num_bad_objects; i++)

-                       if (!hashcmp(oid->hash,
-                                    p->bad_object_sha1 + the_hash_algo->rawsz * i))
+                       if (hasheq(oid->hash,
+                                  p->bad_object_sha1 + the_hash_algo->rawsz * i))

                                return 0;
        }
 
                                return 0;
        }