summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2011-05-03 23:47:27 +0800
committerJunio C Hamano <gitster@pobox.com>2011-05-04 13:30:28 -0700
commita04ff3ec32b8a998a18f8b515ae4c48c1846b327 (patch)
tree0092c5d022ca90da22cf516d589cb8ce4b0f1f5b /http.c
parent11c3e2b7bd617334e7730950166188e94e003f2b (diff)
downloadgit-a04ff3ec32b8a998a18f8b515ae4c48c1846b327.tar.gz
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>
Diffstat (limited to 'http.c')
-rw-r--r--http.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/http.c b/http.c
index b27bb57d62..b2ae8de16d 100644
--- 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;
-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_;
@@ -92,7 +92,7 @@ curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp)
}
#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_;
@@ -102,7 +102,7 @@ size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *buffer
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;
@@ -1167,7 +1167,7 @@ abort:
}
/* 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];
@@ -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;
- freq->stream.next_in = ptr;
+ freq->stream.next_in = (void *)ptr;
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;
- 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];