Index: source/common/ucnvbocu.cpp |
diff --git a/source/common/ucnvbocu.cpp b/source/common/ucnvbocu.cpp |
index 6b0552e5f851a153e94a2a1bfc4ec16344b8d2e5..69763ca32136af9e2f6ec6bfc7851977993c2836 100644 |
--- a/source/common/ucnvbocu.cpp |
+++ b/source/common/ucnvbocu.cpp |
@@ -1,7 +1,9 @@ |
+// Copyright (C) 2016 and later: Unicode, Inc. and others. |
+// License & terms of use: http://www.unicode.org/copyright.html |
/* |
****************************************************************************** |
* |
-* Copyright (C) 2002-2015, International Business Machines |
+* Copyright (C) 2002-2016, International Business Machines |
* Corporation and others. All Rights Reserved. |
* |
****************************************************************************** |
@@ -386,7 +388,7 @@ packDiff(int32_t diff) { |
} |
-static void |
+static void U_CALLCONV |
_Bocu1FromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, |
UErrorCode *pErrorCode) { |
UConverter *cnv; |
@@ -549,15 +551,18 @@ getTrail: |
case 4: |
*target++=(uint8_t)(diff>>24); |
*offsets++=sourceIndex; |
- case 3: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 3: |
*target++=(uint8_t)(diff>>16); |
*offsets++=sourceIndex; |
- case 2: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 2: |
*target++=(uint8_t)(diff>>8); |
*offsets++=sourceIndex; |
/* case 1: handled above */ |
*target++=(uint8_t)diff; |
*offsets++=sourceIndex; |
+ U_FALLTHROUGH; |
default: |
/* will never occur */ |
break; |
@@ -580,10 +585,13 @@ getTrail: |
/* each branch falls through to the next one */ |
case 3: |
*charErrorBuffer++=(uint8_t)(diff>>16); |
- case 2: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 2: |
*charErrorBuffer++=(uint8_t)(diff>>8); |
- case 1: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 1: |
*charErrorBuffer=(uint8_t)diff; |
+ U_FALLTHROUGH; |
default: |
/* will never occur */ |
break; |
@@ -597,12 +605,15 @@ getTrail: |
case 3: |
*target++=(uint8_t)(diff>>16); |
*offsets++=sourceIndex; |
- case 2: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 2: |
*target++=(uint8_t)(diff>>8); |
*offsets++=sourceIndex; |
- case 1: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 1: |
*target++=(uint8_t)diff; |
*offsets++=sourceIndex; |
+ U_FALLTHROUGH; |
default: |
/* will never occur */ |
break; |
@@ -638,7 +649,7 @@ getTrail: |
* re-copy the original function and remove the variables |
* offsets, sourceIndex, and nextSourceIndex. |
*/ |
-static void |
+static void U_CALLCONV |
_Bocu1FromUnicode(UConverterFromUnicodeArgs *pArgs, |
UErrorCode *pErrorCode) { |
UConverter *cnv; |
@@ -777,12 +788,14 @@ getTrail: |
/* each branch falls through to the next one */ |
case 4: |
*target++=(uint8_t)(diff>>24); |
- case 3: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 3: |
*target++=(uint8_t)(diff>>16); |
/* case 2: handled above */ |
*target++=(uint8_t)(diff>>8); |
/* case 1: handled above */ |
*target++=(uint8_t)diff; |
+ U_FALLTHROUGH; |
default: |
/* will never occur */ |
break; |
@@ -804,10 +817,13 @@ getTrail: |
/* each branch falls through to the next one */ |
case 3: |
*charErrorBuffer++=(uint8_t)(diff>>16); |
- case 2: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 2: |
*charErrorBuffer++=(uint8_t)(diff>>8); |
- case 1: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 1: |
*charErrorBuffer=(uint8_t)diff; |
+ U_FALLTHROUGH; |
default: |
/* will never occur */ |
break; |
@@ -820,10 +836,13 @@ getTrail: |
/* each branch falls through to the next one */ |
case 3: |
*target++=(uint8_t)(diff>>16); |
- case 2: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 2: |
*target++=(uint8_t)(diff>>8); |
- case 1: /*fall through*/ |
+ U_FALLTHROUGH; |
+ case 1: |
*target++=(uint8_t)diff; |
+ U_FALLTHROUGH; |
default: |
/* will never occur */ |
break; |
@@ -933,7 +952,7 @@ decodeBocu1TrailByte(int32_t count, int32_t b) { |
} |
} |
-static void |
+static void U_CALLCONV |
_Bocu1ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, |
UErrorCode *pErrorCode) { |
UConverter *cnv; |
@@ -1156,7 +1175,7 @@ endloop: |
* re-copy the original function and remove the variables |
* offsets, sourceIndex, and nextSourceIndex. |
*/ |
-static void |
+static void U_CALLCONV |
_Bocu1ToUnicode(UConverterToUnicodeArgs *pArgs, |
UErrorCode *pErrorCode) { |
UConverter *cnv; |