upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

CLEANUP: Apply ist.cocci

Browse source 
Make use of the new rules to use `isttrim()`.
This commit is contained in:
Tim Duesterhus 2021-11-08 09:05:01 +01:00 committed by Willy Tarreau
parent 9b80a6ca8f
commit 2471f5c2b2
5 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cache.c
View file

@ -622,8 +622,7 @@ cache_store_http_payload(struct stream *s, struct filter *filter, struct http_ms
case HTX_BLK_DATA:
v = htx_get_blk_value(htx, blk);
v = istadv(v, offset);
if (v.len > len)
v.len = len;
v = isttrim(v, len);
info = (type << 28) + v.len;
chunk_memcat(&trash, (char *)&info, sizeof(info));

3
src/flt_trace.c
View file

@ -146,8 +146,7 @@ trace_htx_hexdump(struct htx *htx, unsigned int offset, unsigned int len)
v = istadv(v, offset);
offset = 0;
if (v.len > len)
v.len = len;
v = isttrim(v, len);
len -= v.len;
if (type == HTX_BLK_DATA)
trace_hexdump(v);

6
src/hlua.c
View file

@ -6329,8 +6329,7 @@ static int _hlua_http_msg_dup(struct http_msg *msg, lua_State *L, size_t offset,
case HTX_BLK_DATA:
v = htx_get_blk_value(htx, blk);
v = istadv(v, offset);
if (v.len > len)
v.len = len;
v = isttrim(v, len);
luaL_addlstring(&b, v.ptr, v.len);
ret += v.len;
@ -6431,8 +6430,7 @@ static void _hlua_http_msg_delete(struct http_msg *msg, struct filter *filter, s
goto end;
v = htx_get_blk_value(htx, blk);
v.ptr += htxret.ret;
if (v.len > len)
v.len = len;
v = isttrim(v, len);
blk = htx_replace_blk_value(htx, blk, v, IST_NULL);
len -= v.len;
ret += v.len;

3
src/http_ana.c
View file

@ -4912,8 +4912,7 @@ static void http_capture_headers(struct htx *htx, char **cap, struct cap_hdr *ca
}
v = htx_get_blk_value(htx, blk);
if (v.len > h->len)
v.len = h->len;
v = isttrim(v, h->len);
memcpy(cap[h->index], v.ptr, v.len);
cap[h->index][v.len]=0;

6
src/log.c
View file

@ -1665,8 +1665,7 @@ static inline void __do_send_log(struct logsrv *logsrv, int nblogger, int level,
struct ist msg;
msg = ist2(message, size);
if (msg.len > logsrv->maxlen)
msg.len = logsrv->maxlen;
msg = isttrim(msg, logsrv->maxlen);
sent = sink_write(logsrv->sink, &msg, 1, level, logsrv->facility, metadata);
}
@ -1674,8 +1673,7 @@ static inline void __do_send_log(struct logsrv *logsrv, int nblogger, int level,
struct ist msg;
msg = ist2(message, size);
if (msg.len > logsrv->maxlen)
msg.len = logsrv->maxlen;
msg = isttrim(msg, logsrv->maxlen);
sent = fd_write_frag_line(*plogfd, logsrv->maxlen, msg_header, nbelem, &msg, 1, 1);
}