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

string formatting: fix 4 printf-style format strings

Browse Source
This commit is contained in:
Michael Kaufmann 2017-02-19 14:10:54 +01:00
parent f45de0e87c
commit ddedc1b3f3
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/conncache.c
View File

@ -141,7 +141,7 @@ static char *hashkey(struct connectdata *conn)
else else
hostname = conn->host.name; hostname = conn->host.name;
return aprintf("%s:%d", hostname, conn->port); return aprintf("%s:%ld", hostname, conn->port);
} }
/* Look up the bundle with all the connections to the same host this /* Look up the bundle with all the connections to the same host this

4
lib/curl_ntlm_core.c
View File

@ -715,8 +715,10 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
/* Create the BLOB structure */ /* Create the BLOB structure */
snprintf((char *)ptr + NTLM_HMAC_MD5_LEN, NTLMv2_BLOB_LEN, snprintf((char *)ptr + NTLM_HMAC_MD5_LEN, NTLMv2_BLOB_LEN,
NTLMv2_BLOB_SIGNATURE "%c%c%c%c" /* NTLMv2_BLOB_SIGNATURE */
"%c%c%c%c", /* Reserved = 0 */ "%c%c%c%c", /* Reserved = 0 */
NTLMv2_BLOB_SIGNATURE[0], NTLMv2_BLOB_SIGNATURE[1],
NTLMv2_BLOB_SIGNATURE[2], NTLMv2_BLOB_SIGNATURE[3],
0, 0, 0, 0); 0, 0, 0, 0);
Curl_write64_le(tw, ptr + 24); Curl_write64_le(tw, ptr + 24);

2
src/tool_operate.c
View File

@ -1622,7 +1622,7 @@ static CURLcode operate_do(struct GlobalConfig *global,
metalink_next_res = 1; metalink_next_res = 1;
fprintf(global->errors, fprintf(global->errors,
"Metalink: fetching (%s) from (%s) FAILED " "Metalink: fetching (%s) from (%s) FAILED "
"(HTTP status code %d)\n", "(HTTP status code %ld)\n",
mlfile->filename, this_url, response); mlfile->filename, this_url, response);
} }
} }

2
src/tool_urlglob.c
View File

@ -645,7 +645,7 @@ CURLcode glob_match_url(char **result, char *filename, URLGlob *glob)
appendlen = 1; appendlen = 1;
break; break;
case UPTNumRange: case UPTNumRange:
snprintf(numbuf, sizeof(numbuf), "%0*d", snprintf(numbuf, sizeof(numbuf), "%0*lu",
pat->content.NumRange.padlength, pat->content.NumRange.padlength,
pat->content.NumRange.ptr_n); pat->content.NumRange.ptr_n);
appendthis = numbuf; appendthis = numbuf;