luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: simplify more white space loops

Browse Source 
Since the ISBLANK() and ISSPACE() macros check for specific matches,
there is no point in using while(*ptr && ISSPACE(*ptr)) etc, as the
'*ptr' check is then superfluous.

Closes #16363
This commit is contained in:
Daniel Stenberg 2025-02-17 11:24:49 +01:00
parent 9d5563b535
commit 076444ec46
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
12 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/altsvc.c
View File

@ -232,7 +232,7 @@ static CURLcode altsvc_load(struct altsvcinfo *asi, const char *file)
Curl_dyn_init(&buf, MAX_ALTSVC_LINE);
while(Curl_get_line(&buf, fp)) {
char *lineptr = Curl_dyn_ptr(&buf);
while(*lineptr && ISBLANK(*lineptr))
while(ISBLANK(*lineptr))
lineptr++;
if(*lineptr == '#')
/* skip commented lines */
@ -410,7 +410,7 @@ static CURLcode getalnum(const char **ptr, char *alpnbuf, size_t buflen)
size_t len;
const char *protop;
const char *p = *ptr;
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
protop = p;
while(*p && !ISBLANK(*p) && (*p != ';') && (*p != '='))
@ -593,12 +593,12 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data,
/* skip option if name is too long */
option[0] = '\0';
}
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
if(*p != '=')
return CURLE_OK;
p++;
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
if(!*p)
return CURLE_OK;

2
lib/headers.c
View File

