build: fix -Wformat-signedness by adjusting printf masks

- sync printf masks with the passed value.
- fix a couple of casts.

Cherry-picked from #20848

Closes #21335
This commit is contained in:
Viktor Szakats 2026-04-16 03:16:20 +02:00
parent 54cc65595d
commit 548c16a824
No known key found for this signature in database
56 changed files with 127 additions and 127 deletions

View file

@ -79,8 +79,8 @@ static CURLcode test_cli_h2_upgrade_extreme(const char *URL)
curl_easy_setopt(curl, CURLOPT_WRITEDATA, NULL);
curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
curl_msnprintf(range, sizeof(range),
"%" CURL_FORMAT_CURL_OFF_TU "-"
"%" CURL_FORMAT_CURL_OFF_TU,
"%" CURL_FORMAT_CURL_OFF_T "-"
"%" CURL_FORMAT_CURL_OFF_T,
(curl_off_t)0,
(curl_off_t)16384);
curl_easy_setopt(curl, CURLOPT_RANGE, range);

View file

@ -104,7 +104,7 @@ static CURLcode test_ws_data_m2_echo(const char *url,
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 2L); /* websocket style */
result = curl_easy_perform(curl);
curl_mfprintf(stderr, "curl_easy_perform() returned %u\n", result);
curl_mfprintf(stderr, "curl_easy_perform() returned %d\n", result);
if(result != CURLE_OK)
goto out;

View file

@ -78,7 +78,7 @@ static CURLcode test_cli_ws_pingpong(const char *URL)
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 2L); /* websocket style */
result = curl_easy_perform(curl);
curl_mfprintf(stderr, "curl_easy_perform() returned %u\n", result);
curl_mfprintf(stderr, "curl_easy_perform() returned %d\n", result);
if(result == CURLE_OK)
result = pingpong(curl, payload);

View file

