moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

curl: s/config->global/global/ in single_transfer()

Browse Source
This commit is contained in:
Daniel Stenberg 2021-01-26 16:55:50 +01:00
parent 71acece933
commit f42ee77adb
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tool_operate.c
View File

@ -885,7 +885,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
FILE *newfile; FILE *newfile;
newfile = fopen(config->headerfile, per->prev == NULL?"wb":"ab"); newfile = fopen(config->headerfile, per->prev == NULL?"wb":"ab");
if(!newfile) { if(!newfile) {
warnf(config->global, "Failed to open %s\n", config->headerfile); warnf(global, "Failed to open %s\n", config->headerfile);
result = CURLE_WRITE_ERROR; result = CURLE_WRITE_ERROR;
break; break;
} }
@ -922,7 +922,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
/* open file for reading: */ /* open file for reading: */
FILE *file = fopen(config->etag_compare_file, FOPEN_READTEXT); FILE *file = fopen(config->etag_compare_file, FOPEN_READTEXT);
if(!file && !config->etag_save_file) { if(!file && !config->etag_save_file) {
errorf(config->global, errorf(global,
"Failed to open %s\n", config->etag_compare_file); "Failed to open %s\n", config->etag_compare_file);
result = CURLE_READ_ERROR; result = CURLE_READ_ERROR;
break; break;
@ -939,7 +939,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
if(!header) { if(!header) {
if(file) if(file)
fclose(file); fclose(file);
errorf(config->global, errorf(global,
"Failed to allocate memory for custom etag header\n"); "Failed to allocate memory for custom etag header\n");
result = CURLE_OUT_OF_MEMORY; result = CURLE_OUT_OF_MEMORY;
break; break;
@ -965,7 +965,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
FILE *newfile = fopen(config->etag_save_file, "wb"); FILE *newfile = fopen(config->etag_save_file, "wb");
if(!newfile) { if(!newfile) {
warnf( warnf(
config->global, global,
"Failed to open %s\n", config->etag_save_file); "Failed to open %s\n", config->etag_save_file);
result = CURLE_WRITE_ERROR; result = CURLE_WRITE_ERROR;
@ -1053,7 +1053,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
Curl_safefree(storefile); Curl_safefree(storefile);
if(result) { if(result) {
/* bad globbing */ /* bad globbing */
warnf(config->global, "bad output glob!\n"); warnf(global, "bad output glob!\n");
break; break;
} }
} }
@ -1153,7 +1153,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
* we should warn him/her. * we should warn him/her.
*/ */
if(config->proxyanyauth || (authbits>1)) { if(config->proxyanyauth || (authbits>1)) {
warnf(config->global, warnf(global,
"Using --anyauth or --proxy-anyauth with upload from stdin" "Using --anyauth or --proxy-anyauth with upload from stdin"
" involves a big risk of it not working. Use a temporary" " involves a big risk of it not working. Use a temporary"
" file or a fixed auth type instead!\n"); " file or a fixed auth type instead!\n");
@ -1165,7 +1165,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
set_binmode(stdin); set_binmode(stdin);
if(!strcmp(per->uploadfile, ".")) { if(!strcmp(per->uploadfile, ".")) {
if(curlx_nonblock((curl_socket_t)per->infd, TRUE) < 0) if(curlx_nonblock((curl_socket_t)per->infd, TRUE) < 0)
warnf(config->global, warnf(global,
"fcntl failed on fd=%d: %s\n", per->infd, strerror(errno)); "fcntl failed on fd=%d: %s\n", per->infd, strerror(errno));
} }
} }
@ -1493,7 +1493,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
if(config->capath) { if(config->capath) {
result = res_setopt_str(curl, CURLOPT_CAPATH, config->capath); result = res_setopt_str(curl, CURLOPT_CAPATH, config->capath);
if(result == CURLE_NOT_BUILT_IN) { if(result == CURLE_NOT_BUILT_IN) {
warnf(config->global, "ignoring %s, not supported by libcurl\n", warnf(global, "ignoring %s, not supported by libcurl\n",
capath_from_env? capath_from_env?
"SSL_CERT_DIR environment variable":"--capath"); "SSL_CERT_DIR environment variable":"--capath");
} }
@ -1510,7 +1510,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
config->capath)); config->capath));
if(result == CURLE_NOT_BUILT_IN) { if(result == CURLE_NOT_BUILT_IN) {
if(config->proxy_capath) { if(config->proxy_capath) {
warnf(config->global, warnf(global,
"ignoring --proxy-capath, not supported by libcurl\n"); "ignoring --proxy-capath, not supported by libcurl\n");
} }
} }
@ -2079,11 +2079,11 @@ static CURLcode single_transfer(struct GlobalConfig *global,
result = CURLE_OUT_OF_MEMORY; result = CURLE_OUT_OF_MEMORY;
break; break;
} }
fprintf(config->global->errors, fprintf(global->errors,
"Metalink: parsing (%s) metalink/XML...\n", per->this_url); "Metalink: parsing (%s) metalink/XML...\n", per->this_url);
} }
else if(metalink) else if(metalink)
fprintf(config->global->errors, fprintf(global->errors,
"Metalink: fetching (%s) from (%s)...\n", "Metalink: fetching (%s) from (%s)...\n",
mlfile->filename, per->this_url); mlfile->filename, per->this_url);
#endif /* USE_METALINK */ #endif /* USE_METALINK */