summaryrefslogtreecommitdiff
path: root/lib/socks.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-04-05 15:14:02 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-04-05 15:14:02 +0200
commit01f05d0c758795e5bb02c6245fc73b8458eb397a (patch)
tree2c1cfbc7166e792b7944486839eac44ece59a878 /lib/socks.h
parent8321a367ee1da094147384a6619334221f5d014c (diff)
downloadcurl-01f05d0c758795e5bb02c6245fc73b8458eb397a.tar.gz
return code cleanup: build, init and run-time errors
Stop the abuse of CURLE_FAILED_INIT as return code for things not being init related by introducing two new return codes: CURLE_NOT_BUILT_IN and CURLE_UNKNOWN_OPTION CURLE_NOT_BUILT_IN replaces return code 4 that has been obsoleted for several years. It is used for returning error when something is attempted to be used but the feature/option was not enabled or explictitly disabled at build-time. Getting this error mostly means that libcurl needs to be rebuilt. CURLE_FAILED_INIT is now saved and used strictly for init failures. Getting this problem means something went seriously wrong, like a resource shortage or similar. CURLE_UNKNOWN_OPTION is the option formerly known as CURLE_UNKNOWN_TELNET_OPTION (and the old name is still present, separately defined to be removed in a very distant future). This error code is meant to be used to return when an option is given to libcurl that isn't known. This problem would mostly indicate a problem in the program that uses libcurl.
Diffstat (limited to 'lib/socks.h')
-rw-r--r--lib/socks.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/socks.h b/lib/socks.h
index 1c686d181..42b8080b0 100644
--- a/lib/socks.h
+++ b/lib/socks.h
@@ -25,8 +25,8 @@
#include "setup.h"
#ifdef CURL_DISABLE_PROXY
-#define Curl_SOCKS4(a,b,c,d,e,f) CURLE_FAILED_INIT
-#define Curl_SOCKS5(a,b,c,d,e,f) CURLE_FAILED_INIT
+#define Curl_SOCKS4(a,b,c,d,e,f) CURLE_NOT_BUILT_IN
+#define Curl_SOCKS5(a,b,c,d,e,f) CURLE_NOT_BUILT_IN
#else
/*
* Helper read-from-socket functions. Does the same as Curl_read() but it