proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-23 23:55:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge: Do not mallocz unecessary entries

Browse Source
This commit is contained in:
Vicent Marti 2015-10-28 14:49:28 +01:00
parent 340b15b71c
commit d845abe639
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/merge.c
View File

@ -626,7 +626,7 @@ static int merge_conflict_resolve_one_renamed(
git_oid__cmp(&conflict->our_entry.id, &conflict->their_entry.id) != 0)
return 0;
if ((merged = git_pool_mallocz(&diff_list->pool, sizeof(git_index_entry))) == NULL)
if ((merged = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry))) == NULL)
return -1;
if (ours_changed)
@ -1383,7 +1383,7 @@ static int merge_diff_list_insert_unmodified(
int error = 0;
git_index_entry *entry;
entry = git_pool_mallocz(&diff_list->pool, sizeof(git_index_entry));
entry = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry));
GITERR_CHECK_ALLOC(entry);
if ((error = index_entry_dup_pool(entry, &diff_list->pool, tree_items[0])) >= 0)