From e3009f2950b2f6b778a6e0daf4466d6ec9132ed2 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Fri, 5 Feb 2010 19:19:34 +0000
Subject: [PATCH] fix compiler warning
---
tests/libtest/lib526.c | 2 +-
tests/libtest/lib530.c | 2 +-
tests/libtest/lib568.c | 2 +-
tests/libtest/lib569.c | 6 +++---
tests/libtest/lib570.c | 6 +++---
tests/libtest/lib571.c | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c
index 600ed65e53..c68e19b6d1 100644
--- a/tests/libtest/lib526.c
+++ b/tests/libtest/lib526.c
@@ -215,7 +215,7 @@ int test(char *URL)
res = TEST_ERR_RUNS_FOREVER;
}
-test_cleanup:
+/* test_cleanup: */
#ifndef LIB527
/* get NUM_HANDLES easy handles */
diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index ef2218834f..3b0bd001c2 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -197,7 +197,7 @@ int test(char *URL)
res = TEST_ERR_RUNS_FOREVER;
}
-test_cleanup:
+/* test_cleanup: */
/* cleanup NUM_HANDLES easy handles */
for(i=0; i < NUM_HANDLES; i++) {
diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index 0e7e3fea44..3443c406a7 100644
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@@ -32,7 +32,7 @@ static char *suburl(const char *base, int i)
*/
int test(char *URL)
{
- CURLcode res;
+ int res;
CURL *curl;
int sdp;
FILE *sdpf = NULL;
diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c
index d5af4514ec..815ca3a71d 100644
--- a/tests/libtest/lib569.c
+++ b/tests/libtest/lib569.c
@@ -25,7 +25,7 @@ static char *suburl(const char *base, int i)
*/
int test(char *URL)
{
- CURLcode res;
+ int res;
CURL *curl;
char *stream_uri;
char *rtsp_session_id;
@@ -60,7 +60,7 @@ int test(char *URL)
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_SETUP);
res = curl_easy_perform(curl);
- if(res != CURLE_BAD_FUNCTION_ARGUMENT) {
+ if(res != (int)CURLE_BAD_FUNCTION_ARGUMENT) {
fprintf(stderr, "This should have failed. "
"Cannot setup without a Transport: header");
res = TEST_ERR_MAJOR_BAD;
@@ -113,6 +113,6 @@ test_cleanup:
curl_easy_cleanup(curl);
curl_global_cleanup();
- return (int)res;
+ return res;
}
diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c
index f044f85e22..4f40a02765 100644
--- a/tests/libtest/lib570.c
+++ b/tests/libtest/lib570.c
@@ -22,7 +22,7 @@ static char *suburl(const char *base, int i)
int test(char *URL)
{
- CURLcode res;
+ int res;
CURL *curl;
int request=1;
char *stream_uri = NULL;
@@ -55,7 +55,7 @@ int test(char *URL)
stream_uri = NULL;
res = curl_easy_perform(curl);
- if(res != CURLE_RTSP_CSEQ_ERROR) {
+ if(res != (int)CURLE_RTSP_CSEQ_ERROR) {
fprintf(stderr, "Failed to detect CSeq mismatch");
res = TEST_ERR_MAJOR_BAD;
goto test_cleanup;
@@ -98,6 +98,6 @@ test_cleanup:
curl_easy_cleanup(curl);
curl_global_cleanup();
- return (int)res;
+ return res;
}
diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index a264eddbd9..b91a6fa8b8 100644
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@@ -89,7 +89,7 @@ static char *suburl(const char *base, int i)
int test(char *URL)
{
- CURLcode res;
+ int res;
CURL *curl;
char *stream_uri = NULL;
int request=1;
@@ -189,6 +189,6 @@ test_cleanup:
curl_easy_cleanup(curl);
curl_global_cleanup();
- return (int)res;
+ return res;
}
--
GitLab