moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

infof/failf calls: fix format specifiers

Browse Source 
Update a few format specifiers to match what is being printed.

Closes #6241
This commit is contained in:
Rikard Falkeborn 2020-11-23 22:42:07 +01:00 committed by Daniel Stenberg
parent 020aa0131b
commit 920f49a20b
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
12 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/http.c
View File

@ -4003,7 +4003,7 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
infof(data, "Illegal STS header skipped\n"); infof(data, "Illegal STS header skipped\n");
#ifdef DEBUGBUILD #ifdef DEBUGBUILD
else else
infof(data, "Parsed STS header fine (%d entries)\n", infof(data, "Parsed STS header fine (%zu entries)\n",
data->hsts->list.size); data->hsts->list.size);
#endif #endif
} }

4
lib/http2.c
View File

@ -2070,7 +2070,7 @@ static ssize_t http2_send(struct connectdata *conn, int sockindex,
if(acc > MAX_ACC) { if(acc > MAX_ACC) {
infof(conn->data, "http2_send: Warning: The cumulative length of all " infof(conn->data, "http2_send: Warning: The cumulative length of all "
"headers exceeds %zu bytes and that could cause the " "headers exceeds %d bytes and that could cause the "
"stream to be rejected.\n", MAX_ACC); "stream to be rejected.\n", MAX_ACC);
} }
} }
@ -2269,7 +2269,7 @@ CURLcode Curl_http2_switched(struct connectdata *conn,
data into stream->mem, overwriting data already there. */ data into stream->mem, overwriting data already there. */
if(H2_BUFSIZE < nread) { if(H2_BUFSIZE < nread) {
failf(data, "connection buffer size is too small to store data following " failf(data, "connection buffer size is too small to store data following "
"HTTP Upgrade response header: buflen=%zu, datalen=%zu", "HTTP Upgrade response header: buflen=%d, datalen=%zu",
H2_BUFSIZE, nread); H2_BUFSIZE, nread);
return CURLE_HTTP2; return CURLE_HTTP2;
} }

2
lib/ldap.c
View File

@ -923,7 +923,7 @@ static int _ldap_url_parse2(const struct connectdata *conn, LDAPURLDesc *ludp)
char *unescaped; char *unescaped;
CURLcode result; CURLcode result;
LDAP_TRACE(("attr[%d] '%s'\n", i, attributes[i])); LDAP_TRACE(("attr[%zu] '%s'\n", i, attributes[i]));
/* Unescape the attribute */ /* Unescape the attribute */
result = Curl_urldecode(conn->data, attributes[i], 0, &unescaped, NULL, result = Curl_urldecode(conn->data, attributes[i], 0, &unescaped, NULL,

4
lib/socks_gssapi.c
View File

@ -493,7 +493,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
gss_release_buffer(&gss_status, &gss_recv_token); gss_release_buffer(&gss_status, &gss_recv_token);
if(gss_w_token.length != 1) { if(gss_w_token.length != 1) {
failf(data, "Invalid GSS-API encryption response length (%d).", failf(data, "Invalid GSS-API encryption response length (%zu).",
gss_w_token.length); gss_w_token.length);
gss_release_buffer(&gss_status, &gss_w_token); gss_release_buffer(&gss_status, &gss_w_token);
gss_delete_sec_context(&gss_status, &gss_context, NULL); gss_delete_sec_context(&gss_status, &gss_context, NULL);
@ -505,7 +505,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
} }
else { else {
if(gss_recv_token.length != 1) { if(gss_recv_token.length != 1) {
failf(data, "Invalid GSS-API encryption response length (%d).", failf(data, "Invalid GSS-API encryption response length (%zu).",
gss_recv_token.length); gss_recv_token.length);
gss_release_buffer(&gss_status, &gss_recv_token); gss_release_buffer(&gss_status, &gss_recv_token);
gss_delete_sec_context(&gss_status, &gss_context, NULL); gss_delete_sec_context(&gss_status, &gss_context, NULL);

4
lib/vquic/ngtcp2.c
View File

@ -1571,7 +1571,7 @@ static CURLcode http_request(struct connectdata *conn, const void *mem,
if(acc > MAX_ACC) { if(acc > MAX_ACC) {
infof(data, "http_request: Warning: The cumulative length of all " infof(data, "http_request: Warning: The cumulative length of all "
"headers exceeds %zu bytes and that could cause the " "headers exceeds %d bytes and that could cause the "
"stream to be rejected.\n", MAX_ACC); "stream to be rejected.\n", MAX_ACC);
} }
} }
@ -1741,7 +1741,7 @@ static CURLcode ng_process_ingress(struct connectdata *conn,
if(SOCKERRNO == EAGAIN || SOCKERRNO == EWOULDBLOCK) if(SOCKERRNO == EAGAIN || SOCKERRNO == EWOULDBLOCK)
break; break;
failf(conn->data, "ngtcp2: recvfrom() unexpectedly returned %d", recvd); failf(conn->data, "ngtcp2: recvfrom() unexpectedly returned %zd", recvd);
return CURLE_RECV_ERROR; return CURLE_RECV_ERROR;
} }

6
lib/vquic/quiche.c
View File

@ -358,7 +358,7 @@ static CURLcode process_ingress(struct connectdata *conn, int sockfd,
break; break;
if(recvd < 0) { if(recvd < 0) {
failf(conn->data, "quiche: recv() unexpectedly returned %d " failf(conn->data, "quiche: recv() unexpectedly returned %zd "
"(errno: %d, socket %d)", recvd, SOCKERRNO, sockfd); "(errno: %d, socket %d)", recvd, SOCKERRNO, sockfd);
return CURLE_RECV_ERROR; return CURLE_RECV_ERROR;
} }
@ -368,7 +368,7 @@ static CURLcode process_ingress(struct connectdata *conn, int sockfd,
break; break;
if(recvd < 0) { if(recvd < 0) {
failf(conn->data, "quiche_conn_recv() == %d", recvd); failf(conn->data, "quiche_conn_recv() == %zd", recvd);
return CURLE_RECV_ERROR; return CURLE_RECV_ERROR;
} }
} while(1); } while(1);
@ -762,7 +762,7 @@ static CURLcode http_request(struct connectdata *conn, const void *mem,
if(acc > MAX_ACC) { if(acc > MAX_ACC) {
infof(data, "http_request: Warning: The cumulative length of all " infof(data, "http_request: Warning: The cumulative length of all "
"headers exceeds %zu bytes and that could cause the " "headers exceeds %d bytes and that could cause the "
"stream to be rejected.\n", MAX_ACC); "stream to be rejected.\n", MAX_ACC);
} }
} }

4
lib/vssh/libssh2.c
View File

@ -1265,7 +1265,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
a time-out or similar */ a time-out or similar */
result = CURLE_SSH; result = CURLE_SSH;
sshc->actualcode = result; sshc->actualcode = result;
DEBUGF(infof(data, "error = %d makes libcurl = %d\n", DEBUGF(infof(data, "error = %lu makes libcurl = %d\n",
sftperr, (int)result)); sftperr, (int)result));
state(conn, SSH_STOP); state(conn, SSH_STOP);
break; break;
@ -1945,7 +1945,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
sshc->actualcode = CURLE_SSH; sshc->actualcode = CURLE_SSH;
sftperr = LIBSSH2_FX_OK; sftperr = LIBSSH2_FX_OK;
} }
failf(data, "Upload failed: %s (%d/%d)", failf(data, "Upload failed: %s (%lu/%d)",
sftperr != LIBSSH2_FX_OK ? sftperr != LIBSSH2_FX_OK ?
sftp_libssh2_strerror(sftperr):"ssh error", sftp_libssh2_strerror(sftperr):"ssh error",
sftperr, rc); sftperr, rc);

4
lib/vtls/sectransp.c
View File

@ -1970,7 +1970,7 @@ static CURLcode sectransp_connect_step1(struct connectdata *conn,
else { else {
CURLcode result; CURLcode result;
ssl_sessionid = ssl_sessionid =
aprintf("%s:%d:%d:%s:%hu", ssl_cafile, aprintf("%s:%d:%d:%s:%ld", ssl_cafile,
verifypeer, SSL_CONN_CONFIG(verifyhost), hostname, port); verifypeer, SSL_CONN_CONFIG(verifyhost), hostname, port);
ssl_sessionid_len = strlen(ssl_sessionid); ssl_sessionid_len = strlen(ssl_sessionid);
@ -2189,7 +2189,7 @@ static CURLcode verify_cert(const char *cafile, struct Curl_easy *data,
if(res < 0) { if(res < 0) {
free(certbuf); free(certbuf);
CFRelease(array); CFRelease(array);
failf(data, "SSL: invalid CA certificate #%d (offset %d) in bundle", failf(data, "SSL: invalid CA certificate #%d (offset %zu) in bundle",
n, offset); n, offset);
return CURLE_SSL_CACERT_BADFILE; return CURLE_SSL_CACERT_BADFILE;
} }

4
src/tool_progress.c
View File

@ -227,11 +227,11 @@ bool progress_meter(struct GlobalConfig *global,
} }
if(dlknown && all_dltotal) if(dlknown && all_dltotal)
/* TODO: handle integer overflow */ /* TODO: handle integer overflow */
msnprintf(dlpercen, sizeof(dlpercen), "%3d", msnprintf(dlpercen, sizeof(dlpercen), "%3" CURL_FORMAT_CURL_OFF_T,
all_dlnow * 100 / all_dltotal); all_dlnow * 100 / all_dltotal);
if(ulknown && all_ultotal) if(ulknown && all_ultotal)
/* TODO: handle integer overflow */ /* TODO: handle integer overflow */
msnprintf(ulpercen, sizeof(ulpercen), "%3d", msnprintf(ulpercen, sizeof(ulpercen), "%3" CURL_FORMAT_CURL_OFF_T,
all_ulnow * 100 / all_ultotal); all_ulnow * 100 / all_ultotal);
/* get the transfer speed, the higher of the two */ /* get the transfer speed, the higher of the two */

2
tests/libtest/lib1558.c
View File

@ -49,7 +49,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
printf("Protocol: %x\n", protocol); printf("Protocol: %lx\n", protocol);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_global_cleanup(); curl_global_cleanup();

2
tests/libtest/lib1915.c
View File

@ -63,7 +63,7 @@ static CURLSTScode hstswrite(CURL *easy, struct curl_hstsentry *e,
{ {
(void)easy; (void)easy;
(void)userp; (void)userp;
printf("[%u/%u] %s %s\n", i->index, i->total, e->name, e->expire); printf("[%zu/%zu] %s %s\n", i->index, i->total, e->name, e->expire);
return CURLSTS_OK; return CURLSTS_OK;
} }

2
tests/unit/unit1660.c
View File

@ -152,7 +152,7 @@ UNITTEST_START
showsts(e, chost); showsts(e, chost);
} }
printf("Number of entries: %d\n", h->list.size); printf("Number of entries: %zu\n", h->list.size);
/* verify that it is exists for 7 seconds */ /* verify that it is exists for 7 seconds */
chost = "expire.example"; chost = "expire.example";