curl.h: remove the "RESERVED" error codes

Return codes for tests should be kept private.

Follow-up to 9465327084c920deee7ba5abbcd

Closes #17563

diff --git a/include/curl/curl.h b/include/curl/curl.h
index 77248dfbc29c106cc8d2c244795c27617a2c723c..dfb6c768816399a50638b55ff0690a73666381a4 100644 (file)
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -645,20 +645,7 @@ typedef enum {
   CURLE_UNRECOVERABLE_POLL,      /* 99 - poll/select returned fatal error */
   CURLE_TOO_LARGE,               /* 100 - a value/data met its maximum */
   CURLE_ECH_REQUIRED,            /* 101 - ECH tried but failed */
-  CURL_LAST, /* never use! */
-
-  CURLE_RESERVED115 = 115,       /* 115-126 - used in tests */
-  CURLE_RESERVED116 = 116,
-  CURLE_RESERVED117 = 117,
-  CURLE_RESERVED118 = 118,
-  CURLE_RESERVED119 = 119,
-  CURLE_RESERVED120 = 120,
-  CURLE_RESERVED121 = 121,
-  CURLE_RESERVED122 = 122,
-  CURLE_RESERVED123 = 123,
-  CURLE_RESERVED124 = 124,
-  CURLE_RESERVED125 = 125,
-  CURLE_RESERVED126 = 126
+  CURL_LAST /* never use! */
 } CURLcode;
 
 #ifndef CURL_NO_OLDIES /* define this to test if your app builds with all

diff --git a/lib/strerror.c b/lib/strerror.c
index 9cf93dd66e97d02d58cb3475f0d2d43fdf5425ac..90694882c3c11a9492c32588ef50239d325939d2 100644 (file)
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -317,36 +317,7 @@ curl_easy_strerror(CURLcode error)
     return "ECH attempted but failed";
 
     /* error codes not used by current libcurl */
-  case CURLE_OBSOLETE20:
-  case CURLE_OBSOLETE24:
-  case CURLE_OBSOLETE29:
-  case CURLE_OBSOLETE32:
-  case CURLE_OBSOLETE34:
-  case CURLE_OBSOLETE40:
-  case CURLE_OBSOLETE41:
-  case CURLE_OBSOLETE44:
-  case CURLE_OBSOLETE46:
-  case CURLE_OBSOLETE50:
-  case CURLE_OBSOLETE51:
-  case CURLE_OBSOLETE57:
-  case CURLE_OBSOLETE62:
-  case CURLE_OBSOLETE75:
-  case CURLE_OBSOLETE76:
-
-    /* error codes used by curl tests */
-  case CURLE_RESERVED115:
-  case CURLE_RESERVED116:
-  case CURLE_RESERVED117:
-  case CURLE_RESERVED118:
-  case CURLE_RESERVED119:
-  case CURLE_RESERVED120:
-  case CURLE_RESERVED121:
-  case CURLE_RESERVED122:
-  case CURLE_RESERVED123:
-  case CURLE_RESERVED124:
-  case CURLE_RESERVED125:
-  case CURLE_RESERVED126:
-  case CURL_LAST:
+  default:
     break;
   }
   /*

diff --git a/tests/data/test1511 b/tests/data/test1511
index 25e9938807a3cb000f6b8d5af1939750e5e72c16..82ed483b85580a6ef2c577c83cefbabf69d6aeeb 100644 (file)
--- a/tests/data/test1511
+++ b/tests/data/test1511
@@ -62,10 +62,10 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 # Verify data after the test has been "shot"
-# TEST_ERR_SUCCESS is errorcode 120
+# TEST_ERR_SUCCESS is errorcode 41
 <verify>
 <errorcode>
-120
+41
 </errorcode>
 </verify>
 </testcase>

diff --git a/tests/data/test1533 b/tests/data/test1533
index 7f06d2029dcf2ac539260e449b66cc7992889223..a957bebbc7bf030999020cb54a2b2bd41ec3bc1e 100644 (file)
--- a/tests/data/test1533
+++ b/tests/data/test1533
@@ -38,10 +38,10 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 # Verify data after the test has been "shot"
-# TEST_ERR_SUCCESS is errorcode 120
+# TEST_ERR_SUCCESS is errorcode 41
 <verify>
 <errorcode>
-120
+41
 </errorcode>
 <protocol nonewline="yes">
 POST /%TESTNUMBER HTTP/1.1\r

diff --git a/tests/data/test504 b/tests/data/test504
index 917c4aee167c81a8310ad01da5c036f808d560d0..02196a3d04fcd505a6b92a37197f31a6ed858125 100644 (file)
--- a/tests/data/test504
+++ b/tests/data/test504
@@ -37,10 +37,10 @@ http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER %HOSTIP:%NOLISTENPORT
 </client>
 
 # Verify data after the test has been "shot"
-# TEST_ERR_SUCCESS is errorcode 120
+# TEST_ERR_SUCCESS is errorcode 41
 <verify>
 <errorcode>
-120
+41
 </errorcode>
 </verify>
 </testcase>

diff --git a/tests/data/test538 b/tests/data/test538
index a269cdf1a2122c61060a2cad68f5840b5eb65e2b..e411db88f5cfdedb7c1df655f5a11138ea7e8644 100644 (file)
--- a/tests/data/test538
+++ b/tests/data/test538
@@ -32,10 +32,10 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </client>
 
 # Verify data after the test has been "shot"
-# TEST_ERR_SUCCESS is errorcode 120
+# TEST_ERR_SUCCESS is errorcode 41
 <verify>
 <errorcode>
-120
+41
 </errorcode>
 <protocol>
 USER anonymous\r

diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index c96f20271dadee4be06563379c8997fa6832b9de..4c672e8a99292dec2fd2aa1112413ac035410504 100644 (file)
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -89,26 +89,24 @@ extern char *hexdump(const unsigned char *buffer, size_t len);
 extern int unitfail;
 
 /*
-** TEST_ERR_* values must be greater than CURL_LAST CURLcode in order
-** to avoid confusion with any CURLcode or CURLMcode. These TEST_ERR_*
-** codes are returned to signal test specific situations and should
-** not get mixed with CURLcode or CURLMcode values.
-**
+** TEST_ERR_* values must within the CURLcode range to not cause compiler
+** errors.
+
 ** For portability reasons TEST_ERR_* values should be less than 127.
 */
 
