romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-29 01:53:08 +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

26
tests/unit/unit1302.c
View file

@ -36,7 +36,7 @@ struct etest {
static CURLcode test_unit1302(const char *arg)
{
UNITTEST_BEGIN_SIMPLE
CURLcode rc;
CURLcode result;
unsigned int i;
/* common base64 encoding */
@ -132,8 +132,9 @@ static CURLcode test_unit1302(const char *arg)
size_t dlen;
/* first encode */
rc = curlx_base64_encode((const uint8_t *)e->input, e->ilen, &out, &olen);
abort_unless(rc == CURLE_OK, "return code should be CURLE_OK");
result = curlx_base64_encode((const uint8_t *)e->input, e->ilen,
&out, &olen);
abort_unless(result == CURLE_OK, "return code should be CURLE_OK");
abort_unless(olen == e->olen, "wrong output size");
if(memcmp(out, e->output, e->olen)) {
curl_mfprintf(stderr, "Test %u encoded badly\n", i);
@ -142,9 +143,10 @@ static CURLcode test_unit1302(const char *arg)
Curl_safefree(out);
/* then verify decode */
rc = curlx_base64_decode(e->output, &decoded, &dlen);
if(rc != CURLE_OK) {
curl_mfprintf(stderr, "Test %u URL decode returned %d\n", i, (int)rc);
result = curlx_base64_decode(e->output, &decoded, &dlen);
if(result != CURLE_OK) {
curl_mfprintf(stderr, "Test %u URL decode returned %d\n", i,
(int)result);
unitfail++;
}
if(dlen != e->ilen) {
@ -165,9 +167,9 @@ static CURLcode test_unit1302(const char *arg)
struct etest *e = &url[i];
char *out;
size_t olen;
rc = curlx_base64url_encode((const uint8_t *)e->input, e->ilen,
&out, &olen);
abort_unless(rc == CURLE_OK, "return code should be CURLE_OK");
result = curlx_base64url_encode((const uint8_t *)e->input, e->ilen,
&out, &olen);
abort_unless(result == CURLE_OK, "return code should be CURLE_OK");
if(olen != e->olen) {
curl_mfprintf(stderr, "Test %u URL encoded output length %zu "
"instead of %zu\n", i, olen, e->olen);
@ -186,11 +188,11 @@ static CURLcode test_unit1302(const char *arg)
size_t dlen;
/* then verify decode with illegal inputs */
rc = curlx_base64_decode(e->output, &decoded, &dlen);
if(rc != CURLE_BAD_CONTENT_ENCODING) {
result = curlx_base64_decode(e->output, &decoded, &dlen);
if(result != CURLE_BAD_CONTENT_ENCODING) {
curl_mfprintf(stderr, "Test %u URL bad decoded badly. "
"Returned '%d', expected '%d'\n",
i, (int)rc, CURLE_BAD_CONTENT_ENCODING);
i, (int)result, CURLE_BAD_CONTENT_ENCODING);
unitfail++;
}
}