proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-04 04:49:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3747 from libgit2/ethomson/warnings

Browse Source 
⚡ some warnings
This commit is contained in:
Carlos Martín Nieto 2016-04-22 15:40:08 +02:00
commit 512bd2c78f
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/iterator.c
View File

@ -206,8 +206,7 @@ GIT_INLINE(bool) iterator_has_started(
return false;
}
GIT_INLINE(bool) iterator_has_ended(
git_iterator *iter, const char *path, bool is_submodule)
GIT_INLINE(bool) iterator_has_ended(git_iterator *iter, const char *path)
{
if (iter->end == NULL)
return false;
@ -797,7 +796,7 @@ static int tree_iterator_advance(const git_index_entry **out, git_iterator *i)
continue;
/* if this path is after our end, stop */
if (iterator_has_ended(&iter->base, iter->entry_path.ptr, false)) {
if (iterator_has_ended(&iter->base, iter->entry_path.ptr)) {
error = GIT_ITEROVER;
break;
}
@ -2034,7 +2033,7 @@ static int index_iterator_advance(
continue;
}
if (iterator_has_ended(&iter->base, entry->path, is_submodule)) {
if (iterator_has_ended(&iter->base, entry->path)) {
error = GIT_ITEROVER;
break;
}

6
src/stransport_stream.c
View File

@ -116,11 +116,13 @@ int stransport_certificate(git_cert **out, git_stream *stream)
return 0;
}
int stransport_set_proxy(git_stream *stream, const char *proxy)
int stransport_set_proxy(
git_stream *stream,
const git_proxy_options *proxy_opts)
{
stransport_stream *st = (stransport_stream *) stream;
return git_stream_set_proxy(st->io, proxy);
return git_stream_set_proxy(st->io, proxy_opts);
}
/*

2
src/transports/smart.c
View File

@ -444,7 +444,7 @@ static void git_smart__free(git_transport *transport)
git_pkt_free(p);
git_vector_free(refs);
git__free(t->proxy.url);
git__free((char *)t->proxy.url);
git_strarray_free(&t->custom_headers);

4
tests/online/clone.c
View File

@ -666,8 +666,10 @@ void test_online_clone__start_with_http(void)
static int called_proxy_creds;
static int proxy_creds(git_cred **out, const char *url, const char *username, unsigned int allowed, void *payload)
{
GIT_UNUSED(payload);
GIT_UNUSED(url);
GIT_UNUSED(username);
GIT_UNUSED(allowed);
GIT_UNUSED(payload);
called_proxy_creds = 1;
return git_cred_userpass_plaintext_new(out, _remote_proxy_user, _remote_proxy_pass);