summaryrefslogtreecommitdiff
path: root/src/index.c
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2011-06-16 02:36:21 +0200
committerVicent Marti <tanoku@gmail.com>2011-06-16 02:36:21 +0200
commitfa48608ec30758dbf6d0d26d3c4f8efba8efe8e9 (patch)
tree31e3cc7bedaa6c4d3a8b8d37903991ed811eb02d /src/index.c
parent43521d0688c744e98f07f19dd0b15e6b2c763693 (diff)
downloadlibgit2-fa48608ec30758dbf6d0d26d3c4f8efba8efe8e9.tar.gz
oid: Rename methods
Yeah. Finally. Fuck the old names, this ain't POSIX and they don't make any sense at all.
Diffstat (limited to 'src/index.c')
-rw-r--r--src/index.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/index.c b/src/index.c
index 08e24906c..23fd52e09 100644
--- a/src/index.c
+++ b/src/index.c
@@ -582,7 +582,7 @@ static int read_tree_internal(git_index_tree **out,
goto cleanup;
}
- git_oid_mkraw(&tree->oid, (const unsigned char *)buffer);
+ git_oid_fromraw(&tree->oid, (const unsigned char *)buffer);
buffer += GIT_OID_RAWSZ;
/* Parse children: */
@@ -670,7 +670,7 @@ static int read_unmerged(git_index *index, const char *buffer, size_t size)
continue;
if (size < 20)
return git__throw(GIT_ERROR, "Failed to read unmerged entries");
- git_oid_mkraw(&lost->oid[i], (unsigned char *) buffer);
+ git_oid_fromraw(&lost->oid[i], (unsigned char *) buffer);
size -= 20;
buffer += 20;
}
@@ -867,7 +867,7 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse index. Buffer size does not match index footer size");
/* 160-bit SHA-1 over the content of the index file before this checksum. */
- git_oid_mkraw(&checksum_expected, (const unsigned char *)buffer);
+ git_oid_fromraw(&checksum_expected, (const unsigned char *)buffer);
if (git_oid_cmp(&checksum_calculated, &checksum_expected) != 0)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse index. Calculated checksum does not match expected checksum");