diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2015-02-27 20:48:38 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2015-02-27 21:05:52 +0000 |
| commit | c715fa0b60c86449e09b313245de621b32e329d2 (patch) | |
| tree | 9c17ebd6afa3ab7725feb02f2bd10f0d368cafbe /src/tool_paramhlp.c | |
| parent | adf27bf60f9e4ce29ef5a6a553763737842629a1 (diff) | |
| download | curl-c715fa0b60c86449e09b313245de621b32e329d2.tar.gz | |
tool: Updated the warnf() function to use the GlobalConfig structure
As the 'error' and 'mute' options are now part of the GlobalConfig,
rather than per Operation, updated the warnf() function to use this
structure rather than the OperationConfig.
Diffstat (limited to 'src/tool_paramhlp.c')
| -rw-r--r-- | src/tool_paramhlp.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c index 0e05184c3..d4b96e76d 100644 --- a/src/tool_paramhlp.c +++ b/src/tool_paramhlp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, 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 @@ -331,7 +331,7 @@ long proto2num(struct OperationConfig *config, long *val, const char *str) if no protocols are allowed */ if(action == set) *val = 0; - warnf(config, "unrecognized protocol '%s'\n", token); + warnf(config->global, "unrecognized protocol '%s'\n", token); } } Curl_safefree(buffer); @@ -449,7 +449,10 @@ int ftpfilemethod(struct OperationConfig *config, const char *str) return CURLFTPMETHOD_NOCWD; if(curlx_raw_equal("multicwd", str)) return CURLFTPMETHOD_MULTICWD; - warnf(config, "unrecognized ftp file method '%s', using default\n", str); + + warnf(config->global, "unrecognized ftp file method '%s', using default\n", + str); + return CURLFTPMETHOD_MULTICWD; } @@ -459,7 +462,10 @@ int ftpcccmethod(struct OperationConfig *config, const char *str) return CURLFTPSSL_CCC_PASSIVE; if(curlx_raw_equal("active", str)) return CURLFTPSSL_CCC_ACTIVE; - warnf(config, "unrecognized ftp CCC method '%s', using default\n", str); + + warnf(config->global, "unrecognized ftp CCC method '%s', using default\n", + str); + return CURLFTPSSL_CCC_PASSIVE; } @@ -471,7 +477,10 @@ long delegation(struct OperationConfig *config, char *str) return CURLGSSAPI_DELEGATION_POLICY_FLAG; if(curlx_raw_equal("always", str)) return CURLGSSAPI_DELEGATION_FLAG; - warnf(config, "unrecognized delegation method '%s', using none\n", str); + + warnf(config->global, "unrecognized delegation method '%s', using none\n", + str); + return CURLGSSAPI_DELEGATION_NONE; } |