Commit da03c9f35b282e70f0cb7e6ae1638df476c4e0df
2011-05-29T11:45:34
Changed return value of git_oid_match to be consistent with the other compare methods (0 means oids match). Added method to compare prefixes of hex formatted oids.
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
diff --git a/include/git2/oid.h b/include/git2/oid.h
index 062b9ca..f1f7dcc 100644
--- a/include/git2/oid.h
+++ b/include/git2/oid.h
@@ -142,7 +142,7 @@ GIT_EXTERN(int) git_oid_cmp(const git_oid *a, const git_oid *b);
* @param len the number of hex chars to compare
* @param a first oid structure.
* @param b second oid structure.
- * @return 1 in case of a match
+ * @return 0 in case of a match
*/
GIT_EXTERN(int) gid_oid_match(unsigned int len, git_oid *a, git_oid *b);
diff --git a/src/oid.c b/src/oid.c
index f743da8..8dc6903 100644
--- a/src/oid.c
+++ b/src/oid.c
@@ -177,15 +177,20 @@ int git_oid_match_raw(unsigned int len, const unsigned char *a, const unsigned c
{
do {
if (*a != *b)
- return 0;
+ return 1;
a++;
b++;
len -= 2;
} while (len > 1);
if (len)
if ((*a ^ *b) & 0xf0)
- return 0;
- return 1;
+ return 1;
+ return 0;
+}
+
+int git_oid_match_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)
diff --git a/src/oid.h b/src/oid.h
index 79f5b65..1cd2450 100644
--- a/src/oid.h
+++ b/src/oid.h
@@ -1,7 +1,17 @@
#ifndef INCLUDE_oid_h__
#define INCLUDE_oid_h__
-/* This can be useful for internal use */
+/**
+ * Compare the first ('len'*4) bits of two raw formatted oids.
+ * 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);
+/**
+ * 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);
+
#endif