@ -163,7 +163,7 @@ CURLcode ws_send_ping(CURL *curl, const char *send_payload)
size_t sent;
CURLcode result = curl_ws_send(curl, send_payload, strlen(send_payload),
&sent, 0, CURLWS_PING);
curl_mfprintf(stderr, "ws: curl_ws_send returned %u, sent %zu\n",
curl_mfprintf(stderr, "ws: curl_ws_send returned %d, sent %zu\n",
result, sent);
return result;
}
@ -175,7 +175,7 @@ CURLcode ws_recv_pong(CURL *curl, const char *expected_payload)
char buffer[256];
CURLcode result = curl_ws_recv(curl, buffer, sizeof(buffer), &rlen, &meta);
if(result) {
curl_mfprintf(stderr, "ws: curl_ws_recv returned %u, received %zu\n",
curl_mfprintf(stderr, "ws: curl_ws_recv returned %d, received %zu\n",
result, rlen);
return result;
}
@ -201,7 +201,7 @@ void ws_close(CURL *curl)
{
size_t sent;
CURLcode result = curl_ws_send(curl, "", 0, &sent, 0, CURLWS_CLOSE);
curl_mfprintf(stderr, "ws: curl_ws_send returned %u, sent %zu\n",
curl_mfprintf(stderr, "ws: curl_ws_send returned %d, sent %zu\n",
result, sent);
}
#endif /* CURL_DISABLE_WEBSOCKETS */

View file

@ -1914,41 +1914,41 @@ static int get_nothing(void)
rc = curl_url_get(u, CURLUPART_SCHEME, &p, 0);
if(rc != CURLUE_NO_SCHEME)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
rc = curl_url_get(u, CURLUPART_HOST, &p, 0);
if(rc != CURLUE_NO_HOST)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
rc = curl_url_get(u, CURLUPART_USER, &p, 0);
if(rc != CURLUE_NO_USER)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
rc = curl_url_get(u, CURLUPART_PASSWORD, &p, 0);
if(rc != CURLUE_NO_PASSWORD)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
rc = curl_url_get(u, CURLUPART_OPTIONS, &p, 0);
if(rc != CURLUE_NO_OPTIONS)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
rc = curl_url_get(u, CURLUPART_PATH, &p, 0);
if(rc != CURLUE_OK)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
else
curl_free(p);
rc = curl_url_get(u, CURLUPART_QUERY, &p, 0);
if(rc != CURLUE_NO_QUERY)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
rc = curl_url_get(u, CURLUPART_FRAGMENT, &p, 0);
if(rc != CURLUE_NO_FRAGMENT)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
rc = curl_url_get(u, CURLUPART_ZONEID, &p, 0);
if(rc != CURLUE_NO_ZONEID)
curl_mfprintf(stderr, "unexpected return code %u on line %u\n", rc,
curl_mfprintf(stderr, "unexpected return code %d on line %d\n", rc,
__LINE__);
curl_url_cleanup(u);
@ -1981,17 +1981,17 @@ static int clear_url(void)
for(i = 0; clear_url_list[i].in && !error; i++) {
rc = curl_url_set(u, clear_url_list[i].part, clear_url_list[i].in, 0);
if(rc != CURLUE_OK)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
rc = curl_url_set(u, CURLUPART_URL, NULL, 0);
if(rc != CURLUE_OK)
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
rc = curl_url_get(u, clear_url_list[i].part, &p, 0);
if(rc != clear_url_list[i].ucode ||
(clear_url_list[i].out && strcmp(p, clear_url_list[i].out) != 0)) {
curl_mfprintf(stderr, "unexpected return code line %u\n", __LINE__);
curl_mfprintf(stderr, "unexpected return code line %d\n", __LINE__);
error++;
}
if(rc == CURLUE_OK)
@ -2046,7 +2046,7 @@ static int huge(void)
rc = curl_url_set(urlp, CURLUPART_URL, total, CURLU_NON_SUPPORT_SCHEME);
if((!i && (rc != CURLUE_BAD_SCHEME)) ||
(i && rc)) {
curl_mprintf("URL %u: failed to parse [%s]\n", i, total);
curl_mprintf("URL %d: failed to parse [%s]\n", i, total);
error++;
}
@ -2054,7 +2054,7 @@ static int huge(void)
if(!rc) {
curl_url_get(urlp, part[i], &partp, 0);
if(!partp || strcmp(partp, &bigpart[1 - (i == 4)])) {
curl_mprintf("URL %u part %u: failure\n", i, part[i]);
curl_mprintf("URL %d part %u: failure\n", i, part[i]);
error++;
}
curl_free(partp);

View file

@ -129,7 +129,7 @@ static CURLcode test_lib1565(const char *URL)
}
else {
curl_mfprintf(stderr,
"%s:%d Got an unexpected message from curl: %i\n",
"%s:%d Got an unexpected message from curl: %d\n",
__FILE__, __LINE__, message->msg);
result = TEST_ERR_MAJOR_BAD;
goto test_cleanup;

View file

@ -100,7 +100,7 @@ static CURLcode test_lib1597(const char *URL)
break;
}
}
curl_mprintf("Tested %u strings\n", i);
curl_mprintf("Tested %d strings\n", i);
test_cleanup:
curl_easy_cleanup(curl);

View file

@ -63,7 +63,7 @@ static CURLcode test_lib1947(const char *URL)
if(h)
count++;
} while(h);
curl_mprintf("count = %u\n", count);
curl_mprintf("count = %d\n", count);
/* perform another request - without redirect */
easy_setopt(curl, CURLOPT_URL, libtest_arg2);
@ -81,7 +81,7 @@ static CURLcode test_lib1947(const char *URL)
if(h)
count++;
} while(h);
curl_mprintf("count = %u\n", count);
curl_mprintf("count = %d\n", count);
test_cleanup:
curl_easy_cleanup(curl);

View file

@ -332,7 +332,7 @@ static CURLcode empty_multi_test(void)
}
else if(fd_count > 0) {
curl_mfprintf(stderr, "curl_multi_waitfds(), empty, returned non-zero "
"count of waitfds: %d.\n", fd_count);
"count of waitfds: %u.\n", fd_count);
result = TEST_ERR_FAILURE;
goto test_cleanup;
}
@ -354,7 +354,7 @@ static CURLcode empty_multi_test(void)
}
else if(fd_count > 1) {
curl_mfprintf(stderr, "curl_multi_waitfds() returned > 1 count of "
"waitfds: %d.\n", fd_count);
"waitfds: %u.\n", fd_count);
result = TEST_ERR_FAILURE;
goto test_cleanup;
}
@ -381,15 +381,15 @@ static CURLcode test_lib2405(const char *URL)
if(testnum == 2405) {
/* HTTP1, expected 3 waitfds - one for each transfer + wakeup */
test_run_check(TEST_USE_HTTP1, 3);
test_run_check(TEST_USE_HTTP1, 3U);
}
#ifdef USE_HTTP2
else { /* 2407 */
/* HTTP2, expected 3 waitfds - one for each transfer + wakeup */
test_run_check(TEST_USE_HTTP2, 3);
test_run_check(TEST_USE_HTTP2, 3U);
/* HTTP2 with multiplexing, expected 2 waitfds - transfers + wakeup */
test_run_check(TEST_USE_HTTP2_MPLEX, 2);
test_run_check(TEST_USE_HTTP2_MPLEX, 2U);
}
#endif

