romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-27 21:23:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests: rename more CURLcode variables to result

Browse source 
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 to d0dc6e2ec0 #20426
Follow-up to 56f600ec23

Closes #20432
This commit is contained in:
Viktor Szakats 2026-01-25 18:12:40 +01:00
parent 26c39d8df1
commit 2da1bbca96
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
33 changed files with 307 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

48
tests/unit/unit3200.c
View file

@ -75,7 +75,7 @@ static CURLcode test_unit3200(const char *arg)
#endif
size_t i;
CURLcode res = CURLE_OK;
CURLcode result = CURLE_OK;
for(i = 0; i < CURL_ARRAYSIZE(filecontents); i++) {
FILE *fp;
struct dynbuf buf;
@ -95,62 +95,62 @@ static CURLcode test_unit3200(const char *arg)
curl_mfprintf(stderr, "Test %zd...", i);
switch(i) {
case 0:
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
line = curlx_dyn_ptr(&buf);
fail_unless(!res && line && !strcmp("LINE1\n", line),
fail_unless(!result && line && !strcmp("LINE1\n", line),
"First line failed (1)");
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
line = curlx_dyn_ptr(&buf);
fail_unless(!res && line && !strcmp("LINE2 NEWLINE\n", line),
fail_unless(!result && line && !strcmp("LINE2 NEWLINE\n", line),
"Second line failed (1)");
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
abort_unless(eof, "Missed EOF (1)");
break;
case 1:
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
line = curlx_dyn_ptr(&buf);
fail_unless(!res && line && !strcmp("LINE1\n", line),
fail_unless(!result && line && !strcmp("LINE1\n", line),
"First line failed (2)");
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
line = curlx_dyn_ptr(&buf);
fail_unless(!res && line && !strcmp("LINE2 NONEWLINE\n", line),
fail_unless(!result && line && !strcmp("LINE2 NONEWLINE\n", line),
"Second line failed (2)");
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
abort_unless(eof, "Missed EOF (2)");
break;
case 2:
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
line = curlx_dyn_ptr(&buf);
fail_unless(!res && line && !strcmp("LINE1\n", line),
fail_unless(!result && line && !strcmp("LINE1\n", line),
"First line failed (3)");
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
fail_unless(!curlx_dyn_len(&buf),
"Did not detect max read on EOF (3)");
break;
case 3:
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
line = curlx_dyn_ptr(&buf);
fail_unless(!res && line && !strcmp("LINE1\n", line),
fail_unless(!result && line && !strcmp("LINE1\n", line),
"First line failed (4)");
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
fail_unless(!curlx_dyn_len(&buf),
"Did not ignore partial on EOF (4)");
break;
case 4:
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
line = curlx_dyn_ptr(&buf);
fail_unless(!res && line && !strcmp("LINE1\n", line),
fail_unless(!result && line && !strcmp("LINE1\n", line),
"First line failed (5)");
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
fail_unless(!curlx_dyn_len(&buf),
"Did not bail out on too long line");
break;
case 5:
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
line = curlx_dyn_ptr(&buf);
fail_unless(!res && line && !strcmp("LINE1\x1aTEST\n", line),
fail_unless(!result && line && !strcmp("LINE1\x1aTEST\n", line),
"Missed/Misinterpreted ^Z (6)");
res = Curl_get_line(&buf, fp, &eof);
result = Curl_get_line(&buf, fp, &eof);
abort_unless(eof, "Missed EOF (6)");
break;
default:
@ -161,7 +161,7 @@ static CURLcode test_unit3200(const char *arg)
curlx_fclose(fp);
curl_mfprintf(stderr, "OK\n");
}
return res;
return result;
#endif