Avoid redundant declaration of missing_target()

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

diff --git a/http-walker.c b/http-walker.c
index 0faafbce6164b18cdd960bc8c7d254507d4a2731..ad874b98cb5c76ef81a99607dc3630baf7a7f62a 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -90,19 +90,6 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
        return size;
 }
 
        return size;
 }
 

-static int missing__target(int code, int result)
-{
-       return  /* file:// URL -- do we ever use one??? */
-               (result == CURLE_FILE_COULDNT_READ_FILE) ||
-               /* http:// and https:// URL */
-               (code == 404 && result == CURLE_HTTP_RETURNED_ERROR) ||
-               /* ftp:// URL */
-               (code == 550 && result == CURLE_FTP_COULDNT_RETR_FILE)
-               ;
-}
-
-#define missing_target(a) missing__target((a)->http_code, (a)->curl_result)
-

 static void fetch_alternates(struct walker *walker, const char *base);
 
 static void process_object_response(void *callback_data);
 static void fetch_alternates(struct walker *walker, const char *base);
 
 static void process_object_response(void *callback_data);

diff --git a/http.h b/http.h
index fe1b0d153bcd80d12a405c26e0f073cbf14dde34..b9d6f4823d4a5318c6b7ac2f3d80bdce46e30d68 100644 (file)
--- a/http.h
+++ b/http.h
@@ -82,4 +82,17 @@ extern int active_requests;
 
 extern char curl_errorstr[CURL_ERROR_SIZE];
 
 
 extern char curl_errorstr[CURL_ERROR_SIZE];
 

+static inline int missing__target(int code, int result)
+{
+       return  /* file:// URL -- do we ever use one??? */
+               (result == CURLE_FILE_COULDNT_READ_FILE) ||
+               /* http:// and https:// URL */
+               (code == 404 && result == CURLE_HTTP_RETURNED_ERROR) ||
+               /* ftp:// URL */
+               (code == 550 && result == CURLE_FTP_COULDNT_RETR_FILE)
+               ;
+}
+
+#define missing_target(a) missing__target((a)->http_code, (a)->curl_result)
+

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

diff --git a/transport.c b/transport.c
index 58e66f6c11798dac416941ce5ad3dbae91c31a06..1f840a0498f9fa013c4b10d874525fbca679b2de 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -426,19 +426,6 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
        return !!err;
 }
 
        return !!err;
 }
 

-static int missing__target(int code, int result)
-{
-       return  /* file:// URL -- do we ever use one??? */
-               (result == CURLE_FILE_COULDNT_READ_FILE) ||
-               /* http:// and https:// URL */
-               (code == 404 && result == CURLE_HTTP_RETURNED_ERROR) ||
-               /* ftp:// URL */
-               (code == 550 && result == CURLE_FTP_COULDNT_RETR_FILE)
-               ;
-}
-
-#define missing_target(a) missing__target((a)->http_code, (a)->curl_result)
-

 static struct ref *get_refs_via_curl(struct transport *transport)
 {
        struct buffer buffer;
 static struct ref *get_refs_via_curl(struct transport *transport)
 {
        struct buffer buffer;