From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Fri, 25 Oct 2024 15:06:30 +0000 (+0200)
Subject: CLEANUP: log: use strnlen2() in _lf_text_len() to compute string length
X-Git-Tag: v3.1-dev11~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d5b32daad863f6a1bfab134d0775b8ffcf87e86;p=thirdparty%2Fhaproxy.git

CLEANUP: log: use strnlen2() in _lf_text_len() to compute string length

Thanks to previous commit, we can now use strnlen2() function to perform
strnlen() portable equivalent instead of re-implementing the logic under
_lf_text_len() function.
---

diff --git a/src/log.c b/src/log.c
index 71ce020b79..42e7663496 100644
--- a/src/log.c
+++ b/src/log.c
@@ -2388,15 +2388,7 @@ static inline char *_lf_text_len(char *dst, const char *src,
 			 * indefinite length text in cbor, because indefinite-length text
 			 * has to be made of multiple chunks of known size as per RFC8949...
 			 */
-			{
-				int _len;
-
-				/* strnlen(src, len) portable equivalent: */
-				for (_len = 0; _len < len && src[_len]; _len++)
-					;
-
-				len = _len;
-			}
+			len = strnlen2(src, len);
 
 			ret = cbor_encode_text(&ctx->encode.cbor, dst, dst + size, src, len);
 			if (ret == NULL)