View file

@ -155,7 +155,7 @@ static void logprotocol(mqttdir dir,
}
fprintf(output, "%s %s %x %s\n",
dir == FROM_CLIENT ? "client" : "server",
prefix, (int)remlen, data);
prefix, (unsigned int)remlen, data);
}
/* return 0 on success */

View file

@ -1130,7 +1130,7 @@ static int sws_get_request(curl_socket_t sock, struct sws_httprequest *req)
sizeof(req->reqbuf) - 1 - req->offset);
if(got > 0) {
req->offset += got;
logmsg("Got %zu bytes from client", got);
logmsg("Got %zd bytes from client", got);
}
if((got == -1) &&

View file

@ -436,7 +436,7 @@ static LRESULT CALLBACK main_window_proc(HWND hwnd, UINT uMsg,
break;
}
if(signum) {
logmsg("main_window_proc: %d -> %d", uMsg, signum);
logmsg("main_window_proc: %u -> %d", uMsg, signum);
raise(signum);
}
}
@ -671,7 +671,7 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket,
memset(sau, 0, sizeof(struct sockaddr_un));
sau->sun_family = AF_UNIX;
if(len >= sizeof(sau->sun_path) - 1) {
logmsg("Too long unix socket domain path (%zd)", len);
logmsg("Too long unix socket domain path (%zu)", len);
return -1;
}
curlx_strcopy(sau->sun_path, sizeof(sau->sun_path), unix_socket, len);

View file

