Unverified Commit fa2d6ba8 authored by Rikard Falkeborn's avatar Rikard Falkeborn Committed by Daniel Stenberg
Browse files

printf: fix format specifiers 

Closes #3426
parent c7c362a2

lib/doh.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 2018 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -160,7 +160,7 @@ static int Curl_doh_done(struct Curl_easy *doh, CURLcode result) 
  struct Curl_easy *data = doh->set.dohfor;

  /* so one of the DOH request done for the 'data' transfer is now complete! */

  data->req.doh.pending--;

  infof(data, "a DOH request is completed, %d to go\n", data->req.doh.pending);

  infof(data, "a DOH request is completed, %u to go\n", data->req.doh.pending);

  if(result)

    infof(data, "DOH request %s\n", curl_easy_strerror(result));

lib/transfer.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -318,7 +318,7 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, size_t bytes, 
    /* if we're not handling trailing data, proceed as usual */

    if(data->state.trailers_state != TRAILERS_SENDING) {

      hexlen = msnprintf(hexbuffer, sizeof(hexbuffer),

                         "%x%s", nread, endofline_native);

                         "%zx%s", nread, endofline_native);



      /* move buffer pointer */

      data->req.upload_fromhere -= hexlen;

lib/url.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -2996,7 +2996,7 @@ static CURLcode parse_remote_port(struct Curl_easy *data, 
    char portbuf[16];

    CURLUcode uc;

    conn->remote_port = (unsigned short)data->set.use_port;

    msnprintf(portbuf, sizeof(portbuf), "%u", conn->remote_port);

    msnprintf(portbuf, sizeof(portbuf), "%d", conn->remote_port);

    uc = curl_url_set(data->state.uh, CURLUPART_PORT, portbuf, 0);

    if(uc)

      return CURLE_OUT_OF_MEMORY;

lib/vtls/mbedtls.c

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2010 - 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com>

 * Copyright (C) 2012 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 2012 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -373,7 +373,7 @@ mbed_connect_step1(struct connectdata *conn, 
    }

  }



  infof(data, "mbedTLS: Connecting to %s:%d\n", hostname, port);

  infof(data, "mbedTLS: Connecting to %s:%ld\n", hostname, port);



  mbedtls_ssl_config_init(&BACKEND->config);

src/tool_paramhlp.c

+3 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -456,9 +456,8 @@ static CURLcode checkpasswd(const char *kind, /* for what purpose */ 
                      kind, *userpwd);

    else

      curlx_msnprintf(prompt, sizeof(prompt),

                      "Enter %s password for user '%s' on URL #%"

                      CURL_FORMAT_CURL_OFF_TU ":",

                      kind, *userpwd, (curl_off_t) (i + 1));

                      "Enter %s password for user '%s' on URL #%zu:",

                      kind, *userpwd, i + 1);



    /* get password */

    getpass_r(prompt, passwd, sizeof(passwd));