Browse Source

Avoid redundant declaration of missing_target()

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Mike Hommey 17 years ago committed by Junio C Hamano
parent
commit
e8dc37e0e3
  1. 13
      http-walker.c
  2. 13
      http.h
  3. 13
      transport.c

13
http-walker.c

@ -90,19 +90,6 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb, @@ -90,19 +90,6 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
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);

13
http.h

@ -82,4 +82,17 @@ extern int active_requests; @@ -82,4 +82,17 @@ extern int active_requests;

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 */

13
transport.c

@ -426,19 +426,6 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons @@ -426,19 +426,6 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
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;

Loading…
Cancel
Save