Commit c09093cce2902bca40f3c0746bc754780f351a45
2011-06-06T10:55:36
Renamed git_oid_match to git_oid_ncmp. As suggested by carlosmn, git_oid_ncmp would probably be a better name than git_oid_match, for it does the same as git_oid_cmp but only up to a certain amount of hex digits.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
diff --git a/include/git2/oid.h b/include/git2/oid.h
index f1f7dcc..d87d8f6 100644
--- a/include/git2/oid.h
+++ b/include/git2/oid.h
@@ -144,7 +144,7 @@ GIT_EXTERN(int) git_oid_cmp(const git_oid *a, const git_oid *b);
* @param b second oid structure.
* @return 0 in case of a match
*/
-GIT_EXTERN(int) gid_oid_match(unsigned int len, git_oid *a, git_oid *b);
+GIT_EXTERN(int) gid_oid_ncmp(unsigned int len, git_oid *a, git_oid *b);
/**
* OID Shortener object
diff --git a/src/odb_loose.c b/src/odb_loose.c
index deff59a..9564ef0 100644
--- a/src/odb_loose.c
+++ b/src/odb_loose.c
@@ -492,7 +492,7 @@ int fn_locate_object_short_oid(void *state, char *pathbuf) {
if (!gitfo_exists(pathbuf) && gitfo_isdir(pathbuf)) {
/* We are already in the directory matching the 2 first hex characters */
- if (!git_oid_match_hex(sstate->short_oid_len-2, sstate->short_oid+2, (unsigned char *)pathbuf + sstate->dir_len)) {
+ if (!git_oid_ncmp_hex(sstate->short_oid_len-2, sstate->short_oid+2, (unsigned char *)pathbuf + sstate->dir_len)) {
if (!sstate->found) {
sstate->res_oid[0] = sstate->short_oid[0];
sstate->res_oid[1] = sstate->short_oid[1];
diff --git a/src/odb_pack.c b/src/odb_pack.c
index 525cfa4..0450d4b 100644
--- a/src/odb_pack.c
+++ b/src/odb_pack.c
@@ -1011,7 +1011,7 @@ static int pack_entry_find_offset(
if (pos < (int)p->num_objects) {
current = index + pos * stride;
- if (!git_oid_match_raw(len, short_oid->id, current)) {
+ if (!git_oid_ncmp_raw(len, short_oid->id, current)) {
found = 1;
}
}
@@ -1021,7 +1021,7 @@ static int pack_entry_find_offset(
/* Check for ambiguousity */
const unsigned char *next = current + stride;
- if (!git_oid_match_raw(len, short_oid->id, next)) {
+ if (!git_oid_ncmp_raw(len, short_oid->id, next)) {
found = 2;
}
}
diff --git a/src/oid.c b/src/oid.c
index 8dc6903..aab93cb 100644
--- a/src/oid.c
+++ b/src/oid.c
@@ -173,7 +173,7 @@ int git_oid_cmp(const git_oid *a, const git_oid *b)
}
-int git_oid_match_raw(unsigned int len, const unsigned char *a, const unsigned char *b)
+int git_oid_ncmp_raw(unsigned int len, const unsigned char *a, const unsigned char *b)
{
do {
if (*a != *b)
@@ -188,14 +188,14 @@ int git_oid_match_raw(unsigned int len, const unsigned char *a, const unsigned c
return 0;
}
-int git_oid_match_hex(unsigned int len, const unsigned char *a, const unsigned char *b)
+int git_oid_ncmp_hex(unsigned int len, const unsigned char *a, const unsigned char *b)
{
return memcmp(a, b, len);
}
-int gid_oid_match(unsigned int len, git_oid *a, git_oid *b)
+int gid_oid_ncmp(unsigned int len, git_oid *a, git_oid *b)
{
- return git_oid_match_raw(len, a->id, b->id);
+ return git_oid_ncmp_raw(len, a->id, b->id);
}
typedef short node_index;
diff --git a/src/oid.h b/src/oid.h
index 1cd2450..afdfcf9 100644
--- a/src/oid.h
+++ b/src/oid.h
@@ -6,12 +6,12 @@
* This can be useful for internal use.
* Return 0 if they match.
*/
-int git_oid_match_raw(unsigned int len, const unsigned char *a, const unsigned char *b);
+int git_oid_ncmp_raw(unsigned int len, const unsigned char *a, const unsigned char *b);
/**
* Compare the first 'len' characters of two hex formatted oids.
* Return 0 if they match.
*/
-int git_oid_match_hex(unsigned int len, const unsigned char *a, const unsigned char *b);
+int git_oid_ncmp_hex(unsigned int len, const unsigned char *a, const unsigned char *b);
#endif