diff options
author | Vicent Marti <tanoku@gmail.com> | 2011-06-16 02:48:48 +0200 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2011-06-16 02:50:08 +0200 |
commit | f1d018513aced2fb4e6c87f2d417b6f826dbe998 (patch) | |
tree | ed3f93db76dc70f854f20f4b3bd7f627c0ca6d19 /src/oid.c | |
parent | fa48608ec30758dbf6d0d26d3c4f8efba8efe8e9 (diff) | |
download | libgit2-f1d018513aced2fb4e6c87f2d417b6f826dbe998.tar.gz |
oid: Uniformize ncmp methods
Drop redundant methods. The ncmp method is now public
Diffstat (limited to 'src/oid.c')
-rw-r--r-- | src/oid.c | 40 |
1 files changed, 17 insertions, 23 deletions
@@ -172,30 +172,24 @@ int git_oid_cmp(const git_oid *a, const git_oid *b) return memcmp(a->id, b->id, sizeof(a->id)); } - -int git_oid_ncmp_raw(unsigned int len, const unsigned char *a, const unsigned char *b) -{ - do { - if (*a != *b) - return 1; - a++; - b++; - len -= 2; - } while (len > 1); - if (len) - if ((*a ^ *b) & 0xf0) - return 1; - return 0; -} - -int git_oid_ncmp_hex(unsigned int len, const unsigned char *a, const unsigned char *b) -{ - return memcmp(a, b, len); -} - -int git_oid_ncmp(unsigned int len, git_oid *a, git_oid *b) +int git_oid_ncmp(const git_oid *oid_a, const git_oid *oid_b, unsigned int len) { - return git_oid_ncmp_raw(len, a->id, b->id); + const unsigned char *a = oid_a->id; + const unsigned char *b = oid_b->id; + + do { + if (*a != *b) + return 1; + a++; + b++; + len -= 2; + } while (len > 1); + + if (len) + if ((*a ^ *b) & 0xf0) + return 1; + + return 0; } typedef short node_index; |