X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c61294eca5edf4f245c2d8818bf53d3bdc3d80c1..eb433de218fc35876757c356fcb709d9f9d10d09:/sbr/charstring.c?ds=sidebyside

diff --git a/sbr/charstring.c b/sbr/charstring.c
index 76d9fa2a..d007e7b5 100644
--- a/sbr/charstring.c
+++ b/sbr/charstring.c
@@ -161,13 +161,14 @@ charstring_last_char_len (const charstring_t s) {
     const char *sp = charstring_buffer (s);
     size_t remaining = charstring_bytes (s);
 
-    (void) mbtowc (NULL, NULL, 0); /* reset shift state */
+    if (mbtowc (NULL, NULL, 0)) {} /* reset shift state */
 
     while (*sp  &&  remaining > 0) {
         wchar_t wide_char;
 
-        len = mbtowc (&wide_char, sp,
-                      MB_CUR_MAX < remaining ? MB_CUR_MAX : remaining);
+        len = mbtowc (&wide_char, sp, (size_t) MB_CUR_MAX < remaining
+                                          ? (size_t) MB_CUR_MAX
+                                          : remaining);
         sp += len > 0 ? len : 1;
         remaining -= len > 0 ? len : 1;
     }