Commit da03c9f3 by Marc Pegon Committed by Vicent Marti

Changed return value of git_oid_match to be consistent with the other compare…

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.
parent ac2b94ad
......@@ -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);
......
......@@ -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)
......
#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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment