diff options
| author | Michael Kaufmann <mail@michael-kaufmann.ch> | 2017-02-19 14:10:54 +0100 |
|---|---|---|
| committer | Michael Kaufmann <mail@michael-kaufmann.ch> | 2017-02-19 14:13:42 +0100 |
| commit | ddedc1b3f37354dc7748f47c094773fb0a716e18 (patch) | |
| tree | 0d46d2b59f4865def9b04a2c50712e46fc8673d3 | |
| parent | f45de0e87c55de992d7ff1fcc902c4809675ec63 (diff) | |
| download | gnurl-ddedc1b3f37354dc7748f47c094773fb0a716e18.tar.gz gnurl-ddedc1b3f37354dc7748f47c094773fb0a716e18.tar.bz2 gnurl-ddedc1b3f37354dc7748f47c094773fb0a716e18.zip | |
string formatting: fix 4 printf-style format strings
| -rw-r--r-- | lib/conncache.c | 2 | ||||
| -rw-r--r-- | lib/curl_ntlm_core.c | 4 | ||||
| -rw-r--r-- | src/tool_operate.c | 2 | ||||
| -rw-r--r-- | src/tool_urlglob.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/lib/conncache.c b/lib/conncache.c index d8ef9a54c..a51c8fd76 100644 --- a/lib/conncache.c +++ b/lib/conncache.c @@ -141,7 +141,7 @@ static char *hashkey(struct connectdata *conn) else 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 diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index e8b763aac..e02983ce6 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -715,8 +715,10 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash, /* Create the BLOB structure */ 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 */ + NTLMv2_BLOB_SIGNATURE[0], NTLMv2_BLOB_SIGNATURE[1], + NTLMv2_BLOB_SIGNATURE[2], NTLMv2_BLOB_SIGNATURE[3], 0, 0, 0, 0); Curl_write64_le(tw, ptr + 24); diff --git a/src/tool_operate.c b/src/tool_operate.c index ef4f74a2b..bc36520d9 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1622,7 +1622,7 @@ static CURLcode operate_do(struct GlobalConfig *global, metalink_next_res = 1; fprintf(global->errors, "Metalink: fetching (%s) from (%s) FAILED " - "(HTTP status code %d)\n", + "(HTTP status code %ld)\n", mlfile->filename, this_url, response); } } diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c index 6d716599f..d002f276d 100644 --- a/src/tool_urlglob.c +++ b/src/tool_urlglob.c @@ -645,7 +645,7 @@ CURLcode glob_match_url(char **result, char *filename, URLGlob *glob) appendlen = 1; break; case UPTNumRange: - snprintf(numbuf, sizeof(numbuf), "%0*d", + snprintf(numbuf, sizeof(numbuf), "%0*lu", pat->content.NumRange.padlength, pat->content.NumRange.ptr_n); appendthis = numbuf; |