[PATCH] http.c: Spell the null pointer as NULL

Ramsay Jones· Oct 24, 2013, 20:17 UTC · lore

Commit 1bbcc224 ("http: refactor options to http_get_*", 28-09-2013) changed the type of final 'options' argument of the http_get_file() function from an int to an 'struct http_get_options' pointer. However, it neglected to update the (single) call site. Since this call was passing '0' to that argument, it was (correctly) being interpreted as a null pointer. Change to argument to NULL.

Noticed by sparse. ("Using plain integer as NULL pointer")

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---

Hi Junio,

This is a repost of:

  http://article.gmane.org/gmane.comp.version-control.git/236201

I suspect that this simply fell through the cracks ... (if not, please let me know ;-)

ATB, Ramsay Jones

 http.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to http.c +1 −1

diff --git a/http.c b/http.c
index 96d7578..b133ffd 100644
--- a/http.c
+++ b/http.c
@@ -1045,7 +1045,7 @@ static char *fetch_pack_index(unsigned char *sha1, const char *base_url)
 	strbuf_addf(&buf, "%s.temp", sha1_pack_index_name(sha1));
 	tmp = strbuf_detach(&buf, NULL);
 
-	if (http_get_file(url, tmp, 0) != HTTP_OK) {
+	if (http_get_file(url, tmp, NULL) != HTTP_OK) {
 		error("Unable to get pack index %s", url);
 		free(tmp);
 		tmp = NULL;

-- 
1.8.4

Jonathan Nieder· Oct 24, 2013, 20:58 UTC · re: Ramsay Jones · lore

Re: [PATCH] http.c: Spell the null pointer as NULL

Ramsay Jones wrote:

Show 6 quoted lines

> Commit 1bbcc224 ("http: refactor options to http_get_*", 28-09-2013)
> changed the type of final 'options' argument of the http_get_file()
> function from an int to an 'struct http_get_options' pointer.
> However, it neglected to update the (single) call site. Since this
> call was passing '0' to that argument, it was (correctly) being
> interpreted as a null pointer. Change to argument to NULL.

Jeff King wrote:

> Thanks, patch is obviously correct (and the cause was just oversight on
> my part).

For what it's worth, against the jk/http-auth-redirects branch,

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

Junio C Hamano· Oct 24, 2013, 21:42 UTC · re: Ramsay Jones · lore

Re: [PATCH] http.c: Spell the null pointer as NULL

Thanks.

patchhttp.c: Spell the null pointer as NULL