diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-12-09 16:15:37 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-12-10 10:03:33 +0100 |
| commit | c6deecd7e9ea7dd10de0934f8ec30952648aba2d (patch) | |
| tree | d0d784efffbb6eeb0f06afca3f1e779ad928d0f5 /src/tool_operate.c | |
| parent | 9819984fbb04968dcec53a65ae0dfae23111dd18 (diff) | |
| download | curl-c6deecd7e9ea7dd10de0934f8ec30952648aba2d.tar.gz | |
curl: use errorf() better
Change series of error outputs to use errorf().
Only errors that are due to mistakes in command line option usage should
use helpf(), other types of errors in the tool should rather use
errorf().
Closes #4691
Diffstat (limited to 'src/tool_operate.c')
| -rw-r--r-- | src/tool_operate.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c index 4c9b07e39..bbd7fa49d 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -706,7 +706,7 @@ static CURLcode single_transfer(struct GlobalConfig *global, httpgetfields = state->httpgetfields = strdup(config->postfields); Curl_safefree(config->postfields); if(!httpgetfields) { - helpf(global->errors, "out of memory\n"); + errorf(global, "out of memory\n"); result = CURLE_OUT_OF_MEMORY; } else if(SetHTTPrequest(config, @@ -768,7 +768,7 @@ static CURLcode single_transfer(struct GlobalConfig *global, if(urlnode->outfile && !state->outfiles) { state->outfiles = strdup(urlnode->outfile); if(!state->outfiles) { - helpf(global->errors, "out of memory\n"); + errorf(global, "out of memory\n"); result = CURLE_OUT_OF_MEMORY; break; } @@ -796,12 +796,12 @@ static CURLcode single_transfer(struct GlobalConfig *global, if(inglob) { result = glob_next_url(&state->uploadfile, inglob); if(result == CURLE_OUT_OF_MEMORY) - helpf(global->errors, "out of memory\n"); + errorf(global, "out of memory\n"); } else if(!state->up) { state->uploadfile = strdup(infiles); if(!state->uploadfile) { - helpf(global->errors, "out of memory\n"); + errorf(global, "out of memory\n"); result = CURLE_OUT_OF_MEMORY; } } @@ -1030,7 +1030,7 @@ static CURLcode single_transfer(struct GlobalConfig *global, if(result) break; if(!*per->outfile && !config->content_disposition) { - helpf(global->errors, "Remote file name has no length!\n"); + errorf(global, "Remote file name has no length!\n"); result = CURLE_WRITE_ERROR; break; } @@ -1087,7 +1087,7 @@ static CURLcode single_transfer(struct GlobalConfig *global, FILE *file = fopen(per->outfile, "ab"); #endif if(!file) { - helpf(global->errors, "Can't open '%s'!\n", per->outfile); + errorf(global, "Can't open '%s'!\n", per->outfile); result = CURLE_WRITE_ERROR; break; } @@ -2288,7 +2288,7 @@ static CURLcode transfer_per_config(struct GlobalConfig *global, config->cacert = strdup(env); if(!config->cacert) { curl_free(env); - helpf(global->errors, "out of memory\n"); + errorf(global, "out of memory\n"); return CURLE_OUT_OF_MEMORY; } } @@ -2309,7 +2309,7 @@ static CURLcode transfer_per_config(struct GlobalConfig *global, config->cacert = strdup(env); if(!config->cacert) { curl_free(env); - helpf(global->errors, "out of memory\n"); + errorf(global, "out of memory\n"); return CURLE_OUT_OF_MEMORY; } } @@ -2496,7 +2496,7 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[]) #endif } else - helpf(global->errors, "out of memory\n"); + errorf(global, "out of memory\n"); } } |