diff options
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; } |