summaryrefslogtreecommitdiff
path: root/src/transports
diff options
context:
space:
mode:
Diffstat (limited to 'src/transports')
-rw-r--r--src/transports/git.c4
-rw-r--r--src/transports/http.c4
-rw-r--r--src/transports/smart.c2
-rw-r--r--src/transports/ssh.c6
-rw-r--r--src/transports/winhttp.c4
5 files changed, 15 insertions, 5 deletions
diff --git a/src/transports/git.c b/src/transports/git.c
index 5ec98d867..ea95ed132 100644
--- a/src/transports/git.c
+++ b/src/transports/git.c
@@ -340,10 +340,12 @@ static void _git_free(git_smart_subtransport *subtransport)
git__free(t);
}
-int git_smart_subtransport_git(git_smart_subtransport **out, git_transport *owner)
+int git_smart_subtransport_git(git_smart_subtransport **out, git_transport *owner, void *param)
{
git_subtransport *t;
+ GIT_UNUSED(param);
+
if (!out)
return -1;
diff --git a/src/transports/http.c b/src/transports/http.c
index 0907afa6d..c4424650e 100644
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -1007,10 +1007,12 @@ static void http_free(git_smart_subtransport *subtransport)
git__free(t);
}
-int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner)
+int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner, void *param)
{
http_subtransport *t;
+ GIT_UNUSED(param);
+
if (!out)
return -1;
diff --git a/src/transports/smart.c b/src/transports/smart.c
index 69b9d22cc..85a49e543 100644
--- a/src/transports/smart.c
+++ b/src/transports/smart.c
@@ -409,7 +409,7 @@ int git_transport_smart(git_transport **out, git_remote *owner, void *param)
return -1;
}
- if (definition->callback(&t->wrapped, &t->parent) < 0) {
+ if (definition->callback(&t->wrapped, &t->parent, definition->param) < 0) {
git__free(t);
return -1;
}
diff --git a/src/transports/ssh.c b/src/transports/ssh.c
index 33d0898ec..c5b081151 100644
--- a/src/transports/ssh.c
+++ b/src/transports/ssh.c
@@ -754,13 +754,15 @@ static int list_auth_methods(int *out, LIBSSH2_SESSION *session, const char *use
#endif
int git_smart_subtransport_ssh(
- git_smart_subtransport **out, git_transport *owner)
+ git_smart_subtransport **out, git_transport *owner, void *param)
{
#ifdef GIT_SSH
ssh_subtransport *t;
assert(out);
+ GIT_UNUSED(param);
+
t = git__calloc(sizeof(ssh_subtransport), 1);
GITERR_CHECK_ALLOC(t);
@@ -773,6 +775,7 @@ int git_smart_subtransport_ssh(
return 0;
#else
GIT_UNUSED(owner);
+ GIT_UNUSED(param);
assert(out);
*out = NULL;
@@ -793,6 +796,7 @@ int git_transport_ssh_with_paths(git_transport **out, git_remote *owner, void *p
git_smart_subtransport_definition ssh_definition = {
git_smart_subtransport_ssh,
0, /* no RPC */
+ NULL,
};
if (paths->count != 2) {
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
index 278ef22c4..a993bc9e0 100644
--- a/src/transports/winhttp.c
+++ b/src/transports/winhttp.c
@@ -1322,10 +1322,12 @@ static void winhttp_free(git_smart_subtransport *subtransport)
git__free(t);
}
-int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner)
+int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner, void *param)
{
winhttp_subtransport *t;
+ GIT_UNUSED(param);
+
if (!out)
return -1;