diff options
author | Marcel Raad <raad@teamviewer.com> | 2017-05-08 19:59:46 +0200 |
---|---|---|
committer | Marcel Raad <raad@teamviewer.com> | 2017-05-08 19:59:46 +0200 |
commit | 141ed8ca09e0650879d2333ecce19ff1b339b895 (patch) | |
tree | 1bea5ea4850129bb17a03203023d4e747ca6399e /tests/libtest | |
parent | 78007305203140162f567fd611182cfc41ac51dd (diff) |
libtest: fix MinGW-w64 warnings
long is 32 bits while size_t is 64 bits on MinGW-w64, so
typecheck-gcc.h complains when using size_t for a long option.
Also, curl_socket_t is unsigned long long rather than int.
Diffstat (limited to 'tests/libtest')
-rw-r--r-- | tests/libtest/lib1525.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib1526.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib1527.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib555.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib578.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib582.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/libtest/lib1525.c b/tests/libtest/lib1525.c index 39d51bb11..a76494589 100644 --- a/tests/libtest/lib1525.c +++ b/tests/libtest/lib1525.c @@ -82,7 +82,7 @@ int test(char *URL) test_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite); test_setopt(curl, CURLOPT_READFUNCTION, read_callback); test_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, 1L); - test_setopt(curl, CURLOPT_INFILESIZE, strlen(data)); + test_setopt(curl, CURLOPT_INFILESIZE, (long)strlen(data)); res = curl_easy_perform(curl); diff --git a/tests/libtest/lib1526.c b/tests/libtest/lib1526.c index b2d2a4118..704ae497d 100644 --- a/tests/libtest/lib1526.c +++ b/tests/libtest/lib1526.c @@ -85,7 +85,7 @@ int test(char *URL) test_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite); test_setopt(curl, CURLOPT_READFUNCTION, read_callback); test_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, 1L); - test_setopt(curl, CURLOPT_INFILESIZE, strlen(data)); + test_setopt(curl, CURLOPT_INFILESIZE, (long)strlen(data)); res = curl_easy_perform(curl); diff --git a/tests/libtest/lib1527.c b/tests/libtest/lib1527.c index 5dec7fcc0..689839e3d 100644 --- a/tests/libtest/lib1527.c +++ b/tests/libtest/lib1527.c @@ -83,7 +83,7 @@ int test(char *URL) test_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite); test_setopt(curl, CURLOPT_READFUNCTION, read_callback); test_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, 1L); - test_setopt(curl, CURLOPT_INFILESIZE, strlen(data)); + test_setopt(curl, CURLOPT_INFILESIZE, (long)strlen(data)); test_setopt(curl, CURLOPT_HEADEROPT, CURLHEADER_UNIFIED); res = curl_easy_perform(curl); diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c index e84af87e5..8156a95e7 100644 --- a/tests/libtest/lib555.c +++ b/tests/libtest/lib555.c @@ -98,7 +98,7 @@ int test(char *URL) easy_setopt(curl, CURLOPT_READDATA, &counter); /* We CANNOT do the POST fine without setting the size (or choose chunked)! */ - easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strlen(UPLOADTHIS)); + easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)strlen(UPLOADTHIS)); easy_setopt(curl, CURLOPT_POST, 1L); #ifdef CURL_DOES_CONVERSIONS diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c index 9603b58d7..41b23db34 100644 --- a/tests/libtest/lib578.c +++ b/tests/libtest/lib578.c @@ -77,7 +77,7 @@ int test(char *URL) #endif /* Set the expected POST size */ - test_setopt(curl, CURLOPT_POSTFIELDSIZE, data_size); + test_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)data_size); test_setopt(curl, CURLOPT_POSTFIELDS, data); /* we want to use our own progress function */ diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c index eec0455f6..1eb9b02d5 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -320,7 +320,7 @@ int test(char *URL) tv.tv_usec = 100000; } - select_test(maxFd, &readSet, &writeSet, NULL, &tv); + select_test((int)maxFd, &readSet, &writeSet, NULL, &tv); /* Check the sockets for reading / writing */ checkFdSet(m, &sockets.read, &readSet, CURL_CSELECT_IN, "read"); |