Skip to content

Commit

Permalink
Work around gcc warnings from curl headers
Browse files Browse the repository at this point in the history
After master.k.org upgrade, I started seeing these warning messages:

    transport.c: In function 'get_refs_via_curl':
    transport.c:458: error: call to '_curl_easy_setopt_err_write_callback' declared with attribute warning: curl_easy_setopt expects a curl_write_callback argument for this option

It appears that the curl header wants to enforce the function signature
for callback function given to curl_easy_setopt() to be compatible with
that of (*curl_write_callback) or fwrite.  This patch seems to work the
issue around.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Jul 4, 2008
1 parent 182c5af commit f444e52
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
13 changes: 7 additions & 6 deletions http.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ static struct curl_slist *pragma_header;

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, void *buffer_)
{
size_t size = eltsize * nmemb;
struct buffer *buffer = buffer_;

if (size > buffer->buf.len - buffer->posn)
size = buffer->buf.len - buffer->posn;
memcpy(ptr, buffer->buf.buf + buffer->posn, size);
Expand All @@ -42,17 +43,17 @@ size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
return size;
}

size_t fwrite_buffer(const void *ptr, size_t eltsize,
size_t nmemb, struct strbuf *buffer)
size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
{
size_t size = eltsize * nmemb;
struct strbuf *buffer = buffer_;

strbuf_add(buffer, ptr, size);
data_received++;
return size;
}

size_t fwrite_null(const void *ptr, size_t eltsize,
size_t nmemb, struct strbuf *buffer)
size_t fwrite_null(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf)
{
data_received++;
return eltsize * nmemb;
Expand Down
9 changes: 3 additions & 6 deletions http.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,9 @@ struct buffer
};

/* Curl request read/write callbacks */
extern size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
struct buffer *buffer);
extern size_t fwrite_buffer(const void *ptr, size_t eltsize,
size_t nmemb, struct strbuf *buffer);
extern size_t fwrite_null(const void *ptr, size_t eltsize,
size_t nmemb, struct strbuf *buffer);
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);

/* Slot lifecycle functions */
extern struct active_request_slot *get_active_slot(void);
Expand Down

0 comments on commit f444e52

Please sign in to comment.