diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-26 19:37:01 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-26 19:37:01 +0100 |
| commit | f4afcaa0d50bece4a784ce680d92e5c0d1c67785 (patch) | |
| tree | 3c7fe551e0e18599a152083761cbca71abd17cc1 | |
| parent | dc7efa1aef2d3694e7a1955d746d26013402a21d (diff) | |
| parent | 9cb99e8b853bb3d9ddec3748494a0ac34550849b (diff) | |
| download | libgit2-f4afcaa0d50bece4a784ce680d92e5c0d1c67785.tar.gz | |
Merge pull request #2209 from ethomson/cleanup
Cleanup some warnings and mem leaks
| -rw-r--r-- | src/merge.c | 3 | ||||
| -rw-r--r-- | tests/revwalk/hidecb.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index 42fbd79c9..24b7d37ce 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2629,9 +2629,8 @@ int git_merge( on_error: merge_state_cleanup(repo); - git_index_free(index_new); - done: + git_index_free(index_new); git_index_free(index_repo); git_tree_free(ancestor_tree); diff --git a/tests/revwalk/hidecb.c b/tests/revwalk/hidecb.c index c13a17747..26ff183fa 100644 --- a/tests/revwalk/hidecb.c +++ b/tests/revwalk/hidecb.c @@ -48,18 +48,27 @@ void test_revwalk_hidecb__cleanup(void) /* Hide all commits */ static int hide_every_commit_cb(const git_oid *commit_id, void *data) { + GIT_UNUSED(commit_id); + GIT_UNUSED(data); + return 1; } /* Do not hide anything */ static int hide_none_cb(const git_oid *commit_id, void *data) { + GIT_UNUSED(commit_id); + GIT_UNUSED(data); + return 0; } /* Hide some commits */ static int hide_commit_cb(const git_oid *commit_id, void *data) { + GIT_UNUSED(commit_id); + GIT_UNUSED(data); + if (0 == git_oid_cmp(commit_id, &commit_ids[5])) return 1; else |