From 9cb4475b0d031cf33e63e587f0ada69f48b52d78 Mon Sep 17 00:00:00 2001
From: Joshua Rogers <MegaManSec@users.noreply.github.com>
Date: Sat, 6 Sep 2025 07:04:21 +0000
Subject: [PATCH] Consistently check strcspn return value (#2166)

---
 src/format/Format.cc | 2 +-
 src/format/Token.cc  | 4 +---
 src/http/Message.cc  | 2 +-
 src/tools.cc         | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/format/Format.cc b/src/format/Format.cc
index 3612590d8e..711082379c 100644
--- a/src/format/Format.cc
+++ b/src/format/Format.cc
@@ -294,7 +294,7 @@ log_quoted_string(const char *str, char *out)
     char *p = out;
 
     while (*str) {
-        int l = strcspn(str, "\"\\\r\n\t");
+        const auto l = strcspn(str, "\"\\\r\n\t");
         memcpy(p, str, l);
         str += l;
         p += l;
diff --git a/src/format/Token.cc b/src/format/Token.cc
index 3b1da3e5bc..0b569c2430 100644
--- a/src/format/Token.cc
+++ b/src/format/Token.cc
@@ -354,9 +354,7 @@ Format::Token::parse(const char *def, Quoting *quoting)
 {
     const char *cur = def;
 
-    int l;
-
-    l = strcspn(cur, "%");
+    auto l = strcspn(cur, "%");
 
     if (l > 0) {
         char *cp;
diff --git a/src/http/Message.cc b/src/http/Message.cc
index 7c575eb249..bd40c89497 100644
--- a/src/http/Message.cc
+++ b/src/http/Message.cc
@@ -41,7 +41,7 @@ Http::Message::putCc(const HttpHdrCc &otherCc)
 static int
 httpMsgIsolateStart(const char **parse_start, const char **blk_start, const char **blk_end)
 {
-    int slen = strcspn(*parse_start, "\r\n");
+    const auto slen = strcspn(*parse_start, "\r\n");
 
     if (!(*parse_start)[slen])  /* no CRLF found */
         return 0;
diff --git a/src/tools.cc b/src/tools.cc
index 989f55636e..5361b759a9 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1088,7 +1088,7 @@ strwordquote(MemBuf * mb, const char *str)
     }
 
     while (*str) {
-        int l = strcspn(str, "\"\\\n\r");
+        const auto l = strcspn(str, "\"\\\n\r");
         mb->append(str, l);
         str += l;
 
-- 
2.47.3