ICU-57132.0.1.tar.gz

[apple/icu.git] / icuSources / common / ustrtrns.cpp

diff --git a/icuSources/common/ustrtrns.cpp b/icuSources/common/ustrtrns.cpp
index 5ec22f7a8aa09bec21965e847136093f896bd6bc..00a0bfd5eef3d13335868d47bcb86c1c26a48188 100644 (file)
--- a/icuSources/common/ustrtrns.cpp
+++ b/icuSources/common/ustrtrns.cpp
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
 /*
 ******************************************************************************
 *

-*   Copyright (C) 2001-2014, International Business Machines
+*   Copyright (C) 2001-2016, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************


@@ -291,7 +291,8 @@ utf8_nextCharSafeBodyTerminated(const uint8_t **ps, UChar32 c) {
             illegal=1;
             break;
         }
             illegal=1;
             break;
         }

-    case 2: /*fall through*/
+        U_FALLTHROUGH;
+    case 2:

         trail=(uint8_t)(*s++ - 0x80);
         if(trail>0x3f) {
             /* not a trail byte */
         trail=(uint8_t)(*s++ - 0x80);
         if(trail>0x3f) {
             /* not a trail byte */


@@ -299,7 +300,8 @@ utf8_nextCharSafeBodyTerminated(const uint8_t **ps, UChar32 c) {
             break;
         }
         c=(c<<6)|trail;
             break;
         }
         c=(c<<6)|trail;

-    case 1: /*fall through*/
+        U_FALLTHROUGH;
+    case 1:

         trail=(uint8_t)(*s++ - 0x80);
         if(trail>0x3f) {
             /* not a trail byte */
         trail=(uint8_t)(*s++ - 0x80);
         if(trail>0x3f) {
             /* not a trail byte */


@@ -362,11 +364,13 @@ utf8_nextCharSafeBodyPointer(const uint8_t **ps, const uint8_t *limit, UChar32 c
                 illegal=1;
                 break;
             }
                 illegal=1;
                 break;
             }

-        case 2: /*fall through*/
+            U_FALLTHROUGH;
+        case 2:

             trail=*s++;
             c=(c<<6)|(trail&0x3f);
             illegal|=(trail&0xc0)^0x80;
             trail=*s++;
             c=(c<<6)|(trail&0x3f);
             illegal|=(trail&0xc0)^0x80;

-        case 1: /*fall through*/
+            U_FALLTHROUGH;
+        case 1:

             trail=*s++;
             c=(c<<6)|(trail&0x3f);
             illegal|=(trail&0xc0)^0x80;
             trail=*s++;
             c=(c<<6)|(trail&0x3f);
             illegal|=(trail&0xc0)^0x80;