@ -209,7 +209,7 @@ static CURLcode namevalue(char *header, size_t hlen, unsigned int type,
return CURLE_BAD_FUNCTION_ARGUMENT;
/* skip all leading space letters */
while(*header && ISBLANK(*header))
while(ISBLANK(*header))
header++;
*value = header;

10
lib/hsts.c
View File

@ -154,7 +154,7 @@ CURLcode Curl_hsts_parse(struct hsts *h, const char *hostname,
return CURLE_OK;
do {
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
if(strncasecompare("max-age", p, 7)) {
bool quoted = FALSE;
@ -164,11 +164,11 @@ CURLcode Curl_hsts_parse(struct hsts *h, const char *hostname,
return CURLE_BAD_FUNCTION_ARGUMENT;
p += 7;
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
if(*p++ != '=')
return CURLE_BAD_FUNCTION_ARGUMENT;
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
if(*p == '\"') {
@ -202,7 +202,7 @@ CURLcode Curl_hsts_parse(struct hsts *h, const char *hostname,
p++;
}
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
if(*p == ';')
p++;
@ -534,7 +534,7 @@ static CURLcode hsts_load(struct hsts *h, const char *file)
Curl_dyn_init(&buf, MAX_HSTS_LINE);
while(Curl_get_line(&buf, fp)) {
char *lineptr = Curl_dyn_ptr(&buf);
while(*lineptr && ISBLANK(*lineptr))
while(ISBLANK(*lineptr))
lineptr++;
/*
* Skip empty or commented lines, since we know the line will have a

16
lib/http.c
View File

@ -257,7 +257,7 @@ char *Curl_copy_header_value(const char *header)
/* Find the first non-space letter */
start = header;
while(*start && ISSPACE(*start))
while(ISSPACE(*start))
start++;
end = strchr(start, '\r');
@ -1016,7 +1016,7 @@ CURLcode Curl_http_input_auth(struct Curl_easy *data, bool proxy,
auth++;
if(*auth == ',') /* if we are on a comma, skip it */
auth++;
while(*auth && ISSPACE(*auth))
while(ISSPACE(*auth))
auth++;
}
@ -1404,7 +1404,7 @@ Curl_compareheader(const char *headerline, /* line to check */
start = &headerline[hlen];
/* pass all whitespace */
while(*start && ISSPACE(*start))
while(ISSPACE(*start))
start++;
/* find the end of the header line */
@ -1597,7 +1597,7 @@ CURLcode Curl_add_custom_headers(struct Curl_easy *data,
if(ptr) {
optr = ptr;
ptr++; /* pass the semicolon */
while(*ptr && ISSPACE(*ptr))
while(ISSPACE(*ptr))
ptr++;
if(*ptr) {
@ -1625,7 +1625,7 @@ CURLcode Curl_add_custom_headers(struct Curl_easy *data,
/* we require a colon for this to be a true header */
ptr++; /* pass the colon */
while(*ptr && ISSPACE(*ptr))
while(ISSPACE(*ptr))
ptr++;
if(*ptr || semicolonp) {
@ -3847,7 +3847,7 @@ static CURLcode http_rw_hd(struct Curl_easy *data,
*/
const char *p = hd;
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
if(!strncmp(p, "HTTP/", 5)) {
p += 5;
@ -3907,7 +3907,7 @@ static CURLcode http_rw_hd(struct Curl_easy *data,
}
else if(data->conn->handler->protocol & CURLPROTO_RTSP) {
const char *p = hd;
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
if(!strncmp(p, "RTSP/", 5)) {
p += 5;
@ -4448,7 +4448,7 @@ CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
scheme = Curl_checkheaders(data, STRCONST(HTTP_PSEUDO_SCHEME));
if(scheme) {
scheme += sizeof(HTTP_PSEUDO_SCHEME);
while(*scheme && ISBLANK(*scheme))
while(ISBLANK(*scheme))
scheme++;
infof(data, "set pseudo header %s to %s", HTTP_PSEUDO_SCHEME, scheme);
}

6
lib/http_aws_sigv4.c
View File

@ -95,12 +95,12 @@ static void trim_headers(struct curl_slist *head)
store = value;
/* skip leading whitespace */
while(*value && ISBLANK(*value))
while(ISBLANK(*value))
value++;
while(*value) {
int space = 0;
while(*value && ISBLANK(*value)) {
while(ISBLANK(*value)) {
value++;
space++;
}
@ -356,7 +356,7 @@ static char *parse_content_sha_hdr(struct Curl_easy *data,
return NULL;
++value;
while(*value && ISBLANK(*value))
while(ISBLANK(*value))
++value;
len = strlen(value);

2
lib/http_digest.c
View File

@ -62,7 +62,7 @@ CURLcode Curl_input_digest(struct Curl_easy *data,
return CURLE_BAD_CONTENT_ENCODING;
header += strlen("Digest");
while(*header && ISBLANK(*header))
while(ISBLANK(*header))
header++;
return Curl_auth_decode_digest_http_message(header, digest);

2
lib/http_negotiate.c
View File

@ -86,7 +86,7 @@ CURLcode Curl_input_negotiate(struct Curl_easy *data, struct connectdata *conn,
/* Obtain the input token, if any */
header += strlen("Negotiate");
while(*header && ISBLANK(*header))
while(ISBLANK(*header))
header++;
len = strlen(header);

2
lib/http_ntlm.c
View File

@ -70,7 +70,7 @@ CURLcode Curl_input_ntlm(struct Curl_easy *data,
if(checkprefix("NTLM", header)) {
header += strlen("NTLM");
while(*header && ISSPACE(*header))
while(ISSPACE(*header))
header++;
if(*header) {

4
lib/http_proxy.c
View File

@ -108,7 +108,7 @@ static CURLcode dynhds_add_custom(struct Curl_easy *data,
name = headers->data;
namelen = ptr - headers->data;
ptr++; /* pass the colon */
while(*ptr && ISSPACE(*ptr))
while(ISSPACE(*ptr))
ptr++;
if(*ptr) {
value = ptr;
@ -131,7 +131,7 @@ static CURLcode dynhds_add_custom(struct Curl_easy *data,
name = headers->data;
namelen = ptr - headers->data;
ptr++; /* pass the semicolon */
while(*ptr && ISSPACE(*ptr))
while(ISSPACE(*ptr))
ptr++;
if(!*ptr) {
/* quirk #2, send an empty header */

2
lib/noproxy.c
View File

@ -177,7 +177,7 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
bool match = FALSE;
/* pass blanks */
while(*p && ISBLANK(*p))
while(ISBLANK(*p))
p++;
token = p;

4
lib/rtsp.c
View File

@ -944,7 +944,7 @@ CURLcode Curl_rtsp_parseheader(struct Curl_easy *data, const char *header)
/* Find the first non-space letter */
start = header + 8;
while(*start && ISBLANK(*start))
while(ISBLANK(*start))
start++;
if(!*start) {
@ -1003,7 +1003,7 @@ CURLcode rtsp_parse_transport(struct Curl_easy *data, const char *transport)
const char *start, *end;
start = transport;
while(start && *start) {
while(*start && ISBLANK(*start) )
while(ISBLANK(*start) )
start++;
end = strchr(start, ';');
if(checkprefix("interleaved=", start)) {

2
lib/strtoofft.c
View File

@ -39,7 +39,7 @@ CURLofft curlx_strtoofft(const char *str, char **endp, int base,
*num = 0; /* clear by default */
DEBUGASSERT((base == 10) || (base == 16));
while(*str && ISBLANK(*str))
while(ISBLANK(*str))
str++;
rc = base == 10 ?