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_parsecfg.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_parsecfg.c')
-rw-r--r-- | src/tool_parsecfg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c index c5d390b7a..33c45ed84 100644 --- a/src/tool_parsecfg.c +++ b/src/tool_parsecfg.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 @@ -202,8 +202,8 @@ int parseconfig(const char *filename, struct GlobalConfig *global) case '#': /* comment */ break; default: - warnf(operation, "%s:%d: warning: '%s' uses unquoted white space in" - " the line that may cause side-effects!\n", + warnf(operation->global, "%s:%d: warning: '%s' uses unquoted white " + "space in the line that may cause side-effects!\n", filename, lineno, option); } } @@ -261,7 +261,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global) res != PARAM_VERSION_INFO_REQUESTED && res != PARAM_ENGINES_REQUESTED) { const char *reason = param2text(res); - warnf(operation, "%s:%d: warning: '%s' %s\n", + warnf(operation->global, "%s:%d: warning: '%s' %s\n", filename, lineno, option, reason); } } |