-#define TEST_ERR_MAJOR_BAD     CURLE_RESERVED126
-#define TEST_ERR_RUNS_FOREVER  CURLE_RESERVED125
-#define TEST_ERR_EASY_INIT     CURLE_RESERVED124
-#define TEST_ERR_MULTI         CURLE_RESERVED123
-#define TEST_ERR_NUM_HANDLES   CURLE_RESERVED122
-#define TEST_ERR_SELECT        CURLE_RESERVED121
-#define TEST_ERR_SUCCESS       CURLE_RESERVED120
-#define TEST_ERR_FAILURE       CURLE_RESERVED119
-#define TEST_ERR_USAGE         CURLE_RESERVED118
-#define TEST_ERR_FOPEN         CURLE_RESERVED117
-#define TEST_ERR_FSTAT         CURLE_RESERVED116
-#define TEST_ERR_BAD_TIMEOUT   CURLE_RESERVED115
+#define TEST_ERR_MAJOR_BAD     CURLE_OBSOLETE20
+#define TEST_ERR_RUNS_FOREVER  CURLE_OBSOLETE24
+#define TEST_ERR_EASY_INIT     CURLE_OBSOLETE29
+#define TEST_ERR_MULTI         CURLE_OBSOLETE32
+#define TEST_ERR_NUM_HANDLES   CURLE_OBSOLETE34
+#define TEST_ERR_SELECT        CURLE_OBSOLETE40
+#define TEST_ERR_SUCCESS       CURLE_OBSOLETE41
+#define TEST_ERR_FAILURE       CURLE_OBSOLETE44
+#define TEST_ERR_USAGE         CURLE_OBSOLETE46
+#define TEST_ERR_FOPEN         CURLE_OBSOLETE50
+#define TEST_ERR_FSTAT         CURLE_OBSOLETE51
+#define TEST_ERR_BAD_TIMEOUT   CURLE_OBSOLETE57
 
 /*
 ** Macros for test source code readability/maintainability.