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

["Joachim Schmitz" <jojo@xxxxxxxxxxxxxxxxxx>]

> From: Junio C Hamano [mailto:gitster@xxxxxxxxx]
> Sent: Wednesday, August 22, 2012 7:41 PM
> To: Joachim Schmitz
> Cc: git@xxxxxxxxxxxxxxx
> Subject: Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0
> 
> "Joachim Schmitz" <jojo@xxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxx>
> > ---
> 
> 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@xxxxxxxxxxxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html