diff options
author | i-ky <gl.ivanovsky@gmail.com> | 2021-09-27 08:22:54 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2021-09-27 08:28:46 +0200 |
commit | 3363eeb26298b9d30fc5ec29101e5dd205d04db9 (patch) | |
tree | 5546b8dc873a7e918d651485ed735dbce6f69d62 /tests/libtest/lib1560.c | |
parent | f0b8d1c5f646506d5c1fbf73edfbed900aa016e4 (diff) | |
download | curl-3363eeb26298b9d30fc5ec29101e5dd205d04db9.tar.gz |
urlapi: add curl_url_strerror()
Add curl_url_strerror() to convert CURLUcode into readable string and
facilitate easier troubleshooting in programs using URL API.
Extend CURLUcode with CURLU_LAST for iteration in unit tests.
Update man pages with a mention of new function.
Update example code and tests with new functionality where it fits.
Closes #7605
Diffstat (limited to 'tests/libtest/lib1560.c')
-rw-r--r-- | tests/libtest/lib1560.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c index 1c361e582..3d341ddb4 100644 --- a/tests/libtest/lib1560.c +++ b/tests/libtest/lib1560.c @@ -785,17 +785,17 @@ static int set_url(void) rc = curl_url_set(urlp, CURLUPART_URL, set_url_list[i].set, set_url_list[i].setflags); if(rc) { - fprintf(stderr, "%s:%d Set URL %s returned %d\n", + fprintf(stderr, "%s:%d Set URL %s returned %d (%s)\n", __FILE__, __LINE__, set_url_list[i].set, - (int)rc); + (int)rc, curl_url_strerror(rc)); error++; } else { char *url = NULL; rc = curl_url_get(urlp, CURLUPART_URL, &url, 0); if(rc) { - fprintf(stderr, "%s:%d Get URL returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d Get URL returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { @@ -847,8 +847,8 @@ static int set_parts(void) rc = curl_url_get(urlp, CURLUPART_URL, &url, 0); if(rc) { - fprintf(stderr, "%s:%d Get URL returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d Get URL returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else if(checkurl(url, set_parts_list[i].out)) { @@ -884,8 +884,8 @@ static int get_url(void) rc = curl_url_get(urlp, CURLUPART_URL, &url, get_url_list[i].getflags); if(rc) { - fprintf(stderr, "%s:%d returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { @@ -987,8 +987,8 @@ static int append(void) char *url; rc = curl_url_get(urlp, CURLUPART_URL, &url, 0); if(rc) { - fprintf(stderr, "%s:%d Get URL returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d Get URL returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { @@ -1013,15 +1013,15 @@ static int scopeid(void) rc = curl_url_set(u, CURLUPART_URL, "https://[fe80::20c:29ff:fe9c:409b%25eth0]/hello.html", 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_set returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_set returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } rc = curl_url_get(u, CURLUPART_HOST, &url, 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_get CURLUPART_HOST returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_get CURLUPART_HOST returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { @@ -1031,15 +1031,15 @@ static int scopeid(void) rc = curl_url_set(u, CURLUPART_HOST, "[::1]", 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_set CURLUPART_HOST returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_set CURLUPART_HOST returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } rc = curl_url_get(u, CURLUPART_URL, &url, 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_get CURLUPART_URL returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_get CURLUPART_URL returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { @@ -1049,15 +1049,15 @@ static int scopeid(void) rc = curl_url_set(u, CURLUPART_HOST, "example.com", 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_set CURLUPART_HOST returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_set CURLUPART_HOST returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } rc = curl_url_get(u, CURLUPART_URL, &url, 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_get CURLUPART_URL returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_get CURLUPART_URL returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { @@ -1068,15 +1068,15 @@ static int scopeid(void) rc = curl_url_set(u, CURLUPART_HOST, "[fe80::20c:29ff:fe9c:409b%25eth0]", 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_set CURLUPART_HOST returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_set CURLUPART_HOST returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } rc = curl_url_get(u, CURLUPART_URL, &url, 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_get CURLUPART_URL returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_get CURLUPART_URL returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { @@ -1086,8 +1086,8 @@ static int scopeid(void) rc = curl_url_get(u, CURLUPART_HOST, &url, 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_get CURLUPART_HOST returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_get CURLUPART_HOST returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { @@ -1097,8 +1097,8 @@ static int scopeid(void) rc = curl_url_get(u, CURLUPART_ZONEID, &url, 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_get CURLUPART_ZONEID returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_get CURLUPART_ZONEID returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { @@ -1108,15 +1108,15 @@ static int scopeid(void) rc = curl_url_set(u, CURLUPART_ZONEID, "clown", 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_set CURLUPART_ZONEID returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_set CURLUPART_ZONEID returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } rc = curl_url_get(u, CURLUPART_URL, &url, 0); if(rc != CURLUE_OK) { - fprintf(stderr, "%s:%d curl_url_get CURLUPART_URL returned %d\n", - __FILE__, __LINE__, (int)rc); + fprintf(stderr, "%s:%d curl_url_get CURLUPART_URL returned %d (%s)\n", + __FILE__, __LINE__, (int)rc, curl_url_strerror(rc)); error++; } else { |