curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-01 09:55:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

curl: remove first argument from helpf()

Browse Source 
It was always the same and it is a global already!

Closes #18221
This commit is contained in:
Daniel Stenberg 2025-08-07 16:12:44 +02:00
parent 16eac53dc9
commit 02b22ee4ea
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tool_getparam.c
View File

@ -3066,9 +3066,9 @@ ParameterError parse_args(int argc, argv_item_t argv[])
const char *reason = param2text(result);
if(orig_opt && strcmp(":", orig_opt))
helpf(tool_stderr, "option %s: %s", orig_opt, reason);
helpf("option %s: %s", orig_opt, reason);
else
helpf(tool_stderr, "%s", reason);
helpf("%s", reason);
}
unicodefree(orig_opt);

6
src/tool_ipfs.c
View File

@ -271,13 +271,13 @@ clean:
{
switch(result) {
case CURLE_URL_MALFORMAT:
helpf(tool_stderr, "malformed target URL");
helpf("malformed target URL");
break;
case CURLE_FILE_COULDNT_READ_FILE:
helpf(tool_stderr, "IPFS automatic gateway detection failed");
helpf("IPFS automatic gateway detection failed");
break;
case CURLE_BAD_FUNCTION_ARGUMENT:
helpf(tool_stderr, "--ipfs-gateway was given a malformed URL");
helpf("--ipfs-gateway was given a malformed URL");
break;
default:
break;

10
src/tool_msgs.c
View File

@ -113,18 +113,18 @@ void warnf(const char *fmt, ...)
* Emit help formatted message on given stream. This is for errors with or
* related to command line arguments.
*/
void helpf(FILE *errors, const char *fmt, ...)
void helpf(const char *fmt, ...)
{
if(fmt) {
va_list ap;
va_start(ap, fmt);
DEBUGASSERT(!strchr(fmt, '\n'));
fputs("curl: ", errors); /* prefix it */
vfprintf(errors, fmt, ap);
fputs("curl: ", tool_stderr); /* prefix it */
vfprintf(tool_stderr, fmt, ap);
va_end(ap);
fputs("\n", errors); /* newline it */
fputs("\n", tool_stderr); /* newline it */
}
fprintf(errors, "curl: try 'curl --help' "
fprintf(tool_stderr, "curl: try 'curl --help' "
#ifdef USE_MANUAL
"or 'curl --manual' "
#endif

4
src/tool_msgs.h
View File

@ -30,8 +30,8 @@ void warnf(const char *fmt, ...)
CURL_PRINTF(1, 2);
void notef(const char *fmt, ...)
CURL_PRINTF(1, 2);
void helpf(FILE *errors, const char *fmt, ...)
CURL_PRINTF(2, 3);
void helpf(const char *fmt, ...)
CURL_PRINTF(1, 2);
void errorf(const char *fmt, ...)
CURL_PRINTF(1, 2);

6
src/tool_operate.c
View File

@ -302,7 +302,7 @@ static CURLcode pre_transfer(struct per_transfer *per)
if((per->infd == -1) || fstat(per->infd, &fileinfo))
#endif
{
helpf(tool_stderr, "cannot open '%s'", per->uploadfile);
helpf("cannot open '%s'", per->uploadfile);
if(per->infd != -1) {
close(per->infd);
per->infd = STDIN_FILENO;
@ -2082,7 +2082,7 @@ static CURLcode transfer_per_config(struct OperationConfig *config,
/* Check we have a url */
if(!config->url_list || !config->url_list->url) {
helpf(tool_stderr, "(%d) no URL specified", CURLE_FAILED_INIT);
helpf("(%d) no URL specified", CURLE_FAILED_INIT);
return CURLE_FAILED_INIT;
}
@ -2205,7 +2205,7 @@ CURLcode operate(int argc, argv_item_t argv[])
/* If we had no arguments then make sure a url was specified in .curlrc */
if((argc < 2) && (!global->first->url_list)) {
helpf(tool_stderr, NULL);
helpf(NULL);
result = CURLE_FAILED_INIT;
}
}