Cleanup variables in http.[ch]

Quite some variables defined as extern in http.h are only used in http.c,
and some others, only defined in http.c, were not static.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http.c b/http.c
index e4aa9c19dbe7fd2ed948d5cca255a7db44a9472f..146f62609dbf75cf8b6d873f040e1386d73b57d1 100644 (file)
--- a/http.c
+++ b/http.c
@@ -4,31 +4,31 @@ int data_received;
 int active_requests = 0;
 
 #ifdef USE_CURL_MULTI
 int active_requests = 0;
 
 #ifdef USE_CURL_MULTI

-int max_requests = -1;
-CURLM *curlm;
+static int max_requests = -1;
+static CURLM *curlm;

 #endif
 #ifndef NO_CURL_EASY_DUPHANDLE
 #endif
 #ifndef NO_CURL_EASY_DUPHANDLE

-CURL *curl_default;
+static CURL *curl_default;

 #endif
 char curl_errorstr[CURL_ERROR_SIZE];
 
 #endif
 char curl_errorstr[CURL_ERROR_SIZE];
 

-int curl_ssl_verify = -1;
-char *ssl_cert = NULL;
+static int curl_ssl_verify = -1;
+static char *ssl_cert = NULL;

 #if LIBCURL_VERSION_NUM >= 0x070902
 #if LIBCURL_VERSION_NUM >= 0x070902

-char *ssl_key = NULL;
+static char *ssl_key = NULL;

 #endif
 #if LIBCURL_VERSION_NUM >= 0x070908
 #endif
 #if LIBCURL_VERSION_NUM >= 0x070908

-char *ssl_capath = NULL;
+static char *ssl_capath = NULL;

 #endif
 #endif

-char *ssl_cainfo = NULL;
-long curl_low_speed_limit = -1;
-long curl_low_speed_time = -1;
-int curl_ftp_no_epsv = 0;
-char *curl_http_proxy = NULL;
+static char *ssl_cainfo = NULL;
+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;

 
 

-struct curl_slist *pragma_header;
+static struct curl_slist *pragma_header;

 
 

-struct active_request_slot *active_queue_head = NULL;
+static struct active_request_slot *active_queue_head = NULL;

 
 size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
                           struct buffer *buffer)
 
 size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
                           struct buffer *buffer)

diff --git a/http.h b/http.h
index 72abac20f856b45c873cc370f23c7df08b650370..fe1b0d153bcd80d12a405c26e0f073cbf14dde34 100644 (file)
--- a/http.h
+++ b/http.h
@@ -80,24 +80,6 @@ extern void http_cleanup(void);
 extern int data_received;
 extern int active_requests;
 
 extern int data_received;
 extern int active_requests;
 

-#ifndef NO_CURL_EASY_DUPHANDLE
-extern CURL *curl_default;
-#endif

 extern char curl_errorstr[CURL_ERROR_SIZE];
 
 extern char curl_errorstr[CURL_ERROR_SIZE];
 

-extern int curl_ssl_verify;
-extern char *ssl_cert;
-#if LIBCURL_VERSION_NUM >= 0x070902
-extern char *ssl_key;
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070908
-extern char *ssl_capath;
-#endif
-extern char *ssl_cainfo;
-extern long curl_low_speed_limit;
-extern long curl_low_speed_time;
-
-extern struct curl_slist *pragma_header;
-extern struct curl_slist *no_range_header;
-

 #endif /* HTTP_H */
 #endif /* HTTP_H */