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

tests/client: use curl_mfprintf()

Browse source 
Replacing `fprintf()`. `curl_mfprintf()` is a public libcurl API.

Following the same change made for libtests.

Follow-up to 255aac56f9 #17253

Closes #17651
This commit is contained in:
Viktor Szakats 2025-06-17 19:57:28 +02:00
parent a4a13c96ca
commit af309fb17b
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
11 changed files with 186 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

53
tests/client/ws_data.c
View file

@ -30,30 +30,31 @@ static CURLcode check_recv(const struct curl_ws_frame *frame,
return CURLE_OK;
if(frame->flags & CURLWS_CLOSE) {
fprintf(stderr, "recv_data: unexpected CLOSE frame from server, "
"got %ld bytes, offset=%ld, rflags %x\n",
(long)nread, (long)r_offset, frame->flags);
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);
return CURLE_RECV_ERROR;
}
if(!r_offset && !(frame->flags & CURLWS_BINARY)) {
fprintf(stderr, "recv_data: wrong frame, got %ld bytes, offset=%ld, "
"rflags %x\n",
(long)nread, (long)r_offset, frame->flags);
curl_mfprintf(stderr, "recv_data: wrong frame, got %ld bytes, offset=%ld, "
"rflags %x\n",
(long)nread, (long)r_offset, frame->flags);
return CURLE_RECV_ERROR;
}
if(frame->offset != (curl_off_t)r_offset) {
fprintf(stderr, "recv_data: frame offset, expected %ld, got %ld\n",
(long)r_offset, (long)frame->offset);
curl_mfprintf(stderr, "recv_data: frame offset, expected %ld, got %ld\n",
(long)r_offset, (long)frame->offset);
return CURLE_RECV_ERROR;
}
if(frame->bytesleft != (curl_off_t)(exp_len - r_offset - nread)) {
fprintf(stderr, "recv_data: frame bytesleft, expected %ld, got %ld\n",
(long)(exp_len - r_offset - nread), (long)frame->bytesleft);
curl_mfprintf(stderr, "recv_data: frame bytesleft, "
"expected %ld, got %ld\n",
(long)(exp_len - r_offset - nread), (long)frame->bytesleft);
return CURLE_RECV_ERROR;
}
if(r_offset + nread > exp_len) {
fprintf(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 %ld, now at %ld\n",
(long)exp_len, (long)(r_offset + nread));
return CURLE_RECV_ERROR;
}
return CURLE_OK;
@ -91,9 +92,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)) {
fprintf(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=%ld) -> %d, %ld (%ld/%ld)\n",
(long)slen, r, (long)nwritten,
(long)(len - slen), (long)len);
sbuf += nwritten;
slen -= nwritten;
}
@ -112,8 +113,10 @@ static CURLcode data_echo(CURL *curl, size_t count,
&nread, &frame);
if(!r || (r == CURLE_AGAIN)) {
rblock = (r == CURLE_AGAIN);
fprintf(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=%ld) -> %d, %ld (%ld/%ld) "
"\n",
(long)rlen, r, (long)nread, (long)(len - rlen),
(long)len);
if(!r) {
r = check_recv(frame, len - rlen, nread, len);
if(r)
@ -132,7 +135,7 @@ static CURLcode data_echo(CURL *curl, size_t count,
}
if(rblock && sblock) {
fprintf(stderr, "EAGAIN, sleep, try again\n");
curl_mfprintf(stderr, "EAGAIN, sleep, try again\n");
#ifdef _WIN32
Sleep(100);
#elif defined(__TANDEM)
@ -149,7 +152,7 @@ static CURLcode data_echo(CURL *curl, size_t count,
}
if(memcmp(send_buf, recv_buf, len)) {
fprintf(stderr, "recv_data: data differs\n");
curl_mfprintf(stderr, "recv_data: data differs\n");
dump("expected:", (unsigned char *)send_buf, len, 0);
dump("received:", (unsigned char *)recv_buf, len, 0);
r = CURLE_RECV_ERROR;
@ -168,8 +171,8 @@ out:
static void usage_ws_data(const char *msg)
{
if(msg)
fprintf(stderr, "%s\n", msg);
fprintf(stderr,
curl_mfprintf(stderr, "%s\n", msg);
curl_mfprintf(stderr,
"usage: [options] url\n"
" -m number minimum frame size\n"
" -M number maximum frame size\n"
@ -215,8 +218,8 @@ static int test_ws_data(int argc, char *argv[])
plen_max = plen_min;
if(plen_max < plen_min) {
fprintf(stderr, "maxlen must be >= minlen, got %ld-%ld\n",
(long)plen_min, (long)plen_max);
curl_mfprintf(stderr, "maxlen must be >= minlen, got %ld-%ld\n",
(long)plen_min, (long)plen_max);
res = CURLE_BAD_FUNCTION_ARGUMENT;
goto cleanup;
}
@ -239,7 +242,7 @@ static int test_ws_data(int argc, char *argv[])
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 2L); /* websocket style */
res = curl_easy_perform(curl);
fprintf(stderr, "curl_easy_perform() returned %u\n", (int)res);
curl_mfprintf(stderr, "curl_easy_perform() returned %u\n", (int)res);
if(res == CURLE_OK)
res = data_echo(curl, count, plen_min, plen_max);
@ -254,7 +257,7 @@ cleanup:
#else /* !CURL_DISABLE_WEBSOCKETS */
(void)argc;
(void)argv;
fprintf(stderr, "WebSockets not enabled in libcurl\n");
curl_mfprintf(stderr, "WebSockets not enabled in libcurl\n");
return 1;
#endif /* CURL_DISABLE_WEBSOCKETS */
}