Commit 4fad1943 authored by Yang Tse's avatar Yang Tse
Browse files

string formatting: fix 15+ printf-style format strings

parent 4d346673

lib/ldap.c

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

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

 *

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

 * Copyright (C) 1998 - 2013, 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
@@ -260,7 +260,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done) 
    }

    server = ldapssl_init(conn->host.name, (int)conn->port, 1);

    if(server == NULL) {

      failf(data, "LDAP local: Cannot connect to %s:%hu",

      failf(data, "LDAP local: Cannot connect to %s:%ld",

              conn->host.name, conn->port);

      status = CURLE_COULDNT_CONNECT;

      goto quit;
@@ -301,7 +301,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done) 
    }

    server = ldap_init(conn->host.name, (int)conn->port);

    if(server == NULL) {

      failf(data, "LDAP local: Cannot connect to %s:%hu",

      failf(data, "LDAP local: Cannot connect to %s:%ld",

              conn->host.name, conn->port);

      status = CURLE_COULDNT_CONNECT;

      goto quit;
@@ -337,7 +337,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done) 
  else {

    server = ldap_init(conn->host.name, (int)conn->port);

    if(server == NULL) {

      failf(data, "LDAP local: Cannot connect to %s:%hu",

      failf(data, "LDAP local: Cannot connect to %s:%ld",

              conn->host.name, conn->port);

      status = CURLE_COULDNT_CONNECT;

      goto quit;

lib/memdebug.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ void *curl_domalloc(size_t wantedsize, int line, const char *source) 
  }



  if(source)

    curl_memlog("MEM %s:%d malloc(%zd) = %p\n",

    curl_memlog("MEM %s:%d malloc(%zu) = %p\n",

                source, line, wantedsize,

                mem ? (void *)mem->mem : (void *)0);

lib/multi.c

+6 −6
Original line number Diff line number Diff line
@@ -1231,12 +1231,12 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
    case CURLM_STATE_WAITDO:

      /* Wait for our turn to DO when we're pipelining requests */

#ifdef DEBUGBUILD

      infof(data, "WAITDO: Conn %ld send pipe %zu inuse %d athead %d\n",

      infof(data, "WAITDO: Conn %ld send pipe %zu inuse %s athead %s\n",

            easy->easy_conn->connection_id,

            easy->easy_conn->send_pipe->size,

            easy->easy_conn->writechannel_inuse?1:0,

            easy->easy_conn->writechannel_inuse?"TRUE":"FALSE",

            isHandleAtHead(data,

                           easy->easy_conn->send_pipe)?1:0);

                           easy->easy_conn->send_pipe)?"TRUE":"FALSE");

#endif

      if(!easy->easy_conn->writechannel_inuse &&

         isHandleAtHead(data,
@@ -1423,12 +1423,12 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
      }

#ifdef DEBUGBUILD

      else {

        infof(data, "WAITPERFORM: Conn %ld recv pipe %zu inuse %d athead %d\n",

        infof(data, "WAITPERFORM: Conn %ld recv pipe %zu inuse %s athead %s\n",

              easy->easy_conn->connection_id,

              easy->easy_conn->recv_pipe->size,

              easy->easy_conn->readchannel_inuse?1:0,

              easy->easy_conn->readchannel_inuse?"TRUE":"FALSE",

              isHandleAtHead(data,

                             easy->easy_conn->recv_pipe)?1:0);

                             easy->easy_conn->recv_pipe)?"TRUE":"FALSE");

      }

#endif

      break;

lib/pipeline.c

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ bool Curl_pipeline_penalized(struct SessionHandle *data, 
      penalized = TRUE;



    infof(data, "Conn: %ld (%p) Receive pipe weight: (%" FORMAT_OFF_T

          "/%zd), penalized: %s\n",

          "/%zu), penalized: %s\n",

          conn->connection_id, (void *)conn, recv_size,

          conn->chunk.datasize, penalized?"TRUE":"FALSE");

    return penalized;
@@ -322,7 +322,7 @@ void print_pipeline(struct connectdata *conn) 
    curr = cb_ptr->conn_list->head;

    while(curr) {

      conn = curr->ptr;

      infof(data, "- Conn %ld (%p) send_pipe: %zd, recv_pipe: %zd\n",

      infof(data, "- Conn %ld (%p) send_pipe: %zu, recv_pipe: %zu\n",

            conn->connection_id,

            (void *)conn,

            conn->send_pipe->size,

lib/rtsp.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static CURLcode rtsp_rtp_readwrite(struct SessionHandle *data, 
  }



  if(rtp_dataleft != 0 && rtp[0] == '$') {

    DEBUGF(infof(data, "RTP Rewinding %zu %s\n", rtp_dataleft,

    DEBUGF(infof(data, "RTP Rewinding %zd %s\n", rtp_dataleft,

          *readmore ? "(READMORE)" : ""));



    /* Store the incomplete RTP packet for a "rewind" */