diff --git a/hash-ll.h b/hash-ll.h index b72f84f4ae..b04fe12aef 100644 --- a/hash-ll.h +++ b/hash-ll.h @@ -278,6 +278,16 @@ static inline void hashclr(unsigned char *hash, const struct git_hash_algo *algo memset(hash, 0, algop->rawsz); } +static inline int oidcmp(const struct object_id *oid1, const struct object_id *oid2) +{ + return memcmp(oid1->hash, oid2->hash, GIT_MAX_RAWSZ); +} + +static inline int oideq(const struct object_id *oid1, const struct object_id *oid2) +{ + return !memcmp(oid1->hash, oid2->hash, GIT_MAX_RAWSZ); +} + static inline void oidcpy(struct object_id *dst, const struct object_id *src) { memcpy(dst->hash, src->hash, GIT_MAX_RAWSZ); diff --git a/hash.h b/hash.h index e43e3d8b5a..ddc2e5ca47 100644 --- a/hash.h +++ b/hash.h @@ -6,26 +6,6 @@ #define the_hash_algo the_repository->hash_algo -static inline int oidcmp(const struct object_id *oid1, const struct object_id *oid2) -{ - const struct git_hash_algo *algop; - if (!oid1->algo) - algop = the_hash_algo; - else - algop = &hash_algos[oid1->algo]; - return hashcmp(oid1->hash, oid2->hash, algop); -} - -static inline int oideq(const struct object_id *oid1, const struct object_id *oid2) -{ - const struct git_hash_algo *algop; - if (!oid1->algo) - algop = the_hash_algo; - else - algop = &hash_algos[oid1->algo]; - return hasheq(oid1->hash, oid2->hash, algop); -} - static inline int is_null_oid(const struct object_id *oid) { return oideq(oid, null_oid());