From f2ed79d8eec468612a29bee4f7ef286ccf255c96 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 30 Dec 2020 17:01:47 +0100 Subject: docs/examples: adjust prototypes for CURLOPT_READFUNCTION The type of the buffer in curl_read_callback is 'char *', not 'void *'. Signed-off-by: Olaf Hering Closes #6392 --- docs/examples/anyauthput.c | 2 +- docs/examples/curlgtk.c | 2 +- docs/examples/ftpupload.c | 2 +- docs/examples/ftpuploadfrommem.c | 2 +- docs/examples/ftpuploadresume.c | 2 +- docs/examples/http2-upload.c | 2 +- docs/examples/httpput.c | 2 +- docs/examples/imap-append.c | 2 +- docs/examples/post-callback.c | 2 +- docs/examples/sftpuploadresume.c | 2 +- docs/examples/smtp-authzid.c | 2 +- docs/examples/smtp-mail.c | 2 +- docs/examples/smtp-multi.c | 2 +- docs/examples/smtp-ssl.c | 2 +- docs/examples/smtp-tls.c | 2 +- docs/libcurl/opts/CURLOPT_READFUNCTION.3 | 2 +- src/tool_cb_rea.c | 2 +- src/tool_cb_rea.h | 2 +- tests/libtest/lib1507.c | 2 +- tests/libtest/lib1514.c | 4 ++-- tests/libtest/lib1517.c | 2 +- tests/libtest/lib1520.c | 2 +- tests/libtest/lib1525.c | 2 +- tests/libtest/lib1526.c | 2 +- tests/libtest/lib1527.c | 2 +- tests/libtest/lib1533.c | 2 +- tests/libtest/lib1591.c | 2 +- tests/libtest/lib508.c | 4 ++-- tests/libtest/lib510.c | 2 +- tests/libtest/lib513.c | 2 +- tests/libtest/lib547.c | 2 +- tests/libtest/lib552.c | 2 +- tests/libtest/lib553.c | 2 +- tests/libtest/lib554.c | 4 ++-- tests/libtest/lib555.c | 2 +- tests/libtest/lib579.c | 2 +- 36 files changed, 39 insertions(+), 39 deletions(-) diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c index e56d1d970..47b713a6c 100644 --- a/docs/examples/anyauthput.c +++ b/docs/examples/anyauthput.c @@ -78,7 +78,7 @@ static curlioerr my_ioctl(CURL *handle, curliocmd cmd, void *userp) } /* read callback function, fread() look alike */ -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *stream) { ssize_t retcode; curl_off_t nread; diff --git a/docs/examples/curlgtk.c b/docs/examples/curlgtk.c index 5990799eb..02b600d9c 100644 --- a/docs/examples/curlgtk.c +++ b/docs/examples/curlgtk.c @@ -24,7 +24,7 @@ size_t my_write_func(void *ptr, size_t size, size_t nmemb, FILE *stream) return fwrite(ptr, size, nmemb, stream); } -size_t my_read_func(void *ptr, size_t size, size_t nmemb, FILE *stream) +size_t my_read_func(char *ptr, size_t size, size_t nmemb, FILE *stream) { return fread(ptr, size, nmemb, stream); } diff --git a/docs/examples/ftpupload.c b/docs/examples/ftpupload.c index 15dfec7bd..7ed7634ae 100644 --- a/docs/examples/ftpupload.c +++ b/docs/examples/ftpupload.c @@ -48,7 +48,7 @@ DLL, you MUST also provide a read callback with CURLOPT_READFUNCTION. Failing to do so will give you a crash since a DLL may not use the variable's memory when passed in to it from an app like this. */ -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *stream) { curl_off_t nread; /* in real-world cases, this would probably get this data differently diff --git a/docs/examples/ftpuploadfrommem.c b/docs/examples/ftpuploadfrommem.c index 5ae1030dc..fbbc01b12 100644 --- a/docs/examples/ftpuploadfrommem.c +++ b/docs/examples/ftpuploadfrommem.c @@ -43,7 +43,7 @@ struct WriteThis { size_t sizeleft; }; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { struct WriteThis *upload = (struct WriteThis *)userp; size_t max = size*nmemb; diff --git a/docs/examples/ftpuploadresume.c b/docs/examples/ftpuploadresume.c index ac7eb71af..50166bfef 100644 --- a/docs/examples/ftpuploadresume.c +++ b/docs/examples/ftpuploadresume.c @@ -51,7 +51,7 @@ static size_t discardfunc(void *ptr, size_t size, size_t nmemb, void *stream) } /* read data to upload */ -static size_t readfunc(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t readfunc(char *ptr, size_t size, size_t nmemb, void *stream) { FILE *f = stream; size_t n; diff --git a/docs/examples/http2-upload.c b/docs/examples/http2-upload.c index 09da1d8e7..8545d5aeb 100644 --- a/docs/examples/http2-upload.c +++ b/docs/examples/http2-upload.c @@ -159,7 +159,7 @@ int my_trace(CURL *handle, curl_infotype type, return 0; } -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { struct input *i = userp; size_t retcode = fread(ptr, size, nmemb, i->in); diff --git a/docs/examples/httpput.c b/docs/examples/httpput.c index 163600a5b..8365ab208 100644 --- a/docs/examples/httpput.c +++ b/docs/examples/httpput.c @@ -38,7 +38,7 @@ * http://www.apacheweek.com/features/put */ -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *stream) { size_t retcode; curl_off_t nread; diff --git a/docs/examples/imap-append.c b/docs/examples/imap-append.c index 09287a441..9c045710a 100644 --- a/docs/examples/imap-append.c +++ b/docs/examples/imap-append.c @@ -59,7 +59,7 @@ struct upload_status { int lines_read; }; -static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t payload_source(char *ptr, size_t size, size_t nmemb, void *userp) { struct upload_status *upload_ctx = (struct upload_status *)userp; const char *data; diff --git a/docs/examples/post-callback.c b/docs/examples/post-callback.c index 9ee3f9a23..f9c816036 100644 --- a/docs/examples/post-callback.c +++ b/docs/examples/post-callback.c @@ -41,7 +41,7 @@ struct WriteThis { size_t sizeleft; }; -static size_t read_callback(void *dest, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *dest, size_t size, size_t nmemb, void *userp) { struct WriteThis *wt = (struct WriteThis *)userp; size_t buffer_size = size*nmemb; diff --git a/docs/examples/sftpuploadresume.c b/docs/examples/sftpuploadresume.c index a58bed22a..e2aa37392 100644 --- a/docs/examples/sftpuploadresume.c +++ b/docs/examples/sftpuploadresume.c @@ -29,7 +29,7 @@ #include /* read data to upload */ -static size_t readfunc(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t readfunc(char *ptr, size_t size, size_t nmemb, void *stream) { FILE *f = (FILE *)stream; size_t n; diff --git a/docs/examples/smtp-authzid.c b/docs/examples/smtp-authzid.c index 3f520c0a5..e5bb4932c 100644 --- a/docs/examples/smtp-authzid.c +++ b/docs/examples/smtp-authzid.c @@ -67,7 +67,7 @@ struct upload_status { int lines_read; }; -static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t payload_source(char *ptr, size_t size, size_t nmemb, void *userp) { struct upload_status *upload_ctx = (struct upload_status *)userp; const char *data; diff --git a/docs/examples/smtp-mail.c b/docs/examples/smtp-mail.c index 3e071c5f9..6ed7869dd 100644 --- a/docs/examples/smtp-mail.c +++ b/docs/examples/smtp-mail.c @@ -64,7 +64,7 @@ struct upload_status { int lines_read; }; -static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t payload_source(char *ptr, size_t size, size_t nmemb, void *userp) { struct upload_status *upload_ctx = (struct upload_status *)userp; const char *data; diff --git a/docs/examples/smtp-multi.c b/docs/examples/smtp-multi.c index 07e1bd882..4d9eebb61 100644 --- a/docs/examples/smtp-multi.c +++ b/docs/examples/smtp-multi.c @@ -61,7 +61,7 @@ struct upload_status { int lines_read; }; -static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t payload_source(char *ptr, size_t size, size_t nmemb, void *userp) { struct upload_status *upload_ctx = (struct upload_status *)userp; const char *data; diff --git a/docs/examples/smtp-ssl.c b/docs/examples/smtp-ssl.c index d017b6b63..a3cd8bb5d 100644 --- a/docs/examples/smtp-ssl.c +++ b/docs/examples/smtp-ssl.c @@ -61,7 +61,7 @@ struct upload_status { int lines_read; }; -static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t payload_source(char *ptr, size_t size, size_t nmemb, void *userp) { struct upload_status *upload_ctx = (struct upload_status *)userp; const char *data; diff --git a/docs/examples/smtp-tls.c b/docs/examples/smtp-tls.c index a328f631e..d8f256186 100644 --- a/docs/examples/smtp-tls.c +++ b/docs/examples/smtp-tls.c @@ -61,7 +61,7 @@ struct upload_status { int lines_read; }; -static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t payload_source(char *ptr, size_t size, size_t nmemb, void *userp) { struct upload_status *upload_ctx = (struct upload_status *)userp; const char *data; diff --git a/docs/libcurl/opts/CURLOPT_READFUNCTION.3 b/docs/libcurl/opts/CURLOPT_READFUNCTION.3 index 8b796fc60..c54697537 100644 --- a/docs/libcurl/opts/CURLOPT_READFUNCTION.3 +++ b/docs/libcurl/opts/CURLOPT_READFUNCTION.3 @@ -75,7 +75,7 @@ The default internal read callback is fread(). This is used for all protocols when doing uploads. .SH EXAMPLE .nf -size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userdata) +size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userdata) { FILE *readhere = (FILE *)userdata; curl_off_t nread; diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c index eec53b6e3..507373d8f 100644 --- a/src/tool_cb_rea.c +++ b/src/tool_cb_rea.c @@ -35,7 +35,7 @@ ** callback for CURLOPT_READFUNCTION */ -size_t tool_read_cb(void *buffer, size_t sz, size_t nmemb, void *userdata) +size_t tool_read_cb(char *buffer, size_t sz, size_t nmemb, void *userdata) { ssize_t rc; struct InStruct *in = userdata; diff --git a/src/tool_cb_rea.h b/src/tool_cb_rea.h index ea25f17d4..0e5ad470d 100644 --- a/src/tool_cb_rea.h +++ b/src/tool_cb_rea.h @@ -27,7 +27,7 @@ ** callback for CURLOPT_READFUNCTION */ -size_t tool_read_cb(void *buffer, size_t sz, size_t nmemb, void *userdata); +size_t tool_read_cb(char *buffer, size_t sz, size_t nmemb, void *userdata); /* ** callback for CURLOPT_XFERINFOFUNCTION used to unpause busy reads diff --git a/tests/libtest/lib1507.c b/tests/libtest/lib1507.c index 019b4f113..dd83fc021 100644 --- a/tests/libtest/lib1507.c +++ b/tests/libtest/lib1507.c @@ -35,7 +35,7 @@ #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { (void)ptr; (void)size; diff --git a/tests/libtest/lib1514.c b/tests/libtest/lib1514.c index ee9b4e9ba..51302ad55 100644 --- a/tests/libtest/lib1514.c +++ b/tests/libtest/lib1514.c @@ -35,7 +35,7 @@ struct WriteThis { size_t sizeleft; }; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { struct WriteThis *pooh = (struct WriteThis *)userp; @@ -43,7 +43,7 @@ static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) return 0; if(pooh->sizeleft) { - *(char *)ptr = pooh->readptr[0]; /* copy one single byte */ + *ptr = pooh->readptr[0]; /* copy one single byte */ pooh->readptr++; /* advance pointer */ pooh->sizeleft--; /* less data left */ return 1; /* we return 1 byte at a time! */ diff --git a/tests/libtest/lib1517.c b/tests/libtest/lib1517.c index 173f65cbf..c3a4986c2 100644 --- a/tests/libtest/lib1517.c +++ b/tests/libtest/lib1517.c @@ -30,7 +30,7 @@ struct WriteThis { size_t sizeleft; }; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { struct WriteThis *pooh = (struct WriteThis *)userp; size_t tocopy = size * nmemb; diff --git a/tests/libtest/lib1520.c b/tests/libtest/lib1520.c index dda2a2fe1..b0ff08a54 100644 --- a/tests/libtest/lib1520.c +++ b/tests/libtest/lib1520.c @@ -47,7 +47,7 @@ struct upload_status { int lines_read; }; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { struct upload_status *upload_ctx = (struct upload_status *)userp; const char *data; diff --git a/tests/libtest/lib1525.c b/tests/libtest/lib1525.c index e8aff9865..a2a4db226 100644 --- a/tests/libtest/lib1525.c +++ b/tests/libtest/lib1525.c @@ -32,7 +32,7 @@ static char data [] = "Hello Cloud!\n"; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *stream) { size_t amount = nmemb * size; /* Total bytes curl wants */ if(amount < strlen(data)) { diff --git a/tests/libtest/lib1526.c b/tests/libtest/lib1526.c index 1fec7043f..37abc6111 100644 --- a/tests/libtest/lib1526.c +++ b/tests/libtest/lib1526.c @@ -31,7 +31,7 @@ static char data [] = "Hello Cloud!\n"; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *stream) { size_t amount = nmemb * size; /* Total bytes curl wants */ if(amount < strlen(data)) { diff --git a/tests/libtest/lib1527.c b/tests/libtest/lib1527.c index 32e9fb57c..9e0e452a0 100644 --- a/tests/libtest/lib1527.c +++ b/tests/libtest/lib1527.c @@ -31,7 +31,7 @@ static char data [] = "Hello Cloud!\n"; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *stream) { size_t amount = nmemb * size; /* Total bytes curl wants */ if(amount < strlen(data)) { diff --git a/tests/libtest/lib1533.c b/tests/libtest/lib1533.c index 21a3eacba..e7bd0abc5 100644 --- a/tests/libtest/lib1533.c +++ b/tests/libtest/lib1533.c @@ -48,7 +48,7 @@ static void reset_data(struct cb_data *data, CURL *curl) } -static size_t read_callback(void *ptr, size_t size, size_t nitems, +static size_t read_callback(char *ptr, size_t size, size_t nitems, void *userdata) { struct cb_data *data = (struct cb_data *)userdata; diff --git a/tests/libtest/lib1591.c b/tests/libtest/lib1591.c index 6dbafb25f..8349b1db5 100644 --- a/tests/libtest/lib1591.c +++ b/tests/libtest/lib1591.c @@ -32,7 +32,7 @@ static char data [] = "Hello Cloud!\r\n"; static size_t consumed = 0; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *stream) { size_t amount = nmemb * size; /* Total bytes curl wants */ diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c index 424ef50d3..b5391fb8e 100644 --- a/tests/libtest/lib508.c +++ b/tests/libtest/lib508.c @@ -30,7 +30,7 @@ struct WriteThis { size_t sizeleft; }; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { struct WriteThis *pooh = (struct WriteThis *)userp; @@ -38,7 +38,7 @@ static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) return 0; if(pooh->sizeleft) { - *(char *)ptr = pooh->readptr[0]; /* copy one single byte */ + *ptr = pooh->readptr[0]; /* copy one single byte */ pooh->readptr++; /* advance pointer */ pooh->sizeleft--; /* less data left */ return 1; /* we return 1 byte at a time! */ diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c index 0cd85d433..21919b101 100644 --- a/tests/libtest/lib510.c +++ b/tests/libtest/lib510.c @@ -36,7 +36,7 @@ struct WriteThis { int counter; }; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { struct WriteThis *pooh = (struct WriteThis *)userp; const char *data; diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c index 73bac3f31..80fc57b9b 100644 --- a/tests/libtest/lib513.c +++ b/tests/libtest/lib513.c @@ -23,7 +23,7 @@ #include "memdebug.h" -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { (void)ptr; (void)size; diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c index 11e62d583..57a9d84dc 100644 --- a/tests/libtest/lib547.c +++ b/tests/libtest/lib547.c @@ -38,7 +38,7 @@ #endif #ifndef LIB548 -static size_t readcallback(void *ptr, +static size_t readcallback(char *ptr, size_t size, size_t nmemb, void *clientp) diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index 75779eefe..6e70e75f0 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -127,7 +127,7 @@ static size_t current_offset = 0; static char databuf[70000]; /* MUST be more than 64k OR MAX_INITIAL_POST_SIZE */ -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *stream) { size_t amount = nmemb * size; /* Total bytes curl wants */ size_t available = sizeof(databuf) - current_offset; /* What we have to diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c index d52ce082a..31b2bdba6 100644 --- a/tests/libtest/lib553.c +++ b/tests/libtest/lib553.c @@ -30,7 +30,7 @@ #define POSTLEN 40960 -static size_t myreadfunc(void *ptr, size_t size, size_t nmemb, void *stream) +static size_t myreadfunc(char *ptr, size_t size, size_t nmemb, void *stream) { static size_t total = POSTLEN; static char buf[1024]; diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c index 18e8950c2..aebbb1b55 100644 --- a/tests/libtest/lib554.c +++ b/tests/libtest/lib554.c @@ -38,7 +38,7 @@ struct WriteThis { size_t sizeleft; }; -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { #ifdef LIB587 (void)ptr; @@ -54,7 +54,7 @@ static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) return 0; if(pooh->sizeleft) { - *(char *)ptr = pooh->readptr[0]; /* copy one single byte */ + *ptr = pooh->readptr[0]; /* copy one single byte */ pooh->readptr++; /* advance pointer */ pooh->sizeleft--; /* less data left */ return 1; /* we return 1 byte at a time! */ diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c index 392ae7dcd..5b38530d1 100644 --- a/tests/libtest/lib555.c +++ b/tests/libtest/lib555.c @@ -45,7 +45,7 @@ static const char uploadthis[] = "this is the blurb we want to upload\n"; #endif -static size_t readcallback(void *ptr, +static size_t readcallback(char *ptr, size_t size, size_t nmemb, void *clientp) diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c index ef90944b0..d06138d85 100644 --- a/tests/libtest/lib579.c +++ b/tests/libtest/lib579.c @@ -64,7 +64,7 @@ static int progress_callback(void *clientp, double dltotal, double dlnow, return 0; } -static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) { struct WriteThis *pooh = (struct WriteThis *)userp; const char *data; -- cgit v1.2.1