зеркало из https://github.com/microsoft/git.git
Work around gcc warnings from curl headers
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>
This commit is contained in:
Родитель
182c5afa6c
Коммит
f444e5286e
13
http.c
13
http.c
|
@ -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);
|
||||
|
@ -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;
|
||||
|
|
9
http.h
9
http.h
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче