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 <olaf@aepfle.de>
Closes #6392

diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c
index e56d1d97046c8e880e18105ebc163a6f32501980..47b713a6c21d840e2c7eebe10a35a2f9f21dc845 100644 (file)
--- 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 5990799ebc44a1e4c1b1c7e1aba57d4d4fa40bee..02b600d9cd38fe0629de9a89f54a6d7e741ad757 100644 (file)
--- 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 15dfec7bd30b310151a4ae16f7a27ab233c7e0d3..7ed7634aed0a8ec08d3074c4fef8540efd2124dd 100644 (file)
--- 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 5ae1030dc9ab624f22918d3330ef4bc9a4fe8c4e..fbbc01b124976baf486a36c67f4c6ad7dddab705 100644 (file)
--- 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 ac7eb71af409d142b82544a62f2b069f658b19ae..50166bfef571a1663aeb8af2af2acfdc88565b2c 100644 (file)
--- 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 09da1d8e75c30d660ec7c941aee4488680f0d0a9..8545d5aebe6c0871e6b541387d22fd8f6b21992f 100644 (file)
--- 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 163600a5b160c67d9945ab4d2fe858b9c4322416..8365ab208b48e14e4e9b9174f1e6bc2d3fee4283 100644 (file)
--- 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 09287a4419e62ec80833138a333caaf6eb304876..9c045710ab9325f8ab76bed5665d1a4fb4db8566 100644 (file)
--- 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 9ee3f9a23bfba5f8f384363bbb98f681908b9145..f9c8160365593460010800463caa7fd2951bcefb 100644 (file)
--- 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 a58bed22a9e2d5bcacea72425431336448205ad0..e2aa37392818d7fc42218a93119959214745c407 100644 (file)
--- a/docs/examples/sftpuploadresume.c
+++ b/docs/examples/sftpuploadresume.c
@@ -29,7 +29,7 @@
 #include <curl/curl.h>
 
 /* 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 3f520c0a59d0c7cff5ace3feea547b74178324fd..e5bb4932c8690d43239ccaf30bb6a6f4e378384f 100644 (file)
--- 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 3e071c5f9a70bbe8bd42f042f1498011e0511bf5..6ed7869ddd7350f6c348eac9314b6112ce6d3e8c 100644 (file)
--- 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 07e1bd88278f8be13470ff4de1f270e23d2b195d..4d9eebb61359016a04e20316401c58ea3a684fb2 100644 (file)
--- 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 d017b6b63507d5f537c8084c46cee891a38c6d0a..a3cd8bb5dcee652e80bf557e265a0bbbfae394a8 100644 (file)
--- 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 a328f631e5209f202e6fa07b13df30eca51e6e7f..d8f256186cf3ebb0bfaa1d42a935b493a9dce111 100644 (file)
--- 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 8b796fc6023f80563256d411d4e32f23e6ba0550..c5469753783e3cdb5eb93e0fe67788ed766b93db 100644 (file)
--- 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 eec53b6e3983caccf1fd5e8668993cd5cce619f9..507373d8fb85dcc3650b6d1e621bc7ba7af55951 100644 (file)
--- 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 ea25f17d45cd74e78507248ecc2a10a9a14ac02c..0e5ad470d5812e4136a18dcd278177468e389210 100644 (file)
--- 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 019b4f113119d8fe2432c059a131506e9c894151..dd83fc021895401f5738c60176113c9769cd6340 100644 (file)
--- 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 ee9b4e9ba283faa9fe80ea30842098ef1e3889a0..51302ad55e9dae19eb50e04c7df6765d933d53fd 100644 (file)
--- 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 173f65cbfa8fcac2ac77dbd28848137c6ef7a922..c3a4986c2623f0b57043afd655662d16f3b278a3 100644 (file)
--- 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 dda2a2fe1aae831cb122d7a34416dc4ac5f95e66..b0ff08a5442c0a0c3e7dc6db93f36f2eb5c35e5c 100644 (file)
--- 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 e8aff9865ed72320e7a8e157104c7117ec034b32..a2a4db2268c4dd98c38226c6ba8ade89696788bb 100644 (file)
--- 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 1fec7043f06fcf5e9d1d2790452bf8e69f9329a4..37abc61113283cd03e3efd8b02ed9709ba5ec09e 100644 (file)
--- 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 32e9fb57c3962e7747b857149e35523fa1dd1511..9e0e452a0ba02b68b1b8672a70594898ddb2703e 100644 (file)
--- 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 21a3eacbad89ed069f31440bae115cb2d9264f0a..e7bd0abc572795d3f3b9a29b510dc729d3a721c9 100644 (file)
--- 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 6dbafb25fca79fb287ffcd296c415dddcc529dce..8349b1db53f9c9118cb9be8dda3114dc65a4670d 100644 (file)
--- 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 424ef50d3aea9c9c539e85679af7766471eb57ec..b5391fb8eaa5580fd6780615cfb55ca07604f8ae 100644 (file)
--- 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 0cd85d433ca008b6e9540173aa45c742c2db5b64..21919b101f2e970ef92fda36168b18fecae7fced 100644 (file)
--- 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 73bac3f317e3b7fa71cd55a9c02785becee119dd..80fc57b9b81055da7ce1030c2f6bd9b76260c695 100644 (file)
--- 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 11e62d58334a3bfb9373bcdf22740fc6e306e82b..57a9d84dc959bf117319f136afeb609e42a1be1c 100644 (file)
--- 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 75779eefec5ba8fb850eaab3d89a5598f9b953a4..6e70e75f0c803ca603e34cf369cb0b2d21b7cfcf 100644 (file)
--- 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 d52ce082a0586d502a6e1059f2cbdda3a817d560..31b2bdba69a882c1ccf58880c150037293767542 100644 (file)
--- 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 18e8950c2a7c767211a0d93312abdc39cb08dc22..aebbb1b555ffb133892a1a2da175dafb54afee05 100644 (file)
--- 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 392ae7dcd85fa6755a0e6b8effd6920e93d905cc..5b38530d148fd505ee78b223f1f60823d86332a9 100644 (file)
--- 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 ef90944b0cc44ed602740e084cfc190a8382de0a..d06138d85309c8bf807a8a3cffddf3e3fc348714 100644 (file)
--- 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;