From: Tim Duesterhus <tim@bastelstu.be>
Date: Mon, 8 Nov 2021 08:05:01 +0000 (+0100)
Subject: CLEANUP: Apply ist.cocci
X-Git-Tag: v2.5-dev14~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2471f5c2b2e281fe45dbdbc94536b8cbad6853b1;p=thirdparty%2Fhaproxy.git

CLEANUP: Apply ist.cocci

Make use of the new rules to use `isttrim()`.
---

diff --git a/src/cache.c b/src/cache.c
index ba2b63c49a..e871a7b30c 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -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));
diff --git a/src/flt_trace.c b/src/flt_trace.c
index b3efea6f94..5aabcb2b09 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -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);
diff --git a/src/hlua.c b/src/hlua.c
index c2e56b3b94..94f6562349 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -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;
diff --git a/src/http_ana.c b/src/http_ana.c
index 9d11284a55..c037261cf6 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -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;
diff --git a/src/log.c b/src/log.c
index 81bf97b347..e7607c2c4c 100644
--- a/src/log.c
+++ b/src/log.c
@@ -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);
 	}