romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 22:13:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

tidy-up: rename more CURLcode variables to result

Browse source 
Follow-up to 885b553545 #21348

Closes #21676
This commit is contained in:
Viktor Szakats 2026-05-19 14:49:28 +02:00
parent 1fb734bc2d
commit 000de81fb1
No known key found for this signature in database
11 changed files with 277 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

54
tests/unit/unit3300.c
View file

@ -82,26 +82,26 @@ static CURLcode test_unit3300(const char *arg)
UNITTEST_BEGIN_SIMPLE
struct curl_thrdpool *tpool;
struct unit3300_ctx ctx;
CURLcode r;
CURLcode result;
/* pool without minimum, will not start anything */
unit3300_ctx_init(&ctx, 10, 0);
r = Curl_thrdpool_create(&tpool, "unit3300a", 0, 2, 0,
unit3300_take, unit3300_process, unit3300_return,
&ctx);
fail_unless(!r, "pool-a create");
result = Curl_thrdpool_create(&tpool, "unit3300a", 0, 2, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-a create");
Curl_thrdpool_destroy(tpool, TRUE);
fail_unless(!ctx.returned, "pool-a unexpected items returned");
fail_unless(!ctx.taken, "pool-a unexpected items taken");
/* pool without minimum, signal start, consumes everything */
unit3300_ctx_init(&ctx, 10, 0);
r = Curl_thrdpool_create(&tpool, "unit3300b", 0, 2, 0,
unit3300_take, unit3300_process, unit3300_return,
&ctx);
fail_unless(!r, "pool-b create");
r = Curl_thrdpool_signal(tpool, 2);
fail_unless(!r, "pool-b signal");
result = Curl_thrdpool_create(&tpool, "unit3300b", 0, 2, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-b create");
result = Curl_thrdpool_signal(tpool, 2);
fail_unless(!result, "pool-b signal");
Curl_thrdpool_await_idle(tpool, 0);
Curl_thrdpool_destroy(tpool, TRUE);
fail_unless(ctx.returned == ctx.total, "pool-b items returned missing");
@ -109,10 +109,10 @@ static CURLcode test_unit3300(const char *arg)
/* pool with minimum, consumes everything without signal */
unit3300_ctx_init(&ctx, 10, 0);
r = Curl_thrdpool_create(&tpool, "unit3300c", 1, 2, 0,
unit3300_take, unit3300_process, unit3300_return,
&ctx);
fail_unless(!r, "pool-c create");
result = Curl_thrdpool_create(&tpool, "unit3300c", 1, 2, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-c create");
Curl_thrdpool_await_idle(tpool, 0);
Curl_thrdpool_destroy(tpool, TRUE);
fail_unless(ctx.returned == ctx.total, "pool-c items returned missing");
@ -120,12 +120,12 @@ static CURLcode test_unit3300(const char *arg)
/* pool with many max, signal abundance, consumes everything */
unit3300_ctx_init(&ctx, 100, 0);
r = Curl_thrdpool_create(&tpool, "unit3300d", 0, 50, 0,
unit3300_take, unit3300_process, unit3300_return,
&ctx);
fail_unless(!r, "pool-d create");
r = Curl_thrdpool_signal(tpool, 100);
fail_unless(!r, "pool-d signal");
result = Curl_thrdpool_create(&tpool, "unit3300d", 0, 50, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-d create");
result = Curl_thrdpool_signal(tpool, 100);
fail_unless(!result, "pool-d signal");
Curl_thrdpool_await_idle(tpool, 0);
Curl_thrdpool_destroy(tpool, TRUE);
fail_unless(ctx.returned == ctx.total, "pool-d items returned missing");
@ -133,12 +133,12 @@ static CURLcode test_unit3300(const char *arg)
/* pool with 1 max, many to take, no await, destroy without join */
unit3300_ctx_init(&ctx, 10000000, 1);
r = Curl_thrdpool_create(&tpool, "unit3300e", 0, 1, 0,
unit3300_take, unit3300_process, unit3300_return,
&ctx);
fail_unless(!r, "pool-e create");
r = Curl_thrdpool_signal(tpool, 100);
fail_unless(!r, "pool-e signal");
result = Curl_thrdpool_create(&tpool, "unit3300e", 0, 1, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-e create");
result = Curl_thrdpool_signal(tpool, 100);
fail_unless(!result, "pool-e signal");
Curl_thrdpool_destroy(tpool, FALSE);
fail_unless(ctx.returned < ctx.total, "pool-e returned all");
fail_unless(ctx.taken < ctx.total, "pool-e took all");

30
tests/unit/unit3301.c
View file

@ -84,14 +84,14 @@ static CURLcode test_unit3301(const char *arg)
struct curl_thrdq *tqueue;
struct unit3301_ctx ctx;
int i, count, nrecvd;
CURLcode r;
CURLcode result;
/* create and teardown queue */
memset(&ctx, 0, sizeof(ctx));
r = Curl_thrdq_create(&tqueue, "unit3301-a", 0, 0, 2, 1,
unit3301_item_free, unit3301_process, unit3301_event,
&ctx);
fail_unless(!r, "queue-a create");
result = Curl_thrdq_create(&tqueue, "unit3301-a", 0, 0, 2, 1,
unit3301_item_free, unit3301_process,
unit3301_event, &ctx);
fail_unless(!result, "queue-a create");
Curl_thrdq_destroy(tqueue, TRUE);
tqueue = NULL;
fail_unless(!ctx.event, "queue-a unexpected done count");
@ -99,25 +99,25 @@ static CURLcode test_unit3301(const char *arg)
/* create queue, have it process `count` items */
count = 10;
memset(&ctx, 0, sizeof(ctx));
r = Curl_thrdq_create(&tqueue, "unit3301-b", 0, 0, 2, 1,
unit3301_item_free, unit3301_process, unit3301_event,
&ctx);
fail_unless(!r, "queue-b create");
result = Curl_thrdq_create(&tqueue, "unit3301-b", 0, 0, 2, 1,
unit3301_item_free, unit3301_process,
unit3301_event, &ctx);
fail_unless(!result, "queue-b create");
for(i = 0; i < count; ++i) {
struct unit3301_item *uitem = unit3301_item_create(i);
fail_unless(uitem, "queue-b item create");
r = Curl_thrdq_send(tqueue, uitem, NULL, 0);
fail_unless(!r, "queue-b send");
result = Curl_thrdq_send(tqueue, uitem, NULL, 0);
fail_unless(!result, "queue-b send");
}
r = thrdq_await_done(tqueue, 0);
fail_unless(!r, "queue-b await done");
result = thrdq_await_done(tqueue, 0);
fail_unless(!result, "queue-b await done");
nrecvd = 0;
for(i = 0; i < count; ++i) {
void *item;
r = Curl_thrdq_recv(tqueue, &item);
fail_unless(!r, "queue-b recv");
result = Curl_thrdq_recv(tqueue, &item);
fail_unless(!result, "queue-b recv");
if(item) {
struct unit3301_item *uitem = item;
curl_mfprintf(stderr, "received item %d\n", uitem->id);