string formatting: fix 4 printf-style format strings

diff --git a/lib/conncache.c b/lib/conncache.c
index d8ef9a54c714abc687a635ca08a82ace294f47e4..a51c8fd7603da4a1614c3b2614db15d99014ac24 100644 (file)
--- 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 e8b763aaca31af8b293131dabc6c50935be34788..e02983ce6ad77b3ec34f29dc269487609f297790 100644 (file)
--- 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 ef4f74a2b40bba926b83ed198a3be74be95da337..bc36520d9a26a9331a2802546a0fa9944455e99e 100644 (file)
--- 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 6d716599f7292e0fdcc84412db8dbaf00f57da86..d002f276d32c6680055f625e66791dc1e217f8c3 100644 (file)
--- 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;