romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-30 11:28:05 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_operate: Start to use CURLcode rather than int for return codes

Browse source 
To help assist with the detection of incorrect return codes, as per
commits ee23d13a79, 33b8960dc8 and aba98991a5, updated the operate
based functions to return CURLcode error codes.
This commit is contained in:
Steve Holme 2014-02-22 18:57:02 +00:00
parent ee23d13a79
commit b914e7ed02
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/tool_operate.c
View file

@ -112,7 +112,7 @@ CURLcode curl_easy_perform_ev(CURL *easy);
"If you'd like to turn off curl's verification of the certificate, use\n" \
" the -k (or --insecure) option.\n"
static int is_fatal_error(int code)
static bool is_fatal_error(CURLcode code)
{
switch(code) {
/* TODO: Should CURLE_SSL_CACERT be included as critical error ? */
@ -122,12 +122,13 @@ static int is_fatal_error(int code)
case CURLE_FUNCTION_NOT_FOUND:
case CURLE_BAD_FUNCTION_ARGUMENT:
/* critical error */
return 1;
return TRUE;
default:
break;
}
/* no error or not critical */
return 0;
return FALSE;
}
#ifdef __VMS
@ -202,7 +203,7 @@ static CURLcode operate_init(struct Configurable *config)
return CURLE_OK;
}
static int operate_do(struct Configurable *config)
static CURLcode operate_do(struct Configurable *config)
{
char errorbuffer[CURL_ERROR_SIZE];
struct ProgressData progressbar;
@ -1787,7 +1788,7 @@ static int operate_do(struct Configurable *config)
dumpeasysrc(config);
#endif
return res;
return (CURLcode)res;
}
static void operate_free(struct Configurable *config)
@ -1801,9 +1802,9 @@ static void operate_free(struct Configurable *config)
clean_metalink(config);
}
int operate(struct Configurable *config, int argc, argv_item_t argv[])
CURLcode operate(struct Configurable *config, int argc, argv_item_t argv[])
{
int result = 0;
CURLcode result = CURLE_OK;
/* Initialize the easy interface */
result = operate_init(config);