From: Florian Forster <octo@collectd.org>
Date: Fri, 22 Dec 2023 14:26:11 +0000 (+0100)
Subject: utf8: Change argument from `uint8_t *` to `char const *`.
X-Git-Tag: 6.0.0-rc0~22^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3d603ed3f894c94d54144fb327dace17d4eed46;p=thirdparty%2Fcollectd.git

utf8: Change argument from `uint8_t *` to `char const *`.
---

diff --git a/src/utils/utf8/utf8.c b/src/utils/utf8/utf8.c
index 4b9ec4b77..e5c1d55a2 100644
--- a/src/utils/utf8/utf8.c
+++ b/src/utils/utf8/utf8.c
@@ -56,11 +56,11 @@ static uint32_t decode(uint32_t *state, uint32_t *codep, uint32_t byte) {
   return *state;
 }
 
-int utf8_valid(uint8_t *s) {
+int utf8_valid(char const *s) {
   uint32_t codepoint, state = 0;
 
   while (*s)
-    decode(&state, &codepoint, *s++);
+    decode(&state, &codepoint, (uint8_t)*s++);
 
   return state == UTF8_ACCEPT;
 }
diff --git a/src/utils/utf8/utf8.h b/src/utils/utf8/utf8.h
index a7331b95a..0cb09f58f 100644
--- a/src/utils/utf8/utf8.h
+++ b/src/utils/utf8/utf8.h
@@ -25,6 +25,6 @@
 
 #include "collectd.h"
 
-int utf8_valid(uint8_t *s);
+int utf8_valid(char const *s);
 
 #endif
diff --git a/src/utils/utf8/utf8_test.c b/src/utils/utf8/utf8_test.c
index 35702a78c..dc9197ddd 100644
--- a/src/utils/utf8/utf8_test.c
+++ b/src/utils/utf8/utf8_test.c
@@ -92,7 +92,7 @@ DEF_TEST(utf8_valid) {
 
   for (size_t i = 0; i < STATIC_ARRAY_SIZE(cases); i++) {
     printf("Case #%zu: %s\n", i, cases[i].name);
-    EXPECT_EQ_INT(cases[i].want, utf8_valid((uint8_t *)cases[i].input));
+    EXPECT_EQ_INT(cases[i].want, utf8_valid(cases[i].input));
   }
   return 0;
 }