improved failf() error messages

diff --git a/lib/connect.c b/lib/connect.c
index 17a2c94dec311b9690f182e023b2942c5c15d103..b603c12c8dcd31ae70f297ef9af271e667489233 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -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;
         }
 

diff --git a/lib/ftp.c b/lib/ftp.c
index 70be8692ba0ad3b8a14039cdacab9bb32a4d236b..9da9273ce426780fb507ed1d97471db98d84c700 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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;
     }
   }