| Index: source/common/ucnvisci.c
|
| diff --git a/source/common/ucnvisci.c b/source/common/ucnvisci.c
|
| index d34d088f10618485b13e6fcc10ca4b2a1fc54191..b520fc244e30034510671298ef5916e36a30f4c2 100644
|
| --- a/source/common/ucnvisci.c
|
| +++ b/source/common/ucnvisci.c
|
| @@ -1,6 +1,8 @@
|
| +// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
| +// License & terms of use: http://www.unicode.org/copyright.html
|
| /*
|
| **********************************************************************
|
| -* Copyright (C) 2000-2015, International Business Machines
|
| +* Copyright (C) 2000-2016, International Business Machines
|
| * Corporation and others. All Rights Reserved.
|
| **********************************************************************
|
| * file name: ucnvisci.c
|
| @@ -1284,7 +1286,7 @@ static void UConverter_toUnicode_ISCII_OFFSETS_LOGIC(UConverterToUnicodeArgs *ar
|
| /* look at the pre-context and perform special processing */
|
| switch (sourceChar) {
|
| case ISCII_INV:
|
| - case EXT: /*falls through*/
|
| + case EXT:
|
| case ATR:
|
| *contextCharToUnicode = (UChar)sourceChar;
|
|
|
| @@ -1322,7 +1324,6 @@ static void UConverter_toUnicode_ISCII_OFFSETS_LOGIC(UConverterToUnicodeArgs *ar
|
| }
|
| break;
|
| case 0x0A:
|
| - /* fall through */
|
| case 0x0D:
|
| data->resetToDefaultToUnicode = TRUE;
|
| GET_MAPPING(sourceChar,targetUniChar,data)
|
| @@ -1334,7 +1335,7 @@ static void UConverter_toUnicode_ISCII_OFFSETS_LOGIC(UConverterToUnicodeArgs *ar
|
| i=1;
|
| found=FALSE;
|
| for (; i<vowelSignESpecialCases[0][0]; i++) {
|
| - U_ASSERT(i<sizeof(vowelSignESpecialCases)/sizeof(vowelSignESpecialCases[0]));
|
| + U_ASSERT(i<UPRV_LENGTHOF(vowelSignESpecialCases));
|
| if (vowelSignESpecialCases[i][0]==(uint8_t)*contextCharToUnicode) {
|
| targetUniChar=vowelSignESpecialCases[i][1];
|
| found=TRUE;
|
| @@ -1420,6 +1421,7 @@ static void UConverter_toUnicode_ISCII_OFFSETS_LOGIC(UConverterToUnicodeArgs *ar
|
| /* else fall through to default */
|
| }
|
| /* else fall through to default */
|
| + U_FALLTHROUGH;
|
| }
|
| default:GET_MAPPING(sourceChar,targetUniChar,data)
|
| ;
|
|
|