new.c: Order two return statements to match comment.

[nmh] / sbr / charstring.c

diff --git a/sbr/charstring.c b/sbr/charstring.c
index b9b94bd9eeae5af93eda9ddabcc4834fc031d317..589b000ec2e5b6df7617985e6afef35c52768f1f 100644 (file)
--- a/sbr/charstring.c
+++ b/sbr/charstring.c
@@ -180,8 +180,8 @@ charstring_last_char_len (const charstring_t s) {
         len = mbtowc (&wide_char, sp, (size_t) MB_CUR_MAX < remaining
                                           ? (size_t) 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;
+        sp += max(len, 1);
+        remaining -= max(len, 1);

     }
 #else  /* ! MULTIBYTE_SUPPORT */
     if (charstring_bytes (s) > 0) { len = 1; }
     }
 #else  /* ! MULTIBYTE_SUPPORT */
     if (charstring_bytes (s) > 0) { len = 1; }