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

tool: Updated the warnf() function to use the GlobalConfig structure

Browse source 
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.
This commit is contained in:
Steve Holme 2015-02-27 20:48:38 +00:00
parent adf27bf60f
commit c715fa0b60
12 changed files with 86 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/tool_getparam.c
View file

@ -523,7 +523,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
case 'g': /* --trace */
GetStr(&global->trace_dump, nextarg);
if(global->tracetype && (global->tracetype != TRACE_BIN))
warnf(config, "--trace overrides an earlier trace/verbose option\n");
warnf(global, "--trace overrides an earlier trace/verbose option\n");
global->tracetype = TRACE_BIN;
break;
case 'G': /* --npn */
@ -532,7 +532,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
case 'h': /* --trace-ascii */
GetStr(&global->trace_dump, nextarg);
if(global->tracetype && (global->tracetype != TRACE_ASCII))
warnf(config,
warnf(global,
"--trace-ascii overrides an earlier trace/verbose option\n");
global->tracetype = TRACE_ASCII;
break;
@ -568,7 +568,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
/* for plain bytes, leave as-is */
break;
default:
warnf(config, "unsupported rate unit. Use G, M, K or B!\n");
warnf(global, "unsupported rate unit. Use G, M, K or B!\n");
return PARAM_BAD_USE;
}
config->recvpersecond = value;
@ -678,7 +678,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
if(strcmp(nextarg, "-")) {
FILE *newfile = fopen(nextarg, "wt");
if(!newfile)
warnf(config, "Failed to open %s!\n", nextarg);
warnf(global, "Failed to open %s!\n", nextarg);
else {
if(global->errors_fopened)
fclose(global->errors);
@ -830,7 +830,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
else {
config->localportrange -= config->localport;
if(config->localportrange < 1) {
warnf(config, "bad range input\n");
warnf(global, "bad range input\n");
return PARAM_BAD_USE;
}
}
@ -862,7 +862,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
break;
case 'z': /* --libcurl */
#ifdef CURL_DISABLE_LIBCURL_OPTION
warnf(config,
warnf(global,
"--libcurl option was disabled at build-time!\n");
return PARAM_OPTION_UNKNOWN;
#else
@ -950,7 +950,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
int mlmaj, mlmin, mlpatch;
metalink_get_version(&mlmaj, &mlmin, &mlpatch);
if((mlmaj*10000)+(mlmin*100)+mlpatch < CURL_REQ_LIBMETALINK_VERS) {
warnf(config,
warnf(global,
"--metalink option cannot be used because the version of "
"the linked libmetalink library is too old. "
"Required: %d.%d.%d, found %d.%d.%d\n",
@ -963,7 +963,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
else
config->use_metalink = toggle;
#else
warnf(config, "--metalink option is ignored because the binary is "
warnf(global, "--metalink option is ignored because the binary is "
"built without the Metalink support.\n");
#endif
break;
@ -975,7 +975,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
#ifdef CURLDEBUG
config->test_event_based = toggle;
#else
warnf(config, "--test-event is ignored unless a debug build!\n");
warnf(global, "--test-event is ignored unless a debug build!\n");
#endif
break;
case 'M': /* --unix-socket */
@ -1127,7 +1127,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
else {
file = fopen(p, "rb");
if(!file)
warnf(config,
warnf(global,
"Couldn't read data from file \"%s\", this makes "
"an empty POST.\n", nextarg);
}
@ -1193,7 +1193,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
else {
file = fopen(nextarg, "rb");
if(!file)
warnf(config, "Couldn't read data from file \"%s\", this makes "
warnf(global, "Couldn't read data from file \"%s\", this makes "
"an empty POST.\n", nextarg);
}
@ -1441,7 +1441,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
break;
case 'J': /* --remote-header-name */
if(config->include_headers) {
warnf(config,
warnf(global,
"--include and --remote-header-name cannot be combined.\n");
return PARAM_BAD_USE;
}
@ -1452,7 +1452,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
break;
case 'K': /* parse config file */
if(parseconfig(nextarg, global))
warnf(config, "error trying read config from the '%s' file\n",
warnf(global, "error trying read config from the '%s' file\n",
nextarg);
break;
case 'l':
@ -1479,7 +1479,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
#ifdef USE_MANUAL
return PARAM_MANUAL_REQUESTED;
#else
warnf(config,
warnf(global,
"built-in manual was disabled at build-time!\n");
return PARAM_OPTION_UNKNOWN;
#endif
@ -1598,7 +1598,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
if(ISDIGIT(*nextarg) && !strchr(nextarg, '-')) {
char buffer[32];
curl_off_t off;
warnf(config,
warnf(global,
"A specified range MUST include at least one dash (-). "
"Appending one for you!\n");
off = curlx_strtoofft(nextarg, NULL, 10);
@ -1614,7 +1614,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
tmp_range = nextarg;
while(*tmp_range != '\0') {
if(!ISDIGIT(*tmp_range) && *tmp_range != '-' && *tmp_range != ',') {
warnf(config,"Invalid character is found in given range. "
warnf(global, "Invalid character is found in given range. "
"A specified range MUST have only digits in "
"\'start\'-\'stop\'. The server's response to this "
"request is uncertain.\n");
@ -1703,7 +1703,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
if(!global->trace_dump)
return PARAM_NO_MEM;
if(global->tracetype && (global->tracetype != TRACE_PLAIN))
warnf(config,
warnf(global,
"-v, --verbose overrides an earlier trace/verbose option\n");
global->tracetype = TRACE_PLAIN;
}
@ -1738,7 +1738,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
if(err)
return err;
if(!config->writeout)
warnf(config, "Failed to read %s", fname);
warnf(global, "Failed to read %s", fname);
}
else
GetStr(&config->writeout, nextarg);
@ -1796,7 +1796,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
if(-1 == stat(nextarg, &statbuf)) {
/* failed, remove time condition */
config->timecond = CURL_TIMECOND_NONE;
warnf(config,
warnf(global,
"Illegal date format for -z, --timecond (and not "
"a file name). Disabling time condition. "
"See curl_getdate(3) for valid date syntax.\n");