commit e4a80ecf40c9651741def7c4f0b2ca56b42af1a8
author Miklos Vajna <vmiklos@frugalware.org> Sun Dec 07 01:45:37 2008 +0100
committer Junio C Hamano <gitster@pobox.com> Sun Dec 07 02:41:55 2008 -0800
tree 6655cbd2e45a26c1d0bd0cd1f03deeb572b9d2f6
parent d551bbaf3af1fad947c704bdeb9cf664b34e38c6

http.c: use 'git_config_string' to get 'curl_http_proxy'

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

http.c

diff --git a/http.c b/http.c
index a97fdf5..c18e30a 100644
--- a/http.c
+++ b/http.c
@@ -24,7 +24,7 @@
 static long curl_low_speed_limit = -1;
 static long curl_low_speed_time = -1;
 static int curl_ftp_no_epsv = 0;
-static char *curl_http_proxy = NULL;
+static const char *curl_http_proxy = NULL;
 
 static struct curl_slist *pragma_header;
 
@@ -149,11 +149,8 @@
 		return 0;
 	}
 	if (!strcmp("http.proxy", var)) {
-		if (curl_http_proxy == NULL) {
-			if (!value)
-				return config_error_nonbool(var);
-			curl_http_proxy = xstrdup(value);
-		}
+		if (curl_http_proxy == NULL)
+			return git_config_string(&curl_http_proxy, var, value);
 		return 0;
 	}
 
@@ -309,7 +306,7 @@
 	pragma_header = NULL;
 
 	if (curl_http_proxy) {
-		free(curl_http_proxy);
+		free((void *)curl_http_proxy);
 		curl_http_proxy = NULL;
 	}
 }