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

src: cleanup ISBLANK vs ISSPACE

Browse source 
- use ISBLANK() where only spaces and tabs should match
- change while(x && ISBLANK(X)) => while(ISBLANK(x))

Closes #16589
This commit is contained in:
Daniel Stenberg 2025-03-06 11:01:55 +01:00
parent 9147903366
commit 1503555836
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/tool_formparse.c
View file

@ -509,23 +509,23 @@ static int get_param_part(struct OperationConfig *config, char endchar,
*pheaders = NULL;
if(pencoder)
*pencoder = NULL;
while(ISSPACE(*p))
while(ISBLANK(*p))
p++;
tp = p;
*pdata = get_param_word(config, &p, &endpos, endchar);
/* If not quoted, strip trailing spaces. */
if(*pdata == tp)
while(endpos > *pdata && ISSPACE(endpos[-1]))
while(endpos > *pdata && ISBLANK(endpos[-1]))
endpos--;
sep = *p;
*endpos = '\0';
while(sep == ';') {
while(p++ && ISSPACE(*p))
while(p++ && ISBLANK(*p))
;
if(!endct && checkprefix("type=", p)) {
size_t tlen;
for(p += 5; ISSPACE(*p); p++)
for(p += 5; ISBLANK(*p); p++)
;
/* set type pointer */
type = p;
@ -541,13 +541,13 @@ static int get_param_part(struct OperationConfig *config, char endchar,
*endct = '\0';
endct = NULL;
}
for(p += 9; ISSPACE(*p); p++)
for(p += 9; ISBLANK(*p); p++)
;
tp = p;
filename = get_param_word(config, &p, &endpos, endchar);
/* If not quoted, strip trailing spaces. */
if(filename == tp)
while(endpos > filename && ISSPACE(endpos[-1]))
while(endpos > filename && ISBLANK(endpos[-1]))
endpos--;
sep = *p;
*endpos = '\0';
@ -562,15 +562,14 @@ static int get_param_part(struct OperationConfig *config, char endchar,
char *hdrfile;
FILE *fp;
/* Read headers from a file. */
do {
p++;
} while(ISSPACE(*p));
} while(ISBLANK(*p));
tp = p;
hdrfile = get_param_word(config, &p, &endpos, endchar);
/* If not quoted, strip trailing spaces. */
if(hdrfile == tp)
while(endpos > hdrfile && ISSPACE(endpos[-1]))
while(endpos > hdrfile && ISBLANK(endpos[-1]))
endpos--;
sep = *p;
*endpos = '\0';
@ -591,13 +590,13 @@ static int get_param_part(struct OperationConfig *config, char endchar,
else {
char *hdr;
while(ISSPACE(*p))
while(ISBLANK(*p))
p++;
tp = p;
hdr = get_param_word(config, &p, &endpos, endchar);
/* If not quoted, strip trailing spaces. */
if(hdr == tp)
while(endpos > hdr && ISSPACE(endpos[-1]))
while(endpos > hdr && ISBLANK(endpos[-1]))
endpos--;
sep = *p;
*endpos = '\0';
@ -613,7 +612,7 @@ static int get_param_part(struct OperationConfig *config, char endchar,
*endct = '\0';
endct = NULL;
}
for(p += 8; ISSPACE(*p); p++)
for(p += 8; ISBLANK(*p); p++)
;
tp = p;
encoder = get_param_word(config, &p, &endpos, endchar);
@ -627,7 +626,7 @@ static int get_param_part(struct OperationConfig *config, char endchar,
else if(endct) {
/* This is part of content type. */
for(endct = p; *p && *p != ';' && *p != endchar; p++)
if(!ISSPACE(*p))
if(!ISBLANK(*p))
endct = p + 1;
sep = *p;
}

6
src/tool_getparam.c
View file

@ -1114,11 +1114,9 @@ static ParameterError parse_url(struct GlobalConfig *global,
curlx_dyn_init(&line, 8092);
while(my_get_line(f, &line, &error)) {
const char *ptr = curlx_dyn_ptr(&line);
err = add_url(global, config, ptr, GETOUT_USEREMOTE | GETOUT_NOGLOB);
if(err)
break;
curlx_dyn_reset(&line);
}
if(!fromstdin)
fclose(f);
@ -1146,12 +1144,12 @@ static ParameterError parse_localport(struct OperationConfig *config,
if(*p) {
pp = p;
/* check for ' - [end]' */
if(ISSPACE(*pp))
if(ISBLANK(*pp))
pp++;
if(*pp != '-')
return PARAM_BAD_USE;
pp++;
if(*pp && ISSPACE(*pp))
if(ISBLANK(*pp))
pp++;
}
msnprintf(buffer, sizeof(buffer), "%.*s", (int)plen, nextarg);

8
src/tool_parsecfg.c
View file

@ -111,7 +111,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
/* the option starts with a dash? */
dashed_option = (option[0] == '-');
while(*line && !ISSPACE(*line) && !ISSEP(*line, dashed_option))
while(*line && !ISBLANK(*line) && !ISSEP(*line, dashed_option))
line++;
/* ... and has ended here */
@ -123,7 +123,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
#endif
/* pass spaces and separator(s) */
while(*line && (ISSPACE(*line) || ISSEP(*line, dashed_option)))
while(ISBLANK(*line) || ISSEP(*line, dashed_option))
line++;
/* the parameter starts here (unless quoted) */
@ -141,7 +141,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
}
else {
param = line; /* parameter starts here */
while(*line && !ISSPACE(*line))
while(*line && !ISSPACE(*line)) /* stop also on CRLF */
line++;
if(*line) {
@ -150,7 +150,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
/* to detect mistakes better, see if there is data following */
line++;
/* pass all spaces */
while(*line && ISSPACE(*line))
while(ISBLANK(*line))
line++;
switch(*line) {

2
src/tool_urlglob.c
View file

@ -278,7 +278,7 @@ static CURLcode glob_range(struct URLGlob *glob, char **patternp,
endp = NULL;
else {
pattern = endp + 1;
while(*pattern && ISBLANK(*pattern))
while(ISBLANK(*pattern))
pattern++;
if(!ISDIGIT(*pattern)) {
endp = NULL;

2
src/var.c
View file

@ -119,7 +119,7 @@ static ParameterError varfunc(struct GlobalConfig *global,
f += FUNC_TRIM_LEN;
if(clen) {
/* skip leading white space, including CRLF */
while(*c && ISSPACE(*c)) {
while(ISSPACE(*c)) {
c++;
len--;
}