romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 15:23:11 +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

56
tests/unit/unit2601.c
View file

@ -85,7 +85,7 @@ static void check_bufq(size_t pool_spares,
struct bufq q;
struct bufc_pool pool;
size_t max_len = chunk_size * max_chunks;
CURLcode res;
CURLcode result;
ssize_t i;
size_t n2;
size_t nwritten, nread;
@ -105,20 +105,20 @@ static void check_bufq(size_t pool_spares,
fail_unless(q.spare == NULL, "init: spare not NULL");
fail_unless(Curl_bufq_len(&q) == 0, "init: bufq length != 0");
res = Curl_bufq_write(&q, test_data, wsize, &n2);
result = Curl_bufq_write(&q, test_data, wsize, &n2);
fail_unless(n2 <= wsize, "write: wrong size returned");
fail_unless(res == CURLE_OK, "write: wrong result returned");
fail_unless(result == CURLE_OK, "write: wrong result returned");
/* write empty bufq full */
nwritten = 0;
Curl_bufq_reset(&q);
while(!Curl_bufq_is_full(&q)) {
res = Curl_bufq_write(&q, test_data, wsize, &n2);
if(!res) {
result = Curl_bufq_write(&q, test_data, wsize, &n2);
if(!result) {
nwritten += n2;
}
else if(res != CURLE_AGAIN) {
fail_unless(res == CURLE_AGAIN, "write-loop: unexpected result");
else if(result != CURLE_AGAIN) {
fail_unless(result == CURLE_AGAIN, "write-loop: unexpected result");
break;
}
}
@ -132,12 +132,12 @@ static void check_bufq(size_t pool_spares,
/* read full bufq empty */
nread = 0;
while(!Curl_bufq_is_empty(&q)) {
res = Curl_bufq_read(&q, test_data, rsize, &n2);
if(!res) {
result = Curl_bufq_read(&q, test_data, rsize, &n2);
if(!result) {
nread += n2;
}
else if(res != CURLE_AGAIN) {
fail_unless(res == CURLE_AGAIN, "read-loop: unexpected result");
else if(result != CURLE_AGAIN) {
fail_unless(result == CURLE_AGAIN, "read-loop: unexpected result");
break;
}
}
@ -153,14 +153,14 @@ static void check_bufq(size_t pool_spares,
}
for(i = 0; i < 1000; ++i) {
res = Curl_bufq_write(&q, test_data, wsize, &n2);
if(res && res != CURLE_AGAIN) {
fail_unless(res == CURLE_AGAIN, "rw-loop: unexpected write result");
result = Curl_bufq_write(&q, test_data, wsize, &n2);
if(result && result != CURLE_AGAIN) {
fail_unless(result == CURLE_AGAIN, "rw-loop: unexpected write result");
break;
}
res = Curl_bufq_read(&q, test_data, rsize, &n2);
if(res && res != CURLE_AGAIN) {
fail_unless(res == CURLE_AGAIN, "rw-loop: unexpected read result");
result = Curl_bufq_read(&q, test_data, rsize, &n2);
if(result && result != CURLE_AGAIN) {
fail_unless(result == CURLE_AGAIN, "rw-loop: unexpected read result");
break;
}
}
@ -170,9 +170,9 @@ static void check_bufq(size_t pool_spares,
Curl_bufq_init2(&q, chunk_size, max_chunks, (opts | BUFQ_OPT_SOFT_LIMIT));
nwritten = 0;
while(!Curl_bufq_is_full(&q)) {
res = Curl_bufq_write(&q, test_data, wsize, &n2);
if(res || n2 != wsize) {
fail_unless(!res && n2 == wsize, "write should be complete");
result = Curl_bufq_write(&q, test_data, wsize, &n2);
if(result || n2 != wsize) {
fail_unless(!result && n2 == wsize, "write should be complete");
break;
}
nwritten += n2;
@ -184,15 +184,15 @@ static void check_bufq(size_t pool_spares,
fail_if(TRUE, "write: bufq full but nwritten wrong");
}
/* do one more write on a full bufq, should work */
res = Curl_bufq_write(&q, test_data, wsize, &n2);
fail_unless(!res && n2 == wsize, "write should be complete");
result = Curl_bufq_write(&q, test_data, wsize, &n2);
fail_unless(!result && n2 == wsize, "write should be complete");
nwritten += n2;
/* see that we get all out again */
nread = 0;
while(!Curl_bufq_is_empty(&q)) {
res = Curl_bufq_read(&q, test_data, rsize, &n2);
if(res) {
fail_unless(res, "read-loop: unexpected fail");
result = Curl_bufq_read(&q, test_data, rsize, &n2);
if(result) {
fail_unless(result, "read-loop: unexpected fail");
break;
}
nread += n2;
@ -211,12 +211,12 @@ static CURLcode test_unit2601(const char *arg)
struct bufq q;
size_t n;
CURLcode res;
CURLcode result;
unsigned char buf[16 * 1024];
Curl_bufq_init(&q, 8 * 1024, 12);
res = Curl_bufq_read(&q, buf, 128, &n);
fail_unless(res && res == CURLE_AGAIN, "read empty fail");
result = Curl_bufq_read(&q, buf, 128, &n);
fail_unless(result && result == CURLE_AGAIN, "read empty fail");
Curl_bufq_free(&q);
check_bufq(0, 1024, 4, 128, 128, BUFQ_OPT_NONE);