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

tool: remove newlines from all helpf/notef/warnf/errorf calls

Browse source 
Make voutf() always add one.

Closes #11226
This commit is contained in:
Daniel Stenberg 2023-05-30 14:44:56 +02:00
parent 4efa0b5749
commit 6d45b9ca9c
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
13 changed files with 120 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/tool_getparam.c
View file

@ -506,7 +506,7 @@ static ParameterError GetSizeParameter(struct GlobalConfig *global,
curl_off_t value;
if(curlx_strtoofft(arg, &unit, 10, &value)) {
warnf(global, "invalid number specified for %s\n", which);
warnf(global, "invalid number specified for %s", which);
return PARAM_BAD_USE;
}
@ -539,7 +539,7 @@ static ParameterError GetSizeParameter(struct GlobalConfig *global,
/* for plain bytes, leave as-is */
break;
default:
warnf(global, "unsupported %s unit. Use G, M, K or B!\n", which);
warnf(global, "unsupported %s unit. Use G, M, K or B!", which);
return PARAM_BAD_USE;
}
*value_out = value;
@ -603,7 +603,7 @@ static ParameterError data_urlencode(struct GlobalConfig *global,
if(!file)
warnf(global,
"Couldn't read data from file \"%s\", this makes "
"an empty POST.\n", nextarg);
"an empty POST.", nextarg);
}
err = file2memory(&postdata, &size, file);
@ -666,7 +666,7 @@ static void sethttpver(struct GlobalConfig *global,
{
if(config->httpversion &&
(config->httpversion != httpversion))
warnf(global, "Overrides previous HTTP version option\n");
warnf(global, "Overrides previous HTTP version option");
config->httpversion = httpversion;
}
@ -793,7 +793,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
if((aliases[hit].desc == ARG_FILENAME) &&
(nextarg[0] == '-') && nextarg[1]) {
/* if the file name looks like a command line option */
warnf(global, "The file name argument '%s' looks like a flag.\n",
warnf(global, "The file name argument '%s' looks like a flag.",
nextarg);
}
}
@ -862,17 +862,17 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
case 'g': /* --trace */
GetStr(&global->trace_dump, nextarg);
if(global->tracetype && (global->tracetype != TRACE_BIN))
warnf(global, "--trace overrides an earlier trace/verbose option\n");
warnf(global, "--trace overrides an earlier trace/verbose option");
global->tracetype = TRACE_BIN;
break;
case 'G': /* --npn */
warnf(global, "--npn is no longer supported\n");
warnf(global, "--npn is no longer supported");
break;
case 'h': /* --trace-ascii */
GetStr(&global->trace_dump, nextarg);
if(global->tracetype && (global->tracetype != TRACE_ASCII))
warnf(global,
"--trace-ascii overrides an earlier trace/verbose option\n");
"--trace-ascii overrides an earlier trace/verbose option");
global->tracetype = TRACE_ASCII;
break;
case 'H': /* --alpn */
@ -927,7 +927,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
numerator = 24*60*60*1000;
break;
default:
errorf(global, "unsupported --rate unit\n");
errorf(global, "unsupported --rate unit");
return PARAM_BAD_USE;
}
}
@ -1113,7 +1113,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
config->ftp_ssl = toggle;
if(config->ftp_ssl)
warnf(global,
"--ssl is an insecure option, consider --ssl-reqd instead\n");
"--ssl is an insecure option, consider --ssl-reqd instead");
break;
case 'b': /* --ftp-pasv */
Curl_safefree(config->ftpport);
@ -1255,7 +1255,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
case 'z': /* --libcurl */
#ifdef CURL_DISABLE_LIBCURL_OPTION
warnf(global,
"--libcurl option was disabled at build-time!\n");
"--libcurl option was disabled at build-time!");
return PARAM_OPTION_UNKNOWN;
#else
GetStr(&global->libcurl, nextarg);
@ -1333,7 +1333,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
GetStr(&config->mail_auth, nextarg);
break;
case 'J': /* --metalink */
errorf(global, "--metalink is disabled\n");
errorf(global, "--metalink is disabled");
return PARAM_BAD_USE;
case '6': /* --sasl-authzid */
GetStr(&config->sasl_authzid, nextarg);
@ -1345,7 +1345,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
#ifdef CURLDEBUG
global->test_event_based = toggle;
#else
warnf(global, "--test-event is ignored unless a debug build!\n");
warnf(global, "--test-event is ignored unless a debug build!");
#endif
break;
case 'M': /* --unix-socket */
@ -1488,11 +1488,11 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
break;
case '2':
/* SSL version 2 */
warnf(global, "Ignores instruction to use SSLv2\n");
warnf(global, "Ignores instruction to use SSLv2");
break;
case '3':
/* SSL version 3 */
warnf(global, "Ignores instruction to use SSLv3\n");
warnf(global, "Ignores instruction to use SSLv3");
break;
case '4':
/* IPv4 */
@ -1620,7 +1620,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
file = fopen(nextarg, "rb");
if(!file)
warnf(global, "Couldn't read data from file \"%s\", this makes "
"an empty POST.\n", nextarg);
"an empty POST.", nextarg);
}
if((subletter == 'b') || /* --data-binary */
@ -1967,7 +1967,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
}
if(config->failonerror && config->failwithbody) {
errorf(config->global, "You must select either --fail or "
"--fail-with-body, not both.\n");
"--fail-with-body, not both.");
return PARAM_BAD_USE;
}
break;
@ -2016,7 +2016,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
bool use_stdin = !strcmp(&nextarg[1], "-");
FILE *file = use_stdin?stdin:fopen(&nextarg[1], FOPEN_READTEXT);
if(!file)
warnf(global, "Failed to open %s!\n", &nextarg[1]);
warnf(global, "Failed to open %s!", &nextarg[1]);
else {
err = file2memory(&string, &len, file);
if(!err && string) {
@ -2075,7 +2075,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
break;
case 'K': /* parse config file */
if(parseconfig(nextarg, global)) {
errorf(global, "cannot read config from '%s'\n", nextarg);
errorf(global, "cannot read config from '%s'", nextarg);
return PARAM_READ_ERROR;
}
break;
@ -2102,7 +2102,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
if(toggle) { /* --no-manual shows no manual... */
#ifndef USE_MANUAL
warnf(global,
"built-in manual was disabled at build-time!\n");
"built-in manual was disabled at build-time");
#endif
return PARAM_MANUAL_REQUESTED;
}
@ -2172,7 +2172,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
/* fill in the outfile */
if('o' == letter) {
if(!*nextarg) {
warnf(global, "output file name has no length\n");
warnf(global, "output file name has no length");
return PARAM_BAD_USE;
}
GetStr(&url->outfile, nextarg);
@ -2233,12 +2233,12 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
char buffer[32];
curl_off_t off;
if(curlx_strtoofft(nextarg, NULL, 10, &off)) {
warnf(global, "unsupported range point\n");
warnf(global, "unsupported range point");
return PARAM_BAD_USE;
}
warnf(global,
"A specified range MUST include at least one dash (-). "
"Appending one for you!\n");
"Appending one for you!");
msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-", off);
Curl_safefree(config->range);
config->range = strdup(buffer);
@ -2253,7 +2253,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
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");
"request is uncertain.");
break;
}
tmp_range++;
@ -2330,7 +2330,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
return PARAM_NO_MEM;
if(global->tracetype && (global->tracetype != TRACE_PLAIN))
warnf(global,
"-v, --verbose overrides an earlier trace/verbose option\n");
"-v, --verbose overrides an earlier trace/verbose option");
global->tracetype = TRACE_PLAIN;
}
else
@ -2461,7 +2461,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
warnf(global,
"Illegal date format for -z, --time-cond (and not "
"a file name). Disabling time condition. "
"See curl_getdate(3) for valid date syntax.\n");
"See curl_getdate(3) for valid date syntax.");
}
}
break;
@ -2537,7 +2537,7 @@ ParameterError parse_args(struct GlobalConfig *global, int argc,
result = PARAM_NO_MEM;
}
else {
errorf(global, "missing URL before --next\n");
errorf(global, "missing URL before --next");
result = PARAM_BAD_USE;
}
}
@ -2570,9 +2570,9 @@ ParameterError parse_args(struct GlobalConfig *global, int argc,
const char *reason = param2text(result);
if(orig_opt && strcmp(":", orig_opt))
helpf(stderr, "option %s: %s\n", orig_opt, reason);
helpf(stderr, "option %s: %s", orig_opt, reason);
else
helpf(stderr, "%s\n", reason);
helpf(stderr, "%s", reason);
}
curlx_unicodefree(orig_opt);