From 142e5379ca850b718c9775cab5e30504503defd0 Mon Sep 17 00:00:00 2001 From: Leo Yang Date: Tue, 17 Mar 2015 12:49:33 -0400 Subject: [PATCH] Add a custom param to git_smart_subtransport_definition The smart transport has already take the payload param. For the sub transport a payload param is useful for the implementer. --- include/git2/sys/transport.h | 16 ++++++++++++---- src/transport.c | 6 +++--- src/transports/git.c | 4 +++- src/transports/http.c | 4 +++- src/transports/smart.c | 2 +- src/transports/ssh.c | 6 +++++- src/transports/winhttp.c | 4 +++- 7 files changed, 30 insertions(+), 12 deletions(-) diff --git a/include/git2/sys/transport.h b/include/git2/sys/transport.h index 69d4e15c5..2cb1a97eb 100644 --- a/include/git2/sys/transport.h +++ b/include/git2/sys/transport.h @@ -289,7 +289,8 @@ struct git_smart_subtransport { /* A function which creates a new subtransport for the smart transport */ typedef int (*git_smart_subtransport_cb)( git_smart_subtransport **out, - git_transport* owner); + git_transport* owner, + void* param); /** * Definition for a "subtransport" @@ -306,6 +307,10 @@ typedef struct git_smart_subtransport_definition { * http:// is stateless, but git:// is not. */ unsigned rpc; + + /** Param of the callback + */ + void* param; } git_smart_subtransport_definition; /* Smart transport subtransports that come with libgit2 */ @@ -321,7 +326,8 @@ typedef struct git_smart_subtransport_definition { */ GIT_EXTERN(int) git_smart_subtransport_http( git_smart_subtransport **out, - git_transport* owner); + git_transport* owner, + void *param); /** * Create an instance of the git subtransport. @@ -332,7 +338,8 @@ GIT_EXTERN(int) git_smart_subtransport_http( */ GIT_EXTERN(int) git_smart_subtransport_git( git_smart_subtransport **out, - git_transport* owner); + git_transport* owner, + void *param); /** * Create an instance of the ssh subtransport. @@ -343,7 +350,8 @@ GIT_EXTERN(int) git_smart_subtransport_git( */ GIT_EXTERN(int) git_smart_subtransport_ssh( git_smart_subtransport **out, - git_transport* owner); + git_transport* owner, + void *param); /** * Sets a custom transport factory for the remote. The caller can use this diff --git a/src/transport.c b/src/transport.c index a41ea0add..fc9c692b8 100644 --- a/src/transport.c +++ b/src/transport.c @@ -18,10 +18,10 @@ typedef struct transport_definition { void *param; } transport_definition; -static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1 }; -static git_smart_subtransport_definition git_subtransport_definition = { git_smart_subtransport_git, 0 }; +static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1, NULL }; +static git_smart_subtransport_definition git_subtransport_definition = { git_smart_subtransport_git, 0, NULL }; #ifdef GIT_SSH -static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0 }; +static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0, NULL }; #endif static transport_definition local_transport_definition = { "file://", git_transport_local, NULL }; 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;