|
@@ -86,18 +86,18 @@ extern int unitfail;
|
|
|
** For portability reasons TEST_ERR_* values should be less than 127.
|
|
|
*/
|
|
|
|
|
|
-#define TEST_ERR_MAJOR_BAD 126
|
|
|
-#define TEST_ERR_RUNS_FOREVER 125
|
|
|
-#define TEST_ERR_EASY_INIT 124
|
|
|
-#define TEST_ERR_MULTI_INIT 123
|
|
|
-#define TEST_ERR_NUM_HANDLES 122
|
|
|
-#define TEST_ERR_SELECT 121
|
|
|
-#define TEST_ERR_SUCCESS 120
|
|
|
-#define TEST_ERR_FAILURE 119
|
|
|
-#define TEST_ERR_USAGE 118
|
|
|
-#define TEST_ERR_FOPEN 117
|
|
|
-#define TEST_ERR_FSTAT 116
|
|
|
-#define TEST_ERR_BAD_TIMEOUT 115
|
|
|
+#define TEST_ERR_MAJOR_BAD (CURLcode) 126
|
|
|
+#define TEST_ERR_RUNS_FOREVER (CURLcode) 125
|
|
|
+#define TEST_ERR_EASY_INIT (CURLcode) 124
|
|
|
+#define TEST_ERR_MULTI (CURLcode) 123
|
|
|
+#define TEST_ERR_NUM_HANDLES (CURLcode) 122
|
|
|
+#define TEST_ERR_SELECT (CURLcode) 121
|
|
|
+#define TEST_ERR_SUCCESS (CURLcode) 120
|
|
|
+#define TEST_ERR_FAILURE (CURLcode) 119
|
|
|
+#define TEST_ERR_USAGE (CURLcode) 118
|
|
|
+#define TEST_ERR_FOPEN (CURLcode) 117
|
|
|
+#define TEST_ERR_FSTAT (CURLcode) 116
|
|
|
+#define TEST_ERR_BAD_TIMEOUT (CURLcode) 115
|
|
|
|
|
|
/*
|
|
|
** Macros for test source code readability/maintainability.
|
|
@@ -154,7 +154,7 @@ extern int unitfail;
|
|
|
#define exe_multi_init(A,Y,Z) do { \
|
|
|
if(((A) = curl_multi_init()) == NULL) { \
|
|
|
fprintf(stderr, "%s:%d curl_multi_init() failed\n", (Y), (Z)); \
|
|
|
- res = TEST_ERR_MULTI_INIT; \
|
|
|
+ res = TEST_ERR_MULTI; \
|
|
|
} \
|
|
|
} while(0)
|
|
|
|
|
@@ -178,7 +178,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_easy_setopt() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_easy_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = ec; \
|
|
|
} \
|
|
|
} while(0)
|
|
|
|
|
@@ -202,7 +202,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_multi_setopt() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_multi_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = TEST_ERR_MULTI; \
|
|
|
} \
|
|
|
} while(0)
|
|
|
|
|
@@ -226,7 +226,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_multi_add_handle() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_multi_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = TEST_ERR_MULTI; \
|
|
|
} \
|
|
|
} while(0)
|
|
|
|
|
@@ -250,7 +250,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_multi_remove_handle() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_multi_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = TEST_ERR_MULTI; \
|
|
|
} \
|
|
|
} while(0)
|
|
|
|
|
@@ -275,7 +275,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_multi_perform() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_multi_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = TEST_ERR_MULTI; \
|
|
|
} \
|
|
|
else if(*((B)) < 0) { \
|
|
|
fprintf(stderr, "%s:%d curl_multi_perform() succeeded, " \
|
|
@@ -305,7 +305,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_multi_fdset() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_multi_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = TEST_ERR_MULTI; \
|
|
|
} \
|
|
|
else if(*((E)) < -1) { \
|
|
|
fprintf(stderr, "%s:%d curl_multi_fdset() succeeded, " \
|
|
@@ -335,7 +335,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_multi_timeout() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_multi_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = TEST_ERR_BAD_TIMEOUT; \
|
|
|
} \
|
|
|
else if(*((B)) < -1L) { \
|
|
|
fprintf(stderr, "%s:%d curl_multi_timeout() succeeded, " \
|
|
@@ -365,7 +365,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_multi_poll() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_multi_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = TEST_ERR_MULTI; \
|
|
|
} \
|
|
|
else if(*((E)) < 0) { \
|
|
|
fprintf(stderr, "%s:%d curl_multi_poll() succeeded, " \
|
|
@@ -395,7 +395,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_multi_wakeup() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_multi_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = TEST_ERR_MULTI; \
|
|
|
} \
|
|
|
} while(0)
|
|
|
|
|
@@ -470,7 +470,7 @@ extern int unitfail;
|
|
|
fprintf(stderr, "%s:%d curl_global_init() failed, " \
|
|
|
"with code %d (%s)\n", \
|
|
|
(Y), (Z), (int)ec, curl_easy_strerror(ec)); \
|
|
|
- res = (int)ec; \
|
|
|
+ res = ec; \
|
|
|
} \
|
|
|
} while(0)
|
|
|
|