Consistently check strcspn return value (#2166)

diff --git a/src/format/Format.cc b/src/format/Format.cc
index 3612590d8efc211946a36ea2e2004d39a0e13e9d..711082379c6c3653da8e1d612c833de97c8cdcfe 100644 (file)
--- 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 3b1da3e5bc4ba6ee3110a5e99e2f0f48620f894d..0b569c2430573755eb83a2b3fcfc0c198f450376 100644 (file)
--- 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 7c575eb2496ba3a4f0bcba75bd94850c71ec714f..bd40c89497819ea930882a3e99c2de1c052af163 100644 (file)
--- 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 989f55636e6e42a7968296a10c797ae460d7c0eb..5361b759a9c02f0533dac8137c50b9cb4c4b1ff2 100644 (file)
--- 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;