diff options
| author | Russell Belfer <rb@github.com> | 2013-11-13 11:12:31 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-11-13 11:12:31 -0800 |
| commit | 98eaf39a87164eeb284df5c0239c3a31dfb538e7 (patch) | |
| tree | 98cf7cd59f4ac2b30766b50dcef67ff631b6dbd9 | |
| parent | cfd16ca28e593d084350b497b06eac7cb7a6c240 (diff) | |
| download | libgit2-98eaf39a87164eeb284df5c0239c3a31dfb538e7.tar.gz | |
Fix warnings
| -rw-r--r-- | src/merge.c | 4 | ||||
| -rw-r--r-- | src/netops.c | 2 | ||||
| -rw-r--r-- | src/push.c | 4 | ||||
| -rw-r--r-- | tests-clar/merge/workdir/setup.c | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/merge.c b/src/merge.c index 2cbf531f9..115867971 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1649,7 +1649,7 @@ static int write_merge_head( goto cleanup; for (i = 0; i < heads_len; i++) { - if ((error = git_filebuf_printf(&file, "%s\n", &heads[i]->oid_str)) < 0) + if ((error = git_filebuf_printf(&file, "%s\n", heads[i]->oid_str)) < 0) goto cleanup; } @@ -2240,6 +2240,8 @@ static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_inde git_diff_options opts = GIT_DIFF_OPTIONS_INIT; int error = 0; + GIT_UNUSED(index_new); + *conflicts = 0; opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED; diff --git a/src/netops.c b/src/netops.c index 592e46449..15ed0fc26 100644 --- a/src/netops.c +++ b/src/netops.c @@ -662,7 +662,7 @@ void gitno_connection_data_free_ptrs(gitno_connection_data *d) static char* unescape(char *str) { int x, y; - size_t len = strlen(str); + int len = (int)strlen(str); for (x=y=0; str[y]; ++x, ++y) { if ((str[x] = str[y]) == '%') { diff --git a/src/push.c b/src/push.c index 5ad15e3fd..3c9d5bb35 100644 --- a/src/push.c +++ b/src/push.c @@ -618,7 +618,7 @@ on_error: static int filter_refs(git_remote *remote) { - git_remote_head **heads; + const git_remote_head **heads; size_t heads_len, i; git_vector_clear(&remote->refs); @@ -627,7 +627,7 @@ static int filter_refs(git_remote *remote) return -1; for (i = 0; i < heads_len; i++) { - if (git_vector_insert(&remote->refs, heads[i]) < 0) + if (git_vector_insert(&remote->refs, (void *)heads[i]) < 0) return -1; } diff --git a/tests-clar/merge/workdir/setup.c b/tests-clar/merge/workdir/setup.c index 463dee06e..870d55ef2 100644 --- a/tests-clar/merge/workdir/setup.c +++ b/tests-clar/merge/workdir/setup.c @@ -1041,7 +1041,8 @@ void test_merge_workdir_setup__removed_after_failure(void) cl_git_rewritefile("merge-resolve/new-in-octo1.txt", "Conflicting file!\n\nMerge will fail!\n"); - cl_git_fail(git_merge(&result, repo, &their_heads[0], 1, &opts)); + cl_git_fail(git_merge( + &result, repo, (const git_merge_head **)&their_heads[0], 1, &opts)); cl_assert(!git_path_exists("merge-resolve/" GIT_MERGE_HEAD_FILE)); cl_assert(!git_path_exists("merge-resolve/" GIT_ORIG_HEAD_FILE)); |