diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-04-05 15:14:02 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-04-05 15:14:02 +0200 |
| commit | 01f05d0c758795e5bb02c6245fc73b8458eb397a (patch) | |
| tree | 2c1cfbc7166e792b7944486839eac44ece59a878 /lib/nssg.h | |
| parent | 8321a367ee1da094147384a6619334221f5d014c (diff) | |
| download | curl-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/nssg.h')
| -rw-r--r-- | lib/nssg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/nssg.h b/lib/nssg.h index f9cc46ae2..438d5a636 100644 --- a/lib/nssg.h +++ b/lib/nssg.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -60,8 +60,8 @@ CURLcode Curl_nss_force_init(struct SessionHandle *data); #define curlssl_close Curl_nss_close /* NSS has no shutdown function provided and thus always fail */ #define curlssl_shutdown(x,y) (x=x, y=y, 1) -#define curlssl_set_engine(x,y) (x=x, y=y, CURLE_FAILED_INIT) -#define curlssl_set_engine_default(x) (x=x, CURLE_FAILED_INIT) +#define curlssl_set_engine(x,y) (x=x, y=y, CURLE_NOT_BUILT_IN) +#define curlssl_set_engine_default(x) (x=x, CURLE_NOT_BUILT_IN) #define curlssl_engines_list(x) (x=x, (struct curl_slist *)NULL) #define curlssl_version Curl_nss_version #define curlssl_check_cxn(x) Curl_nss_check_cxn(x) |