Skip to content

Commit

Permalink
Merge branch 'im/hashcmp-optim'
Browse files Browse the repository at this point in the history
* im/hashcmp-optim:
  hashcmp(): inline memcmp() by hand to optimize
  • Loading branch information
Junio C Hamano committed May 6, 2011
2 parents ac13e7c + 1a812f3 commit efa67bf
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit efa67bf

Please sign in to comment.