git/list[1] front-page[2] threads[3] people[4] search[5] about
 

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

From
Joachim Schmitz <jojo@schmitz-digital.de>
Date
Aug 22, 2012, 17:59 UTC
Message-ID
<003c01cd808f$f24e2a60$d6ea7f20$@schmitz-digital.de>
In-Reply-To
<7vk3wq964r.fsf@alter.siamese.dyndns.org>
Show 34 quoted lines
> From: Junio C Hamano [mailto:gitster@pobox.com]
> Sent: Wednesday, August 22, 2012 7:41 PM
> To: Joachim Schmitz
> Cc: git@vger.kernel.org
> Subject: Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0
> 
> "Joachim Schmitz" <jojo@schmitz-digital.de> writes:
> 
> > Like this:
> > ----
> >
> > This reverts be22d92 (http: avoid empty error messages for some curl
> > errors,
> > 2011-09-05) on platforms with older versions of libcURL.
> >
> > Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
> > ---
> 
> Perfect ;-)
> 
> >  http.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/http.c b/http.c
> > index b61ac85..18bc6bf 100644
> > --- a/http.c
> > +++ b/http.c
> > @@ -806,10 +806,12 @@ static int http_request(const char *url, void
> > *result, int target, int options)
> >                                 ret = HTTP_REAUTH;
> >                         }
> 
> Now we need to see where these whitespace breakages are coming from and
> fix it, and I think it should be done earlier than later, as I expect we
will be
> seeing more patches from you in the coming weeks.

OK, next attempt (this time I downloaded the patch file to my PC first and used Wordpad for copy/past rather than cat in a PuTTY session) ---

This reverts be22d92 (http: avoid empty error messages for some curl errors, 2011-09-05) on platforms with older versions of libcURL.

Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
---
 http.c | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/http.c b/http.c
index b61ac85..18bc6bf 100644
--- a/http.c
+++ b/http.c
@@ -806,10 +806,12 @@ static int http_request(const char *url, void *result,
int target, int options)
 				ret = HTTP_REAUTH;
 			}
 		} else {
+#if LIBCURL_VERSION_NUM >= 0x070c00
 			if (!curl_errorstr[0])
 				strlcpy(curl_errorstr,
 
curl_easy_strerror(results.curl_result),
 					sizeof(curl_errorstr));
+#endif
 			ret = HTTP_ERROR;
 		}
 	} else {
-- 
1.7.12

Better?

Bye, Jojo
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 12 in “Don't use curl_easy_strerror prior to curl-7.12.0”
  1. Don't use curl_easy_strerror prior to curl-7.12.0Joachim Schmitz, Aug 22, 2012
  2. Junio C HamanoAug 22, 2012
  3. Joachim SchmitzAug 22, 2012
  4. Junio C HamanoAug 22, 2012
  5. Joachim SchmitzAug 22, 2012
  6. Junio C HamanoAug 22, 2012
  7. Joachim SchmitzAug 22, 2012
  8. Junio C HamanoAug 22, 2012
  9. Joachim SchmitzAug 22, 2012
  10. Joachim SchmitzAug 23, 2012
  11. Junio C HamanoAug 23, 2012
  12. Joachim SchmitzAug 24, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.