http: make curl callbacks match contracts from curl header

Yes, these don't match perfectly with the void* first parameter of the
fread/fwrite in the standard library, but they do match the curl
expected method signature. This is needed when a refactor passes a
curl_write_callback around, which would otherwise give incorrect
parameter warnings.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-walker.c b/http-walker.c
index 9bc8114c3bb2f6f87f7f61962a64c4e5b012dcf8..51a906e9e3316582561304995e1a1bbbdcd6ca7c 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -185,7 +185,7 @@ static void process_alternates_response(void *callback_data)
        struct active_request_slot *slot = alt_req->slot;
        struct alt_base *tail = cdata->alt;
        const char *base = alt_req->base;
        struct active_request_slot *slot = alt_req->slot;
        struct alt_base *tail = cdata->alt;
        const char *base = alt_req->base;

-       static const char null_byte = '\0';
+       const char null_byte = '\0';

        char *data;
        int i = 0;
 
        char *data;
        int i = 0;
 


@@ -218,7 +218,7 @@ static void process_alternates_response(void *callback_data)
                }
        }
 
                }
        }
 

-       fwrite_buffer(&null_byte, 1, 1, alt_req->buffer);
+       fwrite_buffer((char *)&null_byte, 1, 1, alt_req->buffer);

        alt_req->buffer->len--;
        data = alt_req->buffer->buf;
 
        alt_req->buffer->len--;
        data = alt_req->buffer->buf;
 

diff --git a/http.c b/http.c
index b27bb57d627f19d725b1f24aa3f06d261e48f8e5..b2ae8de16db3abe2cad27249ae767f421aa6bb24 100644 (file)
--- a/http.c
+++ b/http.c
@@ -60,7 +60,7 @@ static struct curl_slist *no_pragma_header;
 
 static struct active_request_slot *active_queue_head;
 
 
 static struct active_request_slot *active_queue_head;
 

-size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
+size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)

 {
        size_t size = eltsize * nmemb;
        struct buffer *buffer = buffer_;
 {
        size_t size = eltsize * nmemb;
        struct buffer *buffer = buffer_;


@@ -92,7 +92,7 @@ curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp)
 }
 #endif
 
 }
 #endif
 

-size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
+size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)

 {
        size_t size = eltsize * nmemb;
        struct strbuf *buffer = buffer_;
 {
        size_t size = eltsize * nmemb;
        struct strbuf *buffer = buffer_;


@@ -102,7 +102,7 @@ size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *buffer
        return size;
 }
 
        return size;
 }
 

-size_t fwrite_null(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf)
+size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf)

 {
        data_received++;
        return eltsize * nmemb;
 {
        data_received++;
        return eltsize * nmemb;


@@ -1167,7 +1167,7 @@ struct http_pack_request *new_http_pack_request(
 }
 
 /* Helpers for fetching objects (loose) */
 }
 
 /* Helpers for fetching objects (loose) */

-static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
+static size_t fwrite_sha1_file(char *ptr, size_t eltsize, size_t nmemb,

                               void *data)
 {
        unsigned char expn[4096];
                               void *data)
 {
        unsigned char expn[4096];


@@ -1184,7 +1184,7 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
        } while (posn < size);
 
        freq->stream.avail_in = size;
        } while (posn < size);
 
        freq->stream.avail_in = size;

-       freq->stream.next_in = ptr;
+       freq->stream.next_in = (void *)ptr;

        do {
                freq->stream.next_out = expn;
                freq->stream.avail_out = sizeof(expn);
        do {
                freq->stream.next_out = expn;
                freq->stream.avail_out = sizeof(expn);


@@ -1203,7 +1203,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
        char *filename;
        char prevfile[PATH_MAX];
        int prevlocal;
        char *filename;
        char prevfile[PATH_MAX];
        int prevlocal;

-       unsigned char prev_buf[PREV_BUF_SIZE];
+       char prev_buf[PREV_BUF_SIZE];

        ssize_t prev_read = 0;
        long prev_posn = 0;
        char range[RANGE_HEADER_SIZE];
        ssize_t prev_read = 0;
        long prev_posn = 0;
        char range[RANGE_HEADER_SIZE];

diff --git a/http.h b/http.h
index e9ed3c2e8272e43208e75459ec29fd8b6548ae4d..19b7134fa5c7ff9b65565dcbddccae1354f024c7 100644 (file)
--- a/http.h
+++ b/http.h
@@ -66,9 +66,9 @@ struct buffer {
 };
 
 /* Curl request read/write callbacks */
 };
 
 /* Curl request read/write callbacks */

-extern size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
-extern size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
-extern size_t fwrite_null(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
+extern size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
+extern size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
+extern size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);

 #ifndef NO_CURL_IOCTL
 extern curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp);
 #endif
 #ifndef NO_CURL_IOCTL
 extern curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp);
 #endif

diff --git a/remote-curl.c b/remote-curl.c
index 775d6143037aa4573c0202715fe1b1a0f99e2799..17d8a9b377265aeed9765f04d505959e1f7fb9b0 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -347,7 +347,7 @@ static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
 }
 #endif
 
 }
 #endif
 

-static size_t rpc_in(const void *ptr, size_t eltsize,
+static size_t rpc_in(char *ptr, size_t eltsize,

                size_t nmemb, void *buffer_)
 {
        size_t size = eltsize * nmemb;
                size_t nmemb, void *buffer_)
 {
        size_t size = eltsize * nmemb;