diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 11:00:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 11:00:36 -0700 |
commit | efa67bfd16f4260275654bc4194744dd65353350 (patch) | |
tree | 4a207225d19d0e5f96d3c1a008a537e196fcbab2 | |
parent | Merge branch 'jk/merge-one-file-working-tree' (diff) | |
parent | hashcmp(): inline memcmp() by hand to optimize (diff) | |
download | tgif-efa67bfd16f4260275654bc4194744dd65353350.tar.xz |
Merge branch 'im/hashcmp-optim'
* im/hashcmp-optim:
hashcmp(): inline memcmp() by hand to optimize
-rw-r--r-- | cache.h | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -676,14 +676,24 @@ extern char *sha1_pack_name(const unsigned char *sha1); extern char *sha1_pack_index_name(const unsigned char *sha1); extern const char *find_unique_abbrev(const unsigned char *sha1, int); extern const unsigned char null_sha1[20]; -static inline int is_null_sha1(const unsigned char *sha1) + +static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2) { - return !memcmp(sha1, null_sha1, 20); + int i; + + for (i = 0; i < 20; i++, sha1++, sha2++) { + if (*sha1 != *sha2) + return *sha1 - *sha2; + } + + return 0; } -static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2) + +static inline int is_null_sha1(const unsigned char *sha1) { - return memcmp(sha1, sha2, 20); + return !hashcmp(sha1, null_sha1); } + static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src) { memcpy(sha_dst, sha_src, 20); |