[GNUnet-SVN] [gnurl] 168/208: libcurl: Stop using error codes defined under CURL_NO_OLDIES

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.

commit 512f8c774a8ae541d2e4fbccdd94e4bb0d39e90c
Author: Dwarakanath Yadavalli <address@hidden>
AuthorDate: Mon Jul 31 11:22:04 2017 +0530

    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
---
 lib/telnet.c | 2 +-
 lib/tftp.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/telnet.c b/lib/telnet.c
index 100f29099..3dec95907 100644
--- 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 336beb512..02bd84242 100644
--- 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);
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden