From: Jeff King <peff@peff.net>
To: Elia Pinto <gitter.spiros@gmail.com>
Cc: git@vger.kernel.org, tboegi@web.de, ramsay@ramsayjones.plus.com,
gitster@pobox.com, sunshine@sunshineco.com
Subject: Re: [PATCHv4 2/2] imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
Date: Thu, 28 Apr 2016 10:55:24 -0400 [thread overview]
Message-ID: <20160428145524.GE25364@sigill.intra.peff.net> (raw)
In-Reply-To: <20160428115748.37177-3-gitter.spiros@gmail.com>
On Thu, Apr 28, 2016 at 11:57:48AM +0000, Elia Pinto wrote:
> diff --git a/imap-send.c b/imap-send.c
> index 938c691..61c6787 100644
> --- a/imap-send.c
> +++ b/imap-send.c
> @@ -1444,6 +1444,12 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
> if (0 < verbosity || getenv("GIT_CURL_VERBOSE"))
> curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
>
> + if (curl_trace_want()) {
> + curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
> + curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, curl_trace);
> + curl_easy_setopt(curl, CURLOPT_DEBUGDATA, NULL);
> + }
In the only other caller of curl_trace_want(), we repeat these exact
same lines (and really, what else would one do with that flag besides
enable curl_trace?).
Perhaps a better abstraction would be:
int setup_curl_trace(CURL *handle)
{
if (!trace_want(&trace_curl))
return 0;
curl_easy_setopt(handle, CURLOPT_VERBOSE, 1L);
curl_easy_setopt(handle, CURLOPT_DEBUGFUNCTION, curl_trace);
curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);
return 1;
}
You could even get rid of the return value, too. We do not use it here,
but just let GIT_TRACE_CURL naturally override GIT_CURL_VERBOSE by
setting the DEBUGFUNCTION. In the other caller, we do:
if (curl_trace_want()) {
... set up handle ...
} else {
... check and setup up GIT_CURL_VERBOSE ...
}
but we can do the else block regardless. It is a noop if tracing is set
up.
-Peff
prev parent reply other threads:[~2016-04-28 14:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-28 11:57 [PATCHv4 0/2] Implement the GIT_TRACE_CURL environment variable Elia Pinto
2016-04-28 11:57 ` [PATCHv4 1/2] http.c: implement " Elia Pinto
2016-04-28 14:47 ` Jeff King
2016-04-28 17:35 ` Junio C Hamano
2016-04-28 17:26 ` Stefan Beller
2016-04-28 17:44 ` Jeff King
2016-04-28 17:48 ` Stefan Beller
2016-04-28 18:05 ` Jeff King
2016-04-28 11:57 ` [PATCHv4 2/2] imap-send.c: introduce the GIT_TRACE_CURL enviroment variable Elia Pinto
2016-04-28 14:55 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160428145524.GE25364@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gitter.spiros@gmail.com \
--cc=ramsay@ramsayjones.plus.com \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).