Fix several '-Wsign-conversion' warnings

liweitianux · Mar 22, 2023 · 5e8ff4a · 5e8ff4a
1 parent 5782f0e
commit 5e8ff4a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/xtf8.c b/xtf8.c
@@ -113,7 +113,7 @@ xtf8_encode(void *dst, const void *src, size_t len, int error)
             } else {
                 /* Valid UTF-8 sequence, copy it. */
                 DPRINTF("U+%04X", codepoint);
-                sz += 1 + s - pos;
+                sz += (size_t)(1 + s - pos);
                 if (d != NULL) {
                     while (pos <= s)
                         *d++ = *pos++;
@@ -205,7 +205,7 @@ xtf8_decode(void *dst, const void *src, size_t len, int error)
             } else {
                 /* Valid UTF-8 sequence, copy it. */
                 DPRINTF("U+%04X", codepoint);
-                sz += 1 + s - pos;
+                sz += (size_t)(1 + s - pos);
                 if (d != NULL) {
                     while (pos <= s)
                         *d++ = *pos++;

diff --git a/xtf8_main.c b/xtf8_main.c
@@ -238,7 +238,8 @@ json_unescape(void *dst, void *src, size_t len)
             case 'u': /* u00XX */
             {
                 uint32_t codepoint;
-                int i, x, ch;
+                uint8_t x, ch;
+                int i;
 
                 if (s + 5 >= end) {
                     DPRINTF("truncated \\u00XX sequence");