Commit d65cf788 authored by Yang Tse's avatar Yang Tse
Browse files 

fix printf-style format strings
parent ddab9bd2

lib/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ CURLcode Curl_is_connected(struct connectdata *conn, 
    data->state.os_errno = error;

    infof(data, "Connection failed\n");

    if(trynextip(conn, sockindex, connected)) {

      failf(data, "Failed connect to %s:%d; %s",

      failf(data, "Failed connect to %s:%ld; %s",

            conn->host.name, conn->port, Curl_strerror(conn, error));

      code = CURLE_COULDNT_CONNECT;

    }
@@ -601,7 +601,7 @@ CURLcode Curl_is_connected(struct connectdata *conn, 
    if(trynextip(conn, sockindex, connected)) {

      error = SOCKERRNO;

      data->state.os_errno = error;

      failf(data, "Failed connect to %s:%d; %s",

      failf(data, "Failed connect to %s:%ld; %s",

            conn->host.name, conn->port, Curl_strerror(conn, error));

      code = CURLE_COULDNT_CONNECT;

    }

lib/cookie.c

+2 −1
Original line number Diff line number Diff line
@@ -681,7 +681,8 @@ Curl_cookie_add(struct SessionHandle *data, 


  if(c->running)

    /* Only show this when NOT reading the cookies from a file */

    infof(data, "%s cookie %s=\"%s\" for domain %s, path %s, expire %d\n",

    infof(data, "%s cookie %s=\"%s\" for domain %s, path %s, "

          "expire %" FORMAT_OFF_T "\n",

          replace_old?"Replaced":"Added", co->name, co->value,

          co->domain, co->path, co->expires);

lib/multi.c

+3 −3
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
    /* Handle the case when the pipe breaks, i.e., the connection

       we're using gets cleaned up and we're left with nothing. */

    if(easy->easy_handle->state.pipe_broke) {

      infof(easy->easy_handle, "Pipe broke: handle 0x%x, url = %s\n",

      infof(easy->easy_handle, "Pipe broke: handle 0x%p, url = %s\n",

            easy, easy->easy_handle->state.path);



      if(easy->state != CURLM_STATE_COMPLETED) {
@@ -1131,7 +1131,7 @@ 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(easy->easy_handle, "Conn %d send pipe %d inuse %d athead %d\n",

      infof(easy->easy_handle, "Conn %ld send pipe %d inuse %d athead %d\n",

            easy->easy_conn->connectindex,

            easy->easy_conn->send_pipe->size,

            easy->easy_conn->writechannel_inuse,
@@ -1319,7 +1319,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
      }

#ifdef DEBUGBUILD

      else {

        infof(easy->easy_handle, "Conn %d recv pipe %d inuse %d athead %d\n",

        infof(easy->easy_handle, "Conn %ld recv pipe %d inuse %d athead %d\n",

              easy->easy_conn->connectindex,

              easy->easy_conn->recv_pipe->size,

              easy->easy_conn->readchannel_inuse,

lib/rtsp.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ CURLcode Curl_rtsp(struct connectdata *conn, bool *done) 
  result =

    Curl_add_bufferf(req_buffer,

                     "%s %s RTSP/1.0\r\n" /* Request Stream-URI RTSP/1.0 */

                     "CSeq: %d\r\n", /* CSeq */

                     "CSeq: %ld\r\n", /* CSeq */

                     (p_request ? p_request : ""), p_stream_uri,

                     rtsp->CSeq_sent);

  if(result)

lib/speedcheck.c

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

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

 *

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

 * Copyright (C) 1998 - 2010, 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
@@ -54,7 +54,7 @@ CURLcode Curl_speedcheck(struct SessionHandle *data, 
      /* we have been this slow for long enough, now die */

      failf(data,

            "Operation too slow. "

            "Less than %d bytes/sec transfered the last %d seconds",

            "Less than %ld bytes/sec transfered the last %ld seconds",

            data->set.low_speed_limit,

            data->set.low_speed_time);

      return CURLE_OPERATION_TIMEDOUT;