libcurl: Stop using error codes defined under CURL_NO_OLDIES

Fixes https://github.com/curl/curl/issues/1688
Closes https://github.com/curl/curl/pull/1712

diff --git a/lib/telnet.c b/lib/telnet.c
index 100f29099ddbdf22b2a5bc0d51d30569a497dbe7..3dec959073268963cccc2c8ba732cddd6588d3db 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -899,7 +899,7 @@ static CURLcode check_telnet_options(struct connectdata *conn)
       }
 
       failf(data, "Unknown telnet option %s", head->data);
-      result = CURLE_UNKNOWN_TELNET_OPTION;
+      result = CURLE_UNKNOWN_OPTION;
       break;
     }
     failf(data, "Syntax error in telnet option: %s", head->data);

diff --git a/lib/tftp.c b/lib/tftp.c
index 336beb512bf9628d35b2c54eb50bc1a7a51991f3..02bd842427a2c32c997f9c4ac66454c46ebead88 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -1345,7 +1345,7 @@ static CURLcode tftp_do(struct connectdata *conn, bool *done)
 
   state = (tftp_state_data_t *)conn->proto.tftpc;
   if(!state)
-    return CURLE_BAD_CALLING_ORDER;
+    return CURLE_TFTP_ILLEGAL;
 
   result = tftp_perform(conn, done);