commit 2471f5c2b2e281fe45dbdbc94536b8cbad6853b1
author Tim Duesterhus <tim@bastelstu.be> Mon Nov 08 09:05:01 2021 +0100
committer Willy Tarreau <w@1wt.eu> Mon Nov 08 12:08:26 2021 +0100
tree 426baa8382dc10bc27e261351cd59523428bac61
parent 9b80a6ca8f7e551c812f6b50f2dd67b6b0505f0f

CLEANUP: Apply ist.cocci

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

src/cache.c

diff --git a/src/cache.c b/src/cache.c
index ba2b63c..e871a7b 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -622,8 +622,7 @@
 			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));

src/flt_trace.c

diff --git a/src/flt_trace.c b/src/flt_trace.c
index b3efea6..5aabcb2 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -146,8 +146,7 @@
 		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);

src/hlua.c

diff --git a/src/hlua.c b/src/hlua.c
index c2e56b3..94f6562 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -6329,8 +6329,7 @@
 			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 @@
 			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;

src/http_ana.c

diff --git a/src/http_ana.c b/src/http_ana.c
index 9d11284..c037261 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -4912,8 +4912,7 @@
 				}
 
 				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;

src/log.c

diff --git a/src/log.c b/src/log.c
index 81bf97b..e7607c2 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1665,8 +1665,7 @@
 		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 @@
 		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);
 	}