From b12fef3f3137bc606d283a2e527dd9050edf2b12 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 27 Feb 2008 09:06:15 +0000
Subject: [PATCH] Michal Marek's cleanup of how curl_easy_setopt() is used in
examples and test code. Thanks to his curl_easy_setopt() typechecker work...
---
docs/examples/10-at-a-time.c | 2 +-
docs/examples/anyauthput.c | 10 +++++-----
docs/examples/debug.c | 4 ++--
docs/examples/ftpget.c | 2 +-
docs/examples/multi-debugcallback.c | 2 +-
tests/libtest/lib506.c | 8 ++++----
tests/libtest/lib552.c | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/docs/examples/10-at-a-time.c b/docs/examples/10-at-a-time.c
index 99a031103d..b30efc0752 100644
--- a/docs/examples/10-at-a-time.c
+++ b/docs/examples/10-at-a-time.c
@@ -77,7 +77,7 @@ static const char *urls[] = {
#define MAX 10 /* number of simultaneous transfers */
#define CNT sizeof(urls)/sizeof(char*) /* total number of transfers to do */
-static int cb(char *d, size_t n, size_t l, void *p)
+static size_t cb(char *d, size_t n, size_t l, void *p)
{
/* take care of the data here, ignored in this example */
(void)d;
diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c
index bc6138f587..2c8f738ea3 100644
--- a/docs/examples/anyauthput.c
+++ b/docs/examples/anyauthput.c
@@ -37,7 +37,7 @@
/* ioctl callback function */
static curlioerr my_ioctl(CURL *handle, curliocmd cmd, void *userp)
{
- int fd = (int)userp;
+ intptr_t fd = (intptr_t)userp;
(void)handle; /* not used in here */
@@ -61,7 +61,7 @@ static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream)
{
size_t retcode;
- int fd = (int)stream;
+ intptr_t fd = (intptr_t)stream;
retcode = read(fd, ptr, size * nmemb);
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
{
CURL *curl;
CURLcode res;
- int hd ;
+ intptr_t hd ;
struct stat file_info;
char *file;
@@ -100,13 +100,13 @@ int main(int argc, char **argv)
curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
/* which file to upload */
- curl_easy_setopt(curl, CURLOPT_READDATA, hd);
+ curl_easy_setopt(curl, CURLOPT_READDATA, (void*)hd);
/* set the ioctl function */
curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, my_ioctl);
/* pass the file descriptor to the ioctl callback as well */
- curl_easy_setopt(curl, CURLOPT_IOCTLDATA, hd);
+ curl_easy_setopt(curl, CURLOPT_IOCTLDATA, (void*)hd);
/* enable "uploading" (which means PUT when doing HTTP) */
curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
diff --git a/docs/examples/debug.c b/docs/examples/debug.c
index 1443ae55d8..6f7a6383a9 100644
--- a/docs/examples/debug.c
+++ b/docs/examples/debug.c
@@ -65,7 +65,7 @@ void dump(const char *text,
static
int my_trace(CURL *handle, curl_infotype type,
- unsigned char *data, size_t size,
+ char *data, size_t size,
void *userp)
{
struct data *config = (struct data *)userp;
@@ -98,7 +98,7 @@ int my_trace(CURL *handle, curl_infotype type,
break;
}
- dump(text, stderr, data, size, config->trace_ascii);
+ dump(text, stderr, (unsigned char *)data, size, config->trace_ascii);
return 0;
}
diff --git a/docs/examples/ftpget.c b/docs/examples/ftpget.c
index 42e70bd573..155e79cb70 100644
--- a/docs/examples/ftpget.c
+++ b/docs/examples/ftpget.c
@@ -26,7 +26,7 @@ struct FtpFile {
FILE *stream;
};
-static int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+static size_t my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
{
struct FtpFile *out=(struct FtpFile *)stream;
if(out && !out->stream) {
diff --git a/docs/examples/multi-debugcallback.c b/docs/examples/multi-debugcallback.c
index 4c93df4dc1..1cd6e4398e 100644
--- a/docs/examples/multi-debugcallback.c
+++ b/docs/examples/multi-debugcallback.c
@@ -74,7 +74,7 @@ void dump(const char *text,
static
int my_trace(CURL *handle, curl_infotype type,
- unsigned char *data, size_t size,
+ char *data, size_t size,
void *userp)
{
const char *text;
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index eaf96d2e93..4bec2884f9 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -107,10 +107,10 @@ static void *fire(void *ptr)
headers = sethost(NULL);
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
- curl_easy_setopt(curl, CURLOPT_HTTPHEADER, (void*)headers);
- curl_easy_setopt(curl, CURLOPT_URL, (void*)tdata->url);
+ curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
+ curl_easy_setopt(curl, CURLOPT_URL, tdata->url);
printf( "CURLOPT_SHARE\n" );
- curl_easy_setopt(curl, CURLOPT_SHARE, (void*)tdata->share);
+ curl_easy_setopt(curl, CURLOPT_SHARE, tdata->share);
printf( "PERFORM\n" );
code = curl_easy_perform(curl);
@@ -222,7 +222,7 @@ int test(char *URL)
url = suburl( URL, i );
headers = sethost( NULL );
- curl_easy_setopt( curl, CURLOPT_HTTPHEADER, (void*)headers );
+ curl_easy_setopt( curl, CURLOPT_HTTPHEADER, headers );
curl_easy_setopt( curl, CURLOPT_URL, url );
printf( "CURLOPT_SHARE\n" );
curl_easy_setopt( curl, CURLOPT_SHARE, share );
diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c
index 8c6e2be37d..3cfeffe73c 100644
--- a/tests/libtest/lib552.c
+++ b/tests/libtest/lib552.c
@@ -67,7 +67,7 @@ void dump(const char *text,
static
int my_trace(CURL *handle, curl_infotype type,
- unsigned char *data, size_t size,
+ char *data, size_t size,
void *userp)
{
struct data *config = (struct data *)userp;
@@ -100,7 +100,7 @@ int my_trace(CURL *handle, curl_infotype type,
break;
}
- dump(text, stderr, data, size, config->trace_ascii);
+ dump(text, stderr, (unsigned char *)data, size, config->trace_ascii);
return 0;
}
--
GitLab