Commit 526e8869 by Edward Thomson

oid: `hashcmp` is now `raw_cmp`

We will talk about "raw" oids as untyped blobs of data; use a name for
the comparison function that is in keeping with that.
parent 7367a9d5
...@@ -147,10 +147,10 @@ static int commit_graph_parse_oid_lookup( ...@@ -147,10 +147,10 @@ static int commit_graph_parse_oid_lookup(
if (chunk_oid_lookup->length != file->num_commits * GIT_OID_RAWSZ) if (chunk_oid_lookup->length != file->num_commits * GIT_OID_RAWSZ)
return commit_graph_error("OID Lookup chunk has wrong length"); return commit_graph_error("OID Lookup chunk has wrong length");
file->oid_lookup = oid = (git_oid *)(data + chunk_oid_lookup->offset); file->oid_lookup = oid = (git_oid_raw *)(data + chunk_oid_lookup->offset);
prev_oid = &zero_oid; prev_oid = &zero_oid;
for (i = 0; i < file->num_commits; ++i, ++oid) { for (i = 0; i < file->num_commits; ++i, ++oid) {
if (git_oid_cmp(prev_oid, oid) >= 0) if (git_oid_raw_cmp(prev_oid, oid) >= 0)
return commit_graph_error("OID Lookup index is non-monotonic"); return commit_graph_error("OID Lookup index is non-monotonic");
prev_oid = oid; prev_oid = oid;
} }
......
...@@ -25,7 +25,9 @@ extern const git_oid git_oid__empty_tree_sha1; ...@@ -25,7 +25,9 @@ extern const git_oid git_oid__empty_tree_sha1;
*/ */
char *git_oid_allocfmt(const git_oid *id); char *git_oid_allocfmt(const git_oid *id);
GIT_INLINE(int) git_oid__hashcmp(const unsigned char *sha1, const unsigned char *sha2) GIT_INLINE(int) git_oid_raw_cmp(
const unsigned char *sha1,
const unsigned char *sha2)
{ {
return memcmp(sha1, sha2, GIT_OID_RAWSZ); return memcmp(sha1, sha2, GIT_OID_RAWSZ);
} }
...@@ -39,7 +41,7 @@ GIT_INLINE(int) git_oid__hashcmp(const unsigned char *sha1, const unsigned char ...@@ -39,7 +41,7 @@ GIT_INLINE(int) git_oid__hashcmp(const unsigned char *sha1, const unsigned char
*/ */
GIT_INLINE(int) git_oid__cmp(const git_oid *a, const git_oid *b) GIT_INLINE(int) git_oid__cmp(const git_oid *a, const git_oid *b)
{ {
return git_oid__hashcmp(a->id, b->id); return git_oid_raw_cmp(a->id, b->id);
} }
GIT_INLINE(void) git_oid__cpy_prefix( GIT_INLINE(void) git_oid__cpy_prefix(
......
...@@ -1451,7 +1451,7 @@ int git_pack__lookup_sha1(const void *oid_lookup_table, size_t stride, unsigned ...@@ -1451,7 +1451,7 @@ int git_pack__lookup_sha1(const void *oid_lookup_table, size_t stride, unsigned
while (lo < hi) { while (lo < hi) {
unsigned mi = (lo + hi) / 2; unsigned mi = (lo + hi) / 2;
int cmp = git_oid__hashcmp(base + mi * stride, oid_prefix); int cmp = git_oid_raw_cmp(base + mi * stride, oid_prefix);
if (!cmp) if (!cmp)
return mi; return mi;
......
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