@ -71,7 +71,7 @@ static CURLcode test_tool1621(const char *arg)
const char *url = tests[i].input;
char *stripped = stripcredentials(url);
const char *strippedstr = stripped ? stripped : "(null)";
curl_mprintf("Test %u got input \"%s\", output: \"%s\", "
curl_mprintf("Test %d got input \"%s\", output: \"%s\", "
"expected: \"%s\"\n",
i, tests[i].input, strippedstr, tests[i].output);

View file

@ -45,7 +45,7 @@ static CURLcode test_unit1323(const char *arg)
for(i = 0; i < CURL_ARRAYSIZE(tests); i++) {
timediff_t result = curlx_timediff_ms(tests[i].first, tests[i].second);
if(result != tests[i].result) {
curl_mprintf("%ld.%06u to %ld.%06u got %" FMT_TIMEDIFF_T
curl_mprintf("%ld.%06d to %ld.%06d got %" FMT_TIMEDIFF_T
", but expected %" FMT_TIMEDIFF_T "\n",
(long)tests[i].first.tv_sec,
tests[i].first.tv_usec,

View file

@ -102,7 +102,7 @@ static CURLcode test_unit1652(const char *arg)
fail_unless(verify(output, input) == 0, "Simple string test");
/* Injecting a few different variables with a format */
Curl_infof(easy, "%s %u testing %lu", input, 42, 43L);
Curl_infof(easy, "%s %d testing %ld", input, 42, 43L);
fail_unless(verify(output, "Simple Test 42 testing 43\n") == 0,
"Format string");

View file

@ -132,7 +132,7 @@ static CURLcode test_unit1660(const char *arg)
continue;
}
else if(result) {
curl_mprintf("Input %u: error %d\n", i, (int)result);
curl_mprintf("Input %d: error %d\n", i, (int)result);
continue;
}
}

View file

@ -61,7 +61,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = wordparse[i];
const char *orgline = line;
int rc = curlx_str_word(&line, &out, 7);
curl_mprintf("%u: (\"%s\") %d, \"%.*s\" [%d], line %d\n",
curl_mprintf("%d: (\"%s\") %d, \"%.*s\" [%d], line %d\n",
i, orgline, rc, (int)out.len, out.str, (int)out.len,
(int)(line - orgline));
}
@ -72,7 +72,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = wordparse[i];
const char *orgline = line;
int rc = curlx_str_until(&line, &out, 7, 'd');
curl_mprintf("%u: (\"%s\") %d, \"%.*s\" [%d], line %d\n",
curl_mprintf("%d: (\"%s\") %d, \"%.*s\" [%d], line %d\n",
i, orgline, rc, (int)out.len, out.str, (int)out.len,
(int)(line - orgline));
}
@ -105,7 +105,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = qwords[i];
const char *orgline = line;
int rc = curlx_str_quotedword(&line, &out, 7);
curl_mprintf("%u: (\"%s\") %d, \"%.*s\" [%d], line %d\n",
curl_mprintf("%d: (\"%s\") %d, \"%.*s\" [%d], line %d\n",
i, orgline, rc, (int)out.len, out.str, (int)out.len,
(int)(line - orgline));
}
@ -127,7 +127,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = single[i];
const char *orgline = line;
int rc = curlx_str_single(&line, 'a');
curl_mprintf("%u: (\"%s\") %d, line %d\n",
curl_mprintf("%d: (\"%s\") %d, line %d\n",
i, orgline, rc, (int)(line - orgline));
}
}
@ -150,7 +150,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = single[i];
const char *orgline = line;
int rc = curlx_str_singlespace(&line);
curl_mprintf("%u: (\"%s\") %d, line %d\n",
curl_mprintf("%d: (\"%s\") %d, line %d\n",
i, orgline, rc, (int)(line - orgline));
}
}
@ -171,7 +171,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = single[i];
const char *orgline = line;
int rc = curlx_str_single(&line, 'a');
curl_mprintf("%u: (\"%s\") %d, line %d\n",
curl_mprintf("%d: (\"%s\") %d, line %d\n",
i, orgline, rc, (int)(line - orgline));
}
}
@ -198,7 +198,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = nums[i];
const char *orgline = line;
int rc = curlx_str_number(&line, &num, 1235);
curl_mprintf("%u: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
i, orgline, rc, num, (int)(line - orgline));
}
}
@ -230,7 +230,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = nums[i].str;
const char *orgline = line;
int rc = curlx_str_number(&line, &num, nums[i].max);
curl_mprintf("%u: (\"%s\") max %" CURL_FORMAT_CURL_OFF_T
curl_mprintf("%d: (\"%s\") max %" CURL_FORMAT_CURL_OFF_T
" == %d, [%" CURL_FORMAT_CURL_OFF_T "]\n",
i, orgline, nums[i].max, rc, num);
}
@ -270,7 +270,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = nums[i].str;
const char *orgline = line;
int rc = curlx_str_hex(&line, &num, nums[i].max);
curl_mprintf("%u: (\"%s\") max %" CURL_FORMAT_CURL_OFF_T
curl_mprintf("%d: (\"%s\") max %" CURL_FORMAT_CURL_OFF_T
" == %d, [%" CURL_FORMAT_CURL_OFF_T "]\n",
i, orgline, nums[i].max, rc, num);
}
@ -305,7 +305,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = nums[i].str;
const char *orgline = line;
int rc = curlx_str_octal(&line, &num, nums[i].max);
curl_mprintf("%u: (\"%s\") max %" CURL_FORMAT_CURL_OFF_T
curl_mprintf("%d: (\"%s\") max %" CURL_FORMAT_CURL_OFF_T
" == %d, [%" CURL_FORMAT_CURL_OFF_T "]\n",
i, orgline, nums[i].max, rc, num);
}
@ -341,7 +341,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = nums[i];
const char *orgline = line;
int rc = curlx_str_number(&line, &num, CURL_OFF_T_MAX);
curl_mprintf("%u: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
i, orgline, rc, num, (int)(line - orgline));
}
}
@ -366,7 +366,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = newl[i];
const char *orgline = line;
int rc = curlx_str_newline(&line);
curl_mprintf("%u: (%%%02x) %d, line %d\n",
curl_mprintf("%d: (%%%02x) %d, line %d\n",
i, *orgline, rc, (int)(line - orgline));
}
}
@ -393,7 +393,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = nums[i];
const char *orgline = line;
int rc = curlx_str_hex(&line, &num, 0x1235);
curl_mprintf("%u: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
i, orgline, rc, num, (int)(line - orgline));
}
}
@ -420,7 +420,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = nums[i];
const char *orgline = line;
int rc = curlx_str_octal(&line, &num, 01235);
curl_mprintf("%u: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
i, orgline, rc, num, (int)(line - orgline));
}
}
@ -444,7 +444,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = nums[i];
const char *orgline = line;
int rc = curlx_str_octal(&line, &num, CURL_OFF_T_MAX);
curl_mprintf("%u: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
i, orgline, rc, num, (int)(line - orgline));
}
}
@ -480,7 +480,7 @@ static CURLcode test_unit1664(const char *arg)
const char *line = nums[i];
const char *orgline = line;
int rc = curlx_str_hex(&line, &num, CURL_OFF_T_MAX);
curl_mprintf("%u: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
curl_mprintf("%d: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
i, orgline, rc, num, (int)(line - orgline));
}
}

