mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-27 04:01:45 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: Apply ist.cocci

Browse Source 
Make use of the new rules to use `istnext()`.
This commit is contained in:
Tim Duesterhus 2021-11-04 22:35:44 +01:00 committed by Willy Tarreau
parent ef00c533e1
commit 284fbe1214
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cache.c
View File

@ -2180,49 +2180,49 @@ static int parse_encoding_value(struct ist encoding, unsigned int *encoding_valu
switch (*encoding.ptr) {
case 'a':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "aes128gcm", VARY_ENCODING_AES128GCM);
break;
case 'b':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "br", VARY_ENCODING_BR);
break;
case 'c':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "compress", VARY_ENCODING_COMPRESS);
break;
case 'd':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "deflate", VARY_ENCODING_DEFLATE);
break;
case 'e':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "exi", VARY_ENCODING_EXI);
break;
case 'g':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "gzip", VARY_ENCODING_GZIP);
break;
case 'i':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "identity", VARY_ENCODING_IDENTITY);
break;
case 'p':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "pack200-gzip", VARY_ENCODING_PACK200_GZIP);
break;
case 'x':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "x-gzip", VARY_ENCODING_GZIP);
if (!*encoding_value)
*encoding_value = CHECK_ENCODING(encoding, "x-compress", VARY_ENCODING_COMPRESS);
break;
case 'z':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = CHECK_ENCODING(encoding, "zstd", VARY_ENCODING_ZSTD);
break;
case '*':
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
*encoding_value = VARY_ENCODING_STAR;
break;
default:
@ -2238,7 +2238,7 @@ static int parse_encoding_value(struct ist encoding, unsigned int *encoding_valu
return -1;
if (has_null_weight) {
encoding = istadv(encoding, 1);
encoding = istnext(encoding);
encoding = http_trim_leading_spht(encoding);

12
src/http_htx.c
View File

@ -146,8 +146,7 @@ static int __http_find_header(const struct htx *htx, const void *pattern, struct
goto next_blk;
/* Skip comma */
if (*(v.ptr) == ',') {
v.ptr++;
v.len--;
v = istnext(v);
}
goto return_hdr;
@ -216,8 +215,7 @@ static int __http_find_header(const struct htx *htx, const void *pattern, struct
ctx->lws_before = 0;
ctx->lws_after = 0;
while (v.len && HTTP_IS_LWS(*v.ptr)) {
v.ptr++;
v.len--;
v = istnext(v);
ctx->lws_before++;
}
if (!(flags & HTTP_FIND_FL_FULL))
@ -457,16 +455,14 @@ int http_replace_req_query(struct htx *htx, const struct ist query)
uri = htx_sl_req_uri(sl);
q = uri;
while (q.len > 0 && *(q.ptr) != '?') {
q.ptr++;
q.len--;
q = istnext(q);
}
/* skip the question mark or indicate that we must insert it
* (but only if the format string is not empty then).
*/
if (q.len) {
q.ptr++;
q.len--;
q = istnext(q);
}
else if (query.len > 1)
offset = 0;

2
src/mqtt.c
View File

@ -183,7 +183,7 @@ static inline struct ist mqtt_read_1byte_int(struct ist parser, uint8_t *i)
return IST_NULL;
if (i)
*i = (uint8_t)*istptr(parser);
parser = istadv(parser, 1);
parser = istnext(parser);
return parser;
}