diff options
| author | Vicent Marti <tanoku@gmail.com> | 2015-10-28 14:49:28 +0100 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2015-10-28 14:49:28 +0100 |
| commit | d845abe6394afafc88db637f02888d1341f20559 (patch) | |
| tree | 346dd82fd324b74578675121e3f221ac220fc27d | |
| parent | 340b15b71cca16b47db2e5c882952497efece14f (diff) | |
| download | libgit2-vmg/pool.tar.gz | |
merge: Do not mallocz unecessary entriesvmg/pool
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index a124cbdc9..ac0caeabd 100644 --- a/src/merge.c +++ b/src/merge.c @@ -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) |