Commit 44985e88 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

improved failf() error messages

parent f03366bc

lib/connect.c

+2 −1
Original line number Diff line number Diff line
@@ -345,7 +345,8 @@ static CURLcode bindlocal(struct connectdata *conn, 


        if(!bindworked) {

          data->state.os_errno = Curl_ourerrno();

          failf(data, "%s", Curl_strerror(conn, data->state.os_errno));

          failf(data, "bind failure: %s",

                Curl_strerror(conn, data->state.os_errno));

          return CURLE_HTTP_PORT_FAILED;

        }

lib/ftp.c

+3 −3
Original line number Diff line number Diff line
@@ -869,13 +869,13 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, 
  }



  if (portsock == CURL_SOCKET_BAD) {

    failf(data, "%s", Curl_strerror(conn,error));

    failf(data, "socket failure: %s", Curl_strerror(conn,error));

    return CURLE_FTP_PORT_FAILED;

  }



  sslen = sizeof(ss);

  if (getsockname(portsock, sa, &sslen) < 0) {

    failf(data, "%s", Curl_strerror(conn,Curl_ourerrno()));

    failf(data, "getsockname(): %s", Curl_strerror(conn,Curl_ourerrno()));

    return CURLE_FTP_PORT_FAILED;

  }
@@ -2151,7 +2151,7 @@ static CURLcode ftp_state_get_resp(struct connectdata *conn, 
      state(conn, FTP_STOP); /* this phase is over */

    }

    else {

      failf(data, "%s", buf+4);

      failf(data, "RETR response: %03d", ftpcode);

      return CURLE_FTP_COULDNT_RETR_FILE;

    }

  }