romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 08:43:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_cfgable: Removed list_engine flag from config structure

Browse source 
In preparation for separating the global config options from the per
operation config options, reworked the list engines code to not use a
member variable in the Configurable structure.
This commit is contained in:
Steve Holme 2014-02-22 20:58:43 +00:00
parent b914e7ed02
commit e6e8b14405
5 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tool_getparam.c
View file

@ -1310,7 +1310,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
case 'f': /* crypto engine */
GetStr(&config->engine, nextarg);
if(config->engine && curlx_raw_equal(config->engine,"list"))
config->list_engines = TRUE;
return PARAM_ENGINES_REQUESTED;
break;
case 'g': /* CA info PEM file */
/* CA cert directory */
@ -1819,7 +1819,7 @@ ParameterError parse_args(struct Configurable *config, int argc,
orig_opt = argv[i];
if(curlx_strequal(":", argv[i]) &&
((config->url_list && config->url_list->url) || config->list_engines)) {
(config->url_list && config->url_list->url)) {
/* Allocate the next config */
config->next = malloc(sizeof(struct Configurable));
@ -1865,7 +1865,8 @@ ParameterError parse_args(struct Configurable *config, int argc,
}
}
if(result && result != PARAM_HELP_REQUESTED) {
if(result && result != PARAM_HELP_REQUESTED &&
result != PARAM_ENGINES_REQUESTED) {
const char *reason = param2text(result);
if(!curlx_strequal(":", orig_opt))