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

diff --git a/src/utils/utf8/utf8.c b/src/utils/utf8/utf8.c
index 4b9ec4b77db5bb956f0f6c837a557ec1895b3b5a..e5c1d55a25eb5c65abd4c9916889bbef7c198356 100644 (file)
--- 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 a7331b95a3903288d243d826ed5b9b8ae75d25f3..0cb09f58fa11e256cb6b7f3fe992443e0771389e 100644 (file)
--- 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 35702a78c5386e59a092f977ea4b54acfb20f00a..dc9197ddd92d89c59fe05c75e724185d94d02533 100644 (file)
--- 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;
 }