ICU-57166.0.1.tar.gz

[apple/icu.git] / icuSources / io / uprntf_p.c

diff --git a/icuSources/io/uprntf_p.c b/icuSources/io/uprntf_p.c
index 09ae6bad85793a0e35b4145eb4866b6e76a1b397..fcb6ff8016e727ef63c25537edffa7b5ed16f5d5 100644 (file)
--- a/icuSources/io/uprntf_p.c
+++ b/icuSources/io/uprntf_p.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1998-2014, International Business Machines
+*   Copyright (C) 1998-2016, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -143,7 +143,7 @@ u_printf_set_sign(UNumberFormat        *format,
             symbolLen = unum_getSymbol(format,
                 UNUM_PLUS_SIGN_SYMBOL,
                 plusSymbol,
-                sizeof(plusSymbol)/sizeof(*plusSymbol),
+                UPRV_LENGTHOF(plusSymbol),
                 status);
             unum_setTextAttribute(format,
                 UNUM_POSITIVE_PREFIX,
@@ -215,7 +215,7 @@ u_printf_string_handler(const u_printf_stream_handler  *handler,
         }
         else {
             s = ufmt_defaultCPToUnicode(arg, argSize, buffer,
-                    sizeof(buffer)/sizeof(UChar));
+                    UPRV_LENGTHOF(buffer));
         }
     }
     else {
@@ -251,7 +251,7 @@ u_printf_char_handler(const u_printf_stream_handler  *handler,
     unsigned char arg = (unsigned char)(args[0].int64Value);
 
     /* convert from default codepage to Unicode */
-    ufmt_defaultCPToUnicode((const char *)&arg, 2, s, sizeof(s)/sizeof(UChar));
+    ufmt_defaultCPToUnicode((const char *)&arg, 2, s, UPRV_LENGTHOF(s));
 
     /* Remember that this may be an MBCS character */
     if (arg != 0) {
@@ -1508,6 +1508,7 @@ u_printf_parse(const u_printf_stream_handler *streamHandler,
                     /* set the spec's width to the # of chars written */
                     info->fWidth = *written;
                     /* fall through to set the pointer */
+                    U_FALLTHROUGH;
                 case ufmt_string:
                 case ufmt_ustring:
                 case ufmt_pointer:
@@ -1535,6 +1536,7 @@ u_printf_parse(const u_printf_stream_handler *streamHandler,
                     /* set the spec's width to the # of chars written */
                     info->fWidth = *written;
                     /* fall through to set the pointer */
+                    U_FALLTHROUGH;
                 case ufmt_string:
                 case ufmt_ustring:
                 case ufmt_pointer: