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

lib: Fix format specifiers

Browse Source
This commit is contained in:
Rikard Falkeborn 2018-05-06 20:32:24 +02:00 committed by Daniel Stenberg
parent 4062bc4d3e
commit eb49683e55
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ftp.c
View File

@ -1910,13 +1910,13 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
if(data->set.ftp_skip_ip) { if(data->set.ftp_skip_ip) {
/* told to ignore the remotely given IP but instead use the host we used /* told to ignore the remotely given IP but instead use the host we used
for the control connection */ for the control connection */
infof(data, "Skip %d.%d.%d.%d for data connection, re-use %s instead\n", infof(data, "Skip %u.%u.%u.%u for data connection, re-use %s instead\n",
ip[0], ip[1], ip[2], ip[3], ip[0], ip[1], ip[2], ip[3],
conn->host.name); conn->host.name);
ftpc->newhost = strdup(control_address(conn)); ftpc->newhost = strdup(control_address(conn));
} }
else else
ftpc->newhost = aprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); ftpc->newhost = aprintf("%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]);
if(!ftpc->newhost) if(!ftpc->newhost)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;

4
lib/http.c
View File

@ -1407,7 +1407,7 @@ static CURLcode add_haproxy_protocol_header(struct connectdata *conn)
snprintf(proxy_header, snprintf(proxy_header,
sizeof proxy_header, sizeof proxy_header,
"PROXY %s %s %s %i %i\r\n", "PROXY %s %s %s %li %li\r\n",
tcp_version, tcp_version,
conn->data->info.conn_local_ip, conn->data->info.conn_local_ip,
conn->data->info.conn_primary_ip, conn->data->info.conn_primary_ip,
@ -2132,7 +2132,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
host, host,
conn->bits.ipv6_ip?"]":""); conn->bits.ipv6_ip?"]":"");
else else
conn->allocptr.host = aprintf("Host: %s%s%s:%hu\r\n", conn->allocptr.host = aprintf("Host: %s%s%s:%d\r\n",
conn->bits.ipv6_ip?"[":"", conn->bits.ipv6_ip?"[":"",
host, host,
conn->bits.ipv6_ip?"]":"", conn->bits.ipv6_ip?"]":"",

4
lib/http_proxy.c
View File

@ -221,7 +221,7 @@ static CURLcode CONNECT(struct connectdata *conn,
if(!req_buffer) if(!req_buffer)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
host_port = aprintf("%s:%hu", hostname, remote_port); host_port = aprintf("%s:%d", hostname, remote_port);
if(!host_port) { if(!host_port) {
Curl_add_buffer_free(req_buffer); Curl_add_buffer_free(req_buffer);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
@ -245,7 +245,7 @@ static CURLcode CONNECT(struct connectdata *conn,
if(hostname != conn->host.name) if(hostname != conn->host.name)
ipv6_ip = (strchr(hostname, ':') != NULL); ipv6_ip = (strchr(hostname, ':') != NULL);
hostheader = /* host:port with IPv6 support */ hostheader = /* host:port with IPv6 support */
aprintf("%s%s%s:%hu", ipv6_ip?"[":"", hostname, ipv6_ip?"]":"", aprintf("%s%s%s:%d", ipv6_ip?"[":"", hostname, ipv6_ip?"]":"",
remote_port); remote_port);
if(!hostheader) { if(!hostheader) {
Curl_add_buffer_free(req_buffer); Curl_add_buffer_free(req_buffer);

2
lib/url.c
View File

@ -3419,7 +3419,7 @@ static CURLcode parse_remote_port(struct Curl_easy *data,
* stripped off. It would be better to work directly from the original * stripped off. It would be better to work directly from the original
* URL and simply replace the port part of it. * URL and simply replace the port part of it.
*/ */
url = aprintf("%s://%s%s%s:%hu%s%s%s", conn->given->scheme, url = aprintf("%s://%s%s%s:%d%s%s%s", conn->given->scheme,
conn->bits.ipv6_ip?"[":"", conn->host.name, conn->bits.ipv6_ip?"[":"", conn->host.name,
conn->bits.ipv6_ip?"]":"", conn->remote_port, conn->bits.ipv6_ip?"]":"", conn->remote_port,
data->state.slash_removed?"/":"", data->state.path, data->state.slash_removed?"/":"", data->state.path,

2
lib/vtls/mbedtls.c
View File

@ -815,7 +815,7 @@ static void Curl_mbedtls_session_free(void *ptr)
static size_t Curl_mbedtls_version(char *buffer, size_t size) static size_t Curl_mbedtls_version(char *buffer, size_t size)
{ {
unsigned int version = mbedtls_version_get_number(); unsigned int version = mbedtls_version_get_number();
return snprintf(buffer, size, "mbedTLS/%d.%d.%d", version>>24, return snprintf(buffer, size, "mbedTLS/%u.%u.%u", version>>24,
(version>>16)&0xff, (version>>8)&0xff); (version>>16)&0xff, (version>>8)&0xff);
} }