Unverified Commit 5ae22272 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Curl_debug: remove dead printhost code 

The struct field is never set (since 5e0d9aea) so remove the use of it
and remove the connectdata pointer from the prototype.

Reported-by: Tejas
Bug: https://curl.haxx.se/mail/lib-2018-06/0054.html
Closes #2647
parent 819f44dc

lib/ftp.c

+1 −2
Original line number Diff line number Diff line
@@ -3991,8 +3991,7 @@ CURLcode Curl_ftpsend(struct connectdata *conn, const char *cmd) 
      break;



    if(conn->data->set.verbose)

      Curl_debug(conn->data, CURLINFO_HEADER_OUT,

                 sptr, (size_t)bytes_written, conn);

      Curl_debug(conn->data, CURLINFO_HEADER_OUT, sptr, (size_t)bytes_written);



    if(bytes_written != (ssize_t)write_len) {

      write_len -= bytes_written;

lib/http.c

+4 −5
Original line number Diff line number Diff line
@@ -1181,12 +1181,12 @@ CURLcode Curl_add_buffer_send(Curl_send_buffer *in, 


    if(conn->data->set.verbose) {

      /* this data _may_ contain binary stuff */

      Curl_debug(conn->data, CURLINFO_HEADER_OUT, ptr, headlen, conn);

      Curl_debug(conn->data, CURLINFO_HEADER_OUT, ptr, headlen);

      if(bodylen) {

        /* there was body data sent beyond the initial header part, pass that

           on to the debug callback too */

        Curl_debug(conn->data, CURLINFO_DATA_OUT,

                   ptr + headlen, bodylen, conn);

                   ptr + headlen, bodylen);

      }

    }
@@ -3405,7 +3405,7 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, 


        if(data->set.verbose)

          Curl_debug(data, CURLINFO_HEADER_IN,

                     k->str_start, headerlen, conn);

                     k->str_start, headerlen);

        break;          /* exit header line loop */

      }
@@ -3860,8 +3860,7 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, 
      writetype |= CLIENTWRITE_BODY;



    if(data->set.verbose)

      Curl_debug(data, CURLINFO_HEADER_IN,

                 k->p, (size_t)k->hbuflen, conn);

      Curl_debug(data, CURLINFO_HEADER_IN, k->p, (size_t)k->hbuflen);



    result = Curl_client_write(conn, writetype, k->p, k->hbuflen);

    if(result)

lib/http_proxy.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static CURLcode CONNECT(struct connectdata *conn, 
        /* output debug if that is requested */

        if(data->set.verbose)

          Curl_debug(data, CURLINFO_HEADER_IN,

                     s->line_start, (size_t)s->perline, conn);

                     s->line_start, (size_t)s->perline);



        if(!data->set.suppress_connect_headers) {

          /* send the header to the callback */

lib/pingpong.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 - 2018, 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
@@ -221,8 +221,7 @@ CURLcode Curl_pp_vsendf(struct pingpong *pp, 
  }



  if(conn->data->set.verbose)

    Curl_debug(conn->data, CURLINFO_HEADER_OUT,

               s, (size_t)bytes_written, conn);

    Curl_debug(conn->data, CURLINFO_HEADER_OUT, s, (size_t)bytes_written);



  if(bytes_written != (ssize_t)write_len) {

    /* the whole chunk was not sent, keep it around and adjust sizes */
@@ -370,7 +369,7 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd, 
#endif

            if(data->set.verbose)

              Curl_debug(data, CURLINFO_HEADER_IN,

                         pp->linestart_resp, (size_t)perline, conn);

                         pp->linestart_resp, (size_t)perline);



          /*

           * We pass all response-lines to the callback function registered

lib/security.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ int Curl_sec_read_msg(struct connectdata *conn, char *buffer, 


  if(conn->data->set.verbose) {

    buf[decoded_len] = '\n';

    Curl_debug(conn->data, CURLINFO_HEADER_IN, buf, decoded_len + 1, conn);

    Curl_debug(conn->data, CURLINFO_HEADER_IN, buf, decoded_len + 1);

  }



  buf[decoded_len] = '\0';