Skip to content

Commit aced311

Browse files
hannobbagder
authored andcommitted
curl: fix callback argument inconsistency
As you can see the callback definition uses a char* for the first argument, while the function uses a void*. URL: https://curl.haxx.se/mail/lib-2017-03/0116.html
1 parent 396f342 commit aced311

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/tool_cb_hdr.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static char *parse_filename(const char *ptr, size_t len);
4040
** callback for CURLOPT_HEADERFUNCTION
4141
*/
4242

43-
size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata)
43+
size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
4444
{
4545
struct HdrCbData *hdrcbdata = userdata;
4646
struct OutStruct *outs = hdrcbdata->outs;

src/tool_cb_hdr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct HdrCbData {
4848
** callback for CURLOPT_HEADERFUNCTION
4949
*/
5050

51-
size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata);
51+
size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata);
5252

5353
#endif /* HEADER_CURL_TOOL_CB_HDR_H */
5454

src/tool_cb_wrt.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bool tool_create_output_file(struct OutStruct *outs)
7272
** callback for CURLOPT_WRITEFUNCTION
7373
*/
7474

75-
size_t tool_write_cb(void *buffer, size_t sz, size_t nmemb, void *userdata)
75+
size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
7676
{
7777
size_t rc;
7878
struct OutStruct *outs = userdata;

src/tool_cb_wrt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
** callback for CURLOPT_WRITEFUNCTION
2828
*/
2929

30-
size_t tool_write_cb(void *buffer, size_t sz, size_t nmemb, void *userdata);
30+
size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata);
3131

3232
/* create a local file for writing, return TRUE on success */
3333
bool tool_create_output_file(struct OutStruct *outs);

0 commit comments

Comments
 (0)