mirror of
https://git.proxmox.com/git/libgit2
synced 2025-07-04 04:33:55 +00:00
Merge pull request #3081 from leoyanggit/build_warnings
Fix some build warnings
This commit is contained in:
commit
9f73e1f335
@ -1457,7 +1457,7 @@ static int blob_content_to_file(
|
|||||||
writer.fd = fd;
|
writer.fd = fd;
|
||||||
writer.open = 1;
|
writer.open = 1;
|
||||||
|
|
||||||
error = git_filter_list_stream_blob(fl, blob, (git_writestream *)&writer);
|
error = git_filter_list_stream_blob(fl, blob, &writer.base);
|
||||||
|
|
||||||
assert(writer.open == 0);
|
assert(writer.open == 0);
|
||||||
|
|
||||||
|
@ -671,7 +671,7 @@ int git_filter_list_apply_to_data(
|
|||||||
buf_stream_init(&writer, tgt);
|
buf_stream_init(&writer, tgt);
|
||||||
|
|
||||||
if ((error = git_filter_list_stream_data(filters, src,
|
if ((error = git_filter_list_stream_data(filters, src,
|
||||||
(git_writestream *)&writer)) < 0)
|
&writer.parent)) < 0)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
assert(writer.complete);
|
assert(writer.complete);
|
||||||
@ -690,7 +690,7 @@ int git_filter_list_apply_to_file(
|
|||||||
buf_stream_init(&writer, out);
|
buf_stream_init(&writer, out);
|
||||||
|
|
||||||
if ((error = git_filter_list_stream_file(
|
if ((error = git_filter_list_stream_file(
|
||||||
filters, repo, path, (git_writestream *)&writer)) < 0)
|
filters, repo, path, &writer.parent)) < 0)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
assert(writer.complete);
|
assert(writer.complete);
|
||||||
@ -721,7 +721,7 @@ int git_filter_list_apply_to_blob(
|
|||||||
buf_stream_init(&writer, out);
|
buf_stream_init(&writer, out);
|
||||||
|
|
||||||
if ((error = git_filter_list_stream_blob(
|
if ((error = git_filter_list_stream_blob(
|
||||||
filters, blob, (git_writestream *)&writer)) < 0)
|
filters, blob, &writer.parent)) < 0)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
assert(writer.complete);
|
assert(writer.complete);
|
||||||
|
@ -171,11 +171,11 @@ static int create_internal(git_remote **out, git_repository *repo, const char *n
|
|||||||
if ((error = git_repository_config_snapshot(&config, repo)) < 0)
|
if ((error = git_repository_config_snapshot(&config, repo)) < 0)
|
||||||
goto on_error;
|
goto on_error;
|
||||||
|
|
||||||
if (lookup_remote_prune_config(remote, config, name) < 0)
|
if ((error = lookup_remote_prune_config(remote, config, name)) < 0)
|
||||||
goto on_error;
|
goto on_error;
|
||||||
|
|
||||||
/* Move the data over to where the matching functions can find them */
|
/* Move the data over to where the matching functions can find them */
|
||||||
if (dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs) < 0)
|
if ((error = dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs)) < 0)
|
||||||
goto on_error;
|
goto on_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -457,7 +457,7 @@ int git_remote_lookup(git_remote **out, git_repository *repo, const char *name)
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
/* Move the data over to where the matching functions can find them */
|
/* Move the data over to where the matching functions can find them */
|
||||||
if (dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs) < 0)
|
if ((error = dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs)) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
*out = remote;
|
*out = remote;
|
||||||
@ -2330,7 +2330,7 @@ int git_remote_upload(git_remote *remote, const git_strarray *refspecs, const gi
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
free_refspecs(&remote->active_refspecs);
|
free_refspecs(&remote->active_refspecs);
|
||||||
if (dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs) < 0)
|
if ((error = dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs)) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (remote->push) {
|
if (remote->push) {
|
||||||
|
Loading…
Reference in New Issue
Block a user