Re: [PATCH 1/4] http.h: Add debug callback and helper routine for implementing the GIT_TRACE_CURL environment variable in http.c
- From
Ramsay Jones <ramsay@ramsayjones.plus.com>
- Date
- Apr 19, 2016, 21:48 UTC
- Message-ID
- <5716A7C6.40507@ramsayjones.plus.com>
- In-Reply-To
- <20160419151044.27814-2-gitter.spiros@gmail.com>
On 19/04/16 16:10, Elia Pinto wrote:
Show 25 quoted lines
> Add the debug callback and helper routine prototype used by > curl_easy_setopt CURLOPT_DEBUGFUNCTION in http.c > for implementing the GIT_TRACE_CURL environment variable > > > Helped-by: Torsten Bögershausen <tboegi@web.de> > Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com> > Helped-by: Junio C Hamano <gitster@pobox.com> > Helped-by: Eric Sunshine <sunshine@sunshineco.com> > Helped-by: Jeff King <peff@peff.net> > Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> > --- > http.h | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/http.h b/http.h > index 4ef4bbd..a2d10bc 100644 > --- a/http.h > +++ b/http.h > @@ -224,4 +224,10 @@ extern int finish_http_object_request(struct http_object_request *freq); > extern void abort_http_object_request(struct http_object_request *freq); > extern void release_http_object_request(struct http_object_request *freq); > > +/* Debug callback and helper routine for curl_easy_setopt CURLOPT_DEBUGFUNCTION */ > +static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
Ah no, this would add 6 instances of the 'trace_curl' key in http-fetch.c, http-push.c, http-walker.c, http.c, imap-send.c and remote-curl.c. Hmm ... since these would end up in different executables (by and large) it might work OK, ... but is simply not necessary.
Also, patches #1 and #2 should be squashed into one patch and, since the curl_dump() function is only called from http.c, it can be a static symbol.
I think the minimal fixup (including Junio's comment on patch #2, which also triggered for me) is given in the patch below.
Hope that helps.
ATB, Ramsay Jones
Show 5 quoted lines
> +int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size, void *userp); > +void curl_dump(const char *text, unsigned char *ptr, size_t size, char nohex); > + > + > #endif /* HTTP_H */
-- >8 -- Subject: [PATCH] curl-trace: fix scope/visibility of various symbols
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> --- http.c | 9 +++------ http.h | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/http.c b/http.c index 64dd975..ce91421 100644 --- a/http.c +++ b/http.c @@ -11,9 +11,7 @@ #include "gettext.h" #include "transport.h" -/* -tatic struct trace_key trace_curl = TRACE_KEY_INIT(CURL); -*/ +struct trace_key trace_curl = TRACE_KEY_INIT(CURL); #if LIBCURL_VERSION_NUM >= 0x070a08 long int git_curl_ipresolve = CURL_IPRESOLVE_WHATEVER; #else @@ -468,12 +466,11 @@ static void set_curl_keepalive(CURL *c) #endif -void curl_dump(const char *text, unsigned char *ptr, size_t size, char nohex) +static void curl_dump(const char *text, unsigned char *ptr, size_t size, char nohex) { size_t i; size_t w; - struct strbuf out = STRBUF_INIT;; - + struct strbuf out = STRBUF_INIT; unsigned int width = 0x10; if (nohex) diff --git a/http.h b/http.h index a2d10bc..00e4ad7 100644 --- a/http.h +++ b/http.h @@ -225,9 +225,8 @@ extern void abort_http_object_request(struct http_object_request *freq); extern void release_http_object_request(struct http_object_request *freq); /* Debug callback and helper routine for curl_easy_setopt CURLOPT_DEBUGFUNCTION */ -static struct trace_key trace_curl = TRACE_KEY_INIT(CURL); +extern struct trace_key trace_curl; int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size, void *userp); -void curl_dump(const char *text, unsigned char *ptr, size_t size, char nohex); #endif /* HTTP_H */
-- 2.8.0