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

curl: change the struct getout flags field into bitfields

Browse source 
As the flags were use mostly as individual booleans anyway, the code
gets simpler when we use bitfields instead of manual bitwise operations.

Closes #17436
This commit is contained in:
Daniel Stenberg 2025-05-24 00:08:56 +02:00
parent 8ab73bb1ff
commit 65e4444d67
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 39 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/tool_operate.c
View file

@ -850,7 +850,8 @@ static CURLcode single_transfer(struct GlobalConfig *global,
if(!urlnode->url) {
/* This node has no URL. Free node data without destroying the
node itself nor modifying next pointer and continue to next */
urlnode->flags = 0;
urlnode->outset = urlnode->urlset = urlnode->useremote =
urlnode->uploadset = urlnode->noupload = urlnode->noglob = FALSE;
state->up = 0;
if(!warn_more_options) {
/* only show this once */
@ -898,7 +899,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
}
if(!state->urlnum) {
if(!config->globoff && !(urlnode->flags & GETOUT_NOGLOB)) {
if(!config->globoff && !urlnode->noglob) {
/* Unless explicitly shut off, we expand '{...}' and '[...]'
expressions and return total number of URLs in pattern set */
result = glob_url(&state->urls, urlnode->url, &state->urlnum,
@ -1121,7 +1122,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
}
}
if(((urlnode->flags&GETOUT_USEREMOTE) ||
if((urlnode->useremote ||
(per->outfile && strcmp("-", per->outfile)))) {
/*
@ -1185,8 +1186,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
*skipped = TRUE;
}
}
if((urlnode->flags & GETOUT_USEREMOTE)
&& config->content_disposition) {
if(urlnode->useremote && config->content_disposition) {
/* Our header callback MIGHT set the filename */
DEBUGASSERT(!outs->filename);
}
@ -1309,7 +1309,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
config->terminal_binary_ok =
(per->outfile && !strcmp(per->outfile, "-"));
if(config->content_disposition && (urlnode->flags & GETOUT_USEREMOTE))
if(config->content_disposition && urlnode->useremote)
hdrcbdata->honor_cd_filename = TRUE;
else
hdrcbdata->honor_cd_filename = FALSE;
@ -1344,7 +1344,8 @@ static CURLcode single_transfer(struct GlobalConfig *global,
else {
/* Free this URL node data without destroying the
node itself nor modifying next pointer. */
urlnode->flags = 0;
urlnode->outset = urlnode->urlset = urlnode->useremote =
urlnode->uploadset = urlnode->noupload = urlnode->noglob = FALSE;
glob_cleanup(&state->urls);
state->urlnum = 0;