proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 22:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Russell Belfer 2013-11-13 11:12:31 -08:00
parent cfd16ca28e
commit 98eaf39a87
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/merge.c
View File

@ -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;

2
src/netops.c
View File

@ -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]) == '%') {

4
src/push.c
View File

@ -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;
}

3
tests-clar/merge/workdir/setup.c
View File

@ -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));