summaryrefslogtreecommitdiff
path: root/src/tree.c
diff options
context:
space:
mode:
authorArthur Schreiber <schreiber.arthur@googlemail.com>2014-01-14 21:33:59 +0100
committerArthur Schreiber <schreiber.arthur@googlemail.com>2014-01-14 21:33:59 +0100
commit529f342aba858e81f370aca9570fa149ebba674b (patch)
treed5bf7c7f67e3a5bd9537b70f16581fbbd0bfeab6 /src/tree.c
parent29be3a6d9eee68b3964f34c498e64ce32452a57f (diff)
downloadlibgit2-529f342aba858e81f370aca9570fa149ebba674b.tar.gz
Align git_tree_entry_dup.
Diffstat (limited to 'src/tree.c')
-rw-r--r--src/tree.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/tree.c b/src/tree.c
index 4d77ff778..fc105ed5e 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -204,22 +204,22 @@ void git_tree_entry_free(git_tree_entry *entry)
git__free(entry);
}
-git_tree_entry *git_tree_entry_dup(const git_tree_entry *entry)
+int git_tree_entry_dup(git_tree_entry **dest, const git_tree_entry *source)
{
size_t total_size;
git_tree_entry *copy;
- assert(entry);
+ assert(source);
- total_size = sizeof(git_tree_entry) + entry->filename_len + 1;
+ total_size = sizeof(git_tree_entry) + source->filename_len + 1;
copy = git__malloc(total_size);
- if (!copy)
- return NULL;
+ GITERR_CHECK_ALLOC(copy);
- memcpy(copy, entry, total_size);
+ memcpy(copy, source, total_size);
- return copy;
+ *dest = copy;
+ return 0;
}
void git_tree__free(void *_tree)
@@ -853,8 +853,7 @@ int git_tree_entry_bypath(
case '\0':
/* If there are no more components in the path, return
* this entry */
- *entry_out = git_tree_entry_dup(entry);
- return 0;
+ return git_tree_entry_dup(entry_out, entry);
}
if (git_tree_lookup(&subtree, root->object.repo, &entry->oid) < 0)