mirror of
https://github.com/curl/curl.git
synced 2026-07-28 14:23:07 +03:00
tests: rename more CURLcode variables to result
For consistency. Also: - one remaining in `src/tool_writeout.c`. - replace casting an `int` to `CURLcode`. - lib758: rename `CURLMcode` `result` to `mresult`. - move literals to the right side of if expressions. Follow-up tod0dc6e2ec0#20426 Follow-up to56f600ec23Closes #20432
This commit is contained in:
Viktor Szakats
parent
26c39d8df1
commit
2da1bbca96
33 changed files with 307 additions and 303 deletions
|
|
@ -33,12 +33,12 @@ static CURLcode test_unit1654(const char *arg)
|
|||
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_ALTSVC)
|
||||
char outname[256];
|
||||
CURL *curl;
|
||||
CURLcode res;
|
||||
CURLcode result;
|
||||
struct altsvcinfo *asi = Curl_altsvc_init();
|
||||
abort_if(!asi, "Curl_altsvc_i");
|
||||
res = Curl_altsvc_load(asi, arg);
|
||||
if(res) {
|
||||
fail_if(res, "Curl_altsvc_load");
|
||||
result = Curl_altsvc_load(asi, arg);
|
||||
if(result) {
|
||||
fail_if(result, "Curl_altsvc_load");
|
||||
goto fail;
|
||||
}
|
||||
curl_global_init(CURL_GLOBAL_ALL);
|
||||
|
|
@ -50,92 +50,92 @@ static CURLcode test_unit1654(const char *arg)
|
|||
fail_unless(Curl_llist_count(&asi->list) == 4, "wrong number of entries");
|
||||
curl_msnprintf(outname, sizeof(outname), "%s-out", arg);
|
||||
|
||||
res = Curl_altsvc_parse(curl, asi, "h2=\"example.com:8080\"\r\n",
|
||||
ALPN_h1, "example.org", 8080);
|
||||
fail_if(res, "Curl_altsvc_parse() failed!");
|
||||
result = Curl_altsvc_parse(curl, asi, "h2=\"example.com:8080\"\r\n",
|
||||
ALPN_h1, "example.org", 8080);
|
||||
fail_if(result, "Curl_altsvc_parse() failed!");
|
||||
fail_unless(Curl_llist_count(&asi->list) == 5, "wrong number of entries");
|
||||
|
||||
res = Curl_altsvc_parse(curl, asi, "h3=\":8080\"\r\n",
|
||||
ALPN_h1, "2.example.org", 8080);
|
||||
fail_if(res, "Curl_altsvc_parse(2) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi, "h3=\":8080\"\r\n",
|
||||
ALPN_h1, "2.example.org", 8080);
|
||||
fail_if(result, "Curl_altsvc_parse(2) failed!");
|
||||
fail_unless(Curl_llist_count(&asi->list) == 6, "wrong number of entries");
|
||||
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.com:8080\", "
|
||||
"h3=\"yesyes.com:8080\"\r\n",
|
||||
ALPN_h1, "3.example.org", 8080);
|
||||
fail_if(res, "Curl_altsvc_parse(3) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.com:8080\", "
|
||||
"h3=\"yesyes.com:8080\"\r\n",
|
||||
ALPN_h1, "3.example.org", 8080);
|
||||
fail_if(result, "Curl_altsvc_parse(3) failed!");
|
||||
/* that one should make two entries */
|
||||
fail_unless(Curl_llist_count(&asi->list) == 8, "wrong number of entries");
|
||||
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.com:443\"; ma = 120;\r\n",
|
||||
ALPN_h2, "example.org", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(4) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.com:443\"; ma = 120;\r\n",
|
||||
ALPN_h2, "example.org", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(4) failed!");
|
||||
fail_unless(Curl_llist_count(&asi->list) == 9, "wrong number of entries");
|
||||
|
||||
/* quoted 'ma' value */
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.net:443\"; ma=\"180\";\r\n",
|
||||
ALPN_h2, "example.net", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(5) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.net:443\"; ma=\"180\";\r\n",
|
||||
ALPN_h2, "example.net", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(5) failed!");
|
||||
fail_unless(Curl_llist_count(&asi->list) == 10, "wrong number of entries");
|
||||
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\":443\"; ma=180, h3=\":443\"; "
|
||||
"persist = \"1\"; ma = 120;\r\n",
|
||||
ALPN_h1, "curl.se", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(6) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\":443\"; ma=180, h3=\":443\"; "
|
||||
"persist = \"1\"; ma = 120;\r\n",
|
||||
ALPN_h1, "curl.se", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(6) failed!");
|
||||
fail_unless(Curl_llist_count(&asi->list) == 12, "wrong number of entries");
|
||||
|
||||
/* clear that one again and decrease the counter */
|
||||
res = Curl_altsvc_parse(curl, asi, "clear;\r\n",
|
||||
ALPN_h1, "curl.se", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(7) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi, "clear;\r\n",
|
||||
ALPN_h1, "curl.se", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(7) failed!");
|
||||
fail_unless(Curl_llist_count(&asi->list) == 10, "wrong number of entries");
|
||||
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\":443\", h3=\":443\"; "
|
||||
"persist = \"1\"; ma = 120;\r\n",
|
||||
ALPN_h1, "curl.se", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(6) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\":443\", h3=\":443\"; "
|
||||
"persist = \"1\"; ma = 120;\r\n",
|
||||
ALPN_h1, "curl.se", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(6) failed!");
|
||||
fail_unless(Curl_llist_count(&asi->list) == 12, "wrong number of entries");
|
||||
|
||||
/* clear - without semicolon */
|
||||
res = Curl_altsvc_parse(curl, asi, "clear\r\n",
|
||||
ALPN_h1, "curl.se", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(7) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi, "clear\r\n",
|
||||
ALPN_h1, "curl.se", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(7) failed!");
|
||||
fail_unless(Curl_llist_count(&asi->list) == 10, "wrong number of entries");
|
||||
|
||||
/* only a non-existing alpn */
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h6=\"example.net:443\"; ma=\"180\";\r\n",
|
||||
ALPN_h2, "5.example.net", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(8) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h6=\"example.net:443\"; ma=\"180\";\r\n",
|
||||
ALPN_h2, "5.example.net", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(8) failed!");
|
||||
|
||||
/* missing quote in alpn host */
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.net:443,; ma=\"180\";\r\n",
|
||||
ALPN_h2, "6.example.net", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(9) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.net:443,; ma=\"180\";\r\n",
|
||||
ALPN_h2, "6.example.net", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(9) failed!");
|
||||
|
||||
/* missing port in hostname */
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.net\"; ma=\"180\";\r\n",
|
||||
ALPN_h2, "7.example.net", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(10) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.net\"; ma=\"180\";\r\n",
|
||||
ALPN_h2, "7.example.net", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(10) failed!");
|
||||
|
||||
/* illegal port in hostname */
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.net:70000\"; ma=\"180\";\r\n",
|
||||
ALPN_h2, "8.example.net", 80);
|
||||
fail_if(res, "Curl_altsvc_parse(11) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"example.net:70000\"; ma=\"180\";\r\n",
|
||||
ALPN_h2, "8.example.net", 80);
|
||||
fail_if(result, "Curl_altsvc_parse(11) failed!");
|
||||
|
||||
res = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"test2.se:443\"; ma=\"180 \" ; unknown=2, "
|
||||
"h2=\"test3.se:443\"; ma = 120;\r\n",
|
||||
ALPN_h2, "test.se", 443);
|
||||
fail_if(res, "Curl_altsvc_parse(12) failed!");
|
||||
result = Curl_altsvc_parse(curl, asi,
|
||||
"h2=\"test2.se:443\"; ma=\"180 \" ; unknown=2, "
|
||||
"h2=\"test3.se:443\"; ma = 120;\r\n",
|
||||
ALPN_h2, "test.se", 443);
|
||||
fail_if(result, "Curl_altsvc_parse(12) failed!");
|
||||
|
||||
Curl_altsvc_save(curl, asi, outname);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue