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

libtests: update format strings to avoid casts, drop some macros

Browse source 
- bump format strings to show the full value, drop casts.
- drop redundant casts (enum -> `%d`).
- drop some single-use macros.
- replace `int` with `bool` in testtrace.

Closes #18106
This commit is contained in:
Viktor Szakats 2025-07-30 02:12:22 +02:00
parent e5cf6223d7
commit 37913c01a5
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
63 changed files with 293 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

44
tests/libtest/cli_ws_data.c
View file

@ -36,30 +36,32 @@ static CURLcode check_recv(const struct curl_ws_frame *frame,
if(frame->flags & CURLWS_CLOSE) {
curl_mfprintf(stderr, "recv_data: unexpected CLOSE frame from server, "
"got %ld bytes, offset=%ld, rflags %x\n",
(long)nread, (long)r_offset, frame->flags);
"got %zu bytes, offset=%zu, rflags %x\n",
nread, r_offset, frame->flags);
return CURLE_RECV_ERROR;
}
if(!r_offset && !(frame->flags & CURLWS_BINARY)) {
curl_mfprintf(stderr, "recv_data: wrong frame, got %ld bytes, offset=%ld, "
curl_mfprintf(stderr, "recv_data: wrong frame, got %zu bytes, offset=%zu, "
"rflags %x\n",
(long)nread, (long)r_offset, frame->flags);
nread, r_offset, frame->flags);
return CURLE_RECV_ERROR;
}
if(frame->offset != (curl_off_t)r_offset) {
curl_mfprintf(stderr, "recv_data: frame offset, expected %ld, got %ld\n",
(long)r_offset, (long)frame->offset);
curl_mfprintf(stderr, "recv_data: frame offset, expected %zu, "
"got %" CURL_FORMAT_CURL_OFF_T "\n",
r_offset, frame->offset);
return CURLE_RECV_ERROR;
}
if(frame->bytesleft != (curl_off_t)(exp_len - r_offset - nread)) {
curl_mfprintf(stderr, "recv_data: frame bytesleft, "
"expected %ld, got %ld\n",
(long)(exp_len - r_offset - nread), (long)frame->bytesleft);
"expected %" CURL_FORMAT_CURL_OFF_T ", "
"got %" CURL_FORMAT_CURL_OFF_T "\n",
(curl_off_t)(exp_len - r_offset - nread), frame->bytesleft);
return CURLE_RECV_ERROR;
}
if(r_offset + nread > exp_len) {
curl_mfprintf(stderr, "recv_data: data length, expected %ld, now at %ld\n",
(long)exp_len, (long)(r_offset + nread));
curl_mfprintf(stderr, "recv_data: data length, expected %zu, now at %zu\n",
exp_len, r_offset + nread);
return CURLE_RECV_ERROR;
}
return CURLE_OK;
@ -97,9 +99,9 @@ static CURLcode data_echo(CURL *curl, size_t count,
r = curl_ws_send(curl, sbuf, slen, &nwritten, 0, CURLWS_BINARY);
sblock = (r == CURLE_AGAIN);
if(!r || (r == CURLE_AGAIN)) {
curl_mfprintf(stderr, "curl_ws_send(len=%ld) -> %d, %ld (%ld/%ld)\n",
(long)slen, r, (long)nwritten,
(long)(len - slen), (long)len);
curl_mfprintf(stderr, "curl_ws_send(len=%zu) -> %d, "
"%zu (%" CURL_FORMAT_CURL_OFF_T "/%zu)\n",
slen, r, nwritten, (curl_off_t)(len - slen), len);
sbuf += nwritten;
slen -= nwritten;
}
@ -118,10 +120,8 @@ static CURLcode data_echo(CURL *curl, size_t count,
&nread, &frame);
if(!r || (r == CURLE_AGAIN)) {
rblock = (r == CURLE_AGAIN);
curl_mfprintf(stderr, "curl_ws_recv(len=%ld) -> %d, %ld (%ld/%ld) "
"\n",
(long)rlen, r, (long)nread, (long)(len - rlen),
(long)len);
curl_mfprintf(stderr, "curl_ws_recv(len=%zu) -> %d, %zu (%ld/%zu) "
"\n", rlen, r, nread, (long)(len - rlen), len);
if(!r) {
r = check_recv(frame, len - rlen, nread, len);
if(r)
@ -148,9 +148,9 @@ static CURLcode data_echo(CURL *curl, size_t count,
if(memcmp(send_buf, recv_buf, len)) {
curl_mfprintf(stderr, "recv_data: data differs\n");
debug_dump("", "expected:", stderr,
(const unsigned char *)send_buf, len, 0);
(const unsigned char *)send_buf, len, FALSE);
debug_dump("", "received:", stderr,
(const unsigned char *)recv_buf, len, 0);
(const unsigned char *)recv_buf, len, FALSE);
r = CURLE_RECV_ERROR;
goto out;
}
@ -216,8 +216,8 @@ static CURLcode test_cli_ws_data(const char *URL)
plen_max = plen_min;
if(plen_max < plen_min) {
curl_mfprintf(stderr, "maxlen must be >= minlen, got %ld-%ld\n",
(long)plen_min, (long)plen_max);
curl_mfprintf(stderr, "maxlen must be >= minlen, got %zu-%zu\n",
plen_min, plen_max);
res = CURLE_BAD_FUNCTION_ARGUMENT;
goto cleanup;
}
@ -240,7 +240,7 @@ static CURLcode test_cli_ws_data(const char *URL)
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 2L); /* websocket style */
res = curl_easy_perform(curl);
curl_mfprintf(stderr, "curl_easy_perform() returned %u\n", (int)res);
curl_mfprintf(stderr, "curl_easy_perform() returned %u\n", res);
if(res == CURLE_OK)
res = data_echo(curl, count, plen_min, plen_max);