View file

@ -185,7 +185,7 @@ static CURLcode test_unit1675(const char *arg)
uc = urlencode_str(&out, tests[i].in, strlen(tests[i].in),
tests[i].relative, tests[i].query);
if(uc || strcmp(curlx_dyn_ptr(&out), tests[i].out)) {
curl_mfprintf(stderr, "urlencode_str('%s', query=%d) failed:"
curl_mfprintf(stderr, "urlencode_str('%s', query=%u) failed:"
" expected '%s', got '%s'\n",
tests[i].in, tests[i].query, tests[i].out,
uc ? "error" : curlx_dyn_ptr(&out));

View file

@ -82,7 +82,7 @@ static void parse_success(const struct tcase *t)
in_consumed += nread;
if(nread != buflen) {
if(!p.done) {
curl_mfprintf(stderr, "only %zd/%zu consumed for: '%s'\n",
curl_mfprintf(stderr, "only %zu/%zu consumed for: '%s'\n",
nread, buflen, buf);
fail("not all consumed");
}

View file

@ -86,7 +86,7 @@ static CURLcode test_unit2604(const char *arg)
char *path;
const char *cp = i == 0 ? cp0 : list[i].cp;
CURLcode result = Curl_get_pathname(&cp, &path, list[i].home);
curl_mprintf("%u - Curl_get_pathname(\"%s\", ... \"%s\") == %u\n", i,
curl_mprintf("%d - Curl_get_pathname(\"%s\", ... \"%s\") == %d\n", i,
list[i].cp, list[i].home, list[i].result);
if(result != list[i].result) {
curl_mprintf("... returned %d\n", result);

View file

@ -78,7 +78,7 @@ static CURLcode test_unit2605(const char *arg)
curl_off_t start;
curl_off_t size;
CURLcode result;
curl_mprintf("%u: '%s' (file size: %" FMT_OFF_T ")\n", i, list[i].r,
curl_mprintf("%d: '%s' (file size: %" FMT_OFF_T ")\n", i, list[i].r,
list[i].filesize);
result = Curl_ssh_range(curl, list[i].r, list[i].filesize, &start,
&size);

View file

@ -92,7 +92,7 @@ static CURLcode test_unit3200(const char *arg)
fp = curlx_fopen(arg, "rb");
abort_unless(fp != NULL, "Cannot open testfile");
curl_mfprintf(stderr, "Test %zd...", i);
curl_mfprintf(stderr, "Test %zu...", i);
switch(i) {
case 0:
result = Curl_get_line(&buf, fp, &eof);