diff options
author | Karl Berry <karl@freefriends.org> | 2016-03-27 17:16:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-03-27 17:16:39 +0000 |
commit | 46133be58cca10fe420003f25e1a301d8bda6192 (patch) | |
tree | 0b0299934291f13c12eba2c11cd1ac33911b1224 /Build/source/libs/icu/icu-src/source/io | |
parent | d96bcc9a2e41bd962e65f3026384837a9bd44734 (diff) |
import icu-57.1 (unmodified, TL patches coming next)
git-svn-id: svn://tug.org/texlive/trunk@40154 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/io')
5 files changed, 17 insertions, 15 deletions
diff --git a/Build/source/libs/icu/icu-src/source/io/io.vcxproj b/Build/source/libs/icu/icu-src/source/io/io.vcxproj index 45f901c81b0..28364dd700e 100644 --- a/Build/source/libs/icu/icu-src/source/io/io.vcxproj +++ b/Build/source/libs/icu/icu-src/source/io/io.vcxproj @@ -107,7 +107,7 @@ <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <OutputFile>..\..\bin\icuio56.dll</OutputFile> + <OutputFile>..\..\bin\icuio57.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <ProgramDatabaseFile>.\..\..\lib\icuio.pdb</ProgramDatabaseFile> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -151,7 +151,7 @@ <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <OutputFile>..\..\bin\icuio56d.dll</OutputFile> + <OutputFile>..\..\bin\icuio57d.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>.\..\..\lib\icuiod.pdb</ProgramDatabaseFile> @@ -192,7 +192,7 @@ <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <OutputFile>..\..\bin64\icuio56.dll</OutputFile> + <OutputFile>..\..\bin64\icuio57.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <ProgramDatabaseFile>.\..\..\lib64\icuio.pdb</ProgramDatabaseFile> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -234,7 +234,7 @@ <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <OutputFile>..\..\bin64\icuio56d.dll</OutputFile> + <OutputFile>..\..\bin64\icuio57d.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>.\..\..\lib64\icuiod.pdb</ProgramDatabaseFile> diff --git a/Build/source/libs/icu/icu-src/source/io/uprntf_p.c b/Build/source/libs/icu/icu-src/source/io/uprntf_p.c index 09ae6bad857..fcb6ff8016e 100644 --- a/Build/source/libs/icu/icu-src/source/io/uprntf_p.c +++ b/Build/source/libs/icu/icu-src/source/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: diff --git a/Build/source/libs/icu/icu-src/source/io/uscanf_p.c b/Build/source/libs/icu/icu-src/source/io/uscanf_p.c index 8219b55688f..716885d4957 100644 --- a/Build/source/libs/icu/icu-src/source/io/uscanf_p.c +++ b/Build/source/libs/icu/icu-src/source/io/uscanf_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. * ******************************************************************************* @@ -350,7 +350,7 @@ u_scanf_skip_leading_positive_sign(UFILE *input, symbolLen = unum_getSymbol(format, UNUM_PLUS_SIGN_SYMBOL, plusSymbol, - sizeof(plusSymbol)/sizeof(*plusSymbol), + UPRV_LENGTHOF(plusSymbol), &localStatus); if (U_SUCCESS(localStatus)) { @@ -1352,7 +1352,7 @@ u_scanf_parse(UFILE *f, case ufmt_count: /* set the spec's width to the # of items converted */ spec.fInfo.fWidth = cpConsumed; - /* fall through to next case */ + U_FALLTHROUGH; case ufmt_char: case ufmt_uchar: case ufmt_int: diff --git a/Build/source/libs/icu/icu-src/source/io/ustdio.c b/Build/source/libs/icu/icu-src/source/io/ustdio.c index 3e6f7176587..6b4d03cf1ed 100644 --- a/Build/source/libs/icu/icu-src/source/io/ustdio.c +++ b/Build/source/libs/icu/icu-src/source/io/ustdio.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. * ****************************************************************************** @@ -296,7 +296,7 @@ u_fputc(UChar32 uc, int32_t idx = 0; UBool isError = FALSE; - U16_APPEND(buf, idx, sizeof(buf)/sizeof(*buf), uc, isError); + U16_APPEND(buf, idx, UPRV_LENGTHOF(buf), uc, isError); if (isError) { return U_EOF; } diff --git a/Build/source/libs/icu/icu-src/source/io/ustream.cpp b/Build/source/libs/icu/icu-src/source/io/ustream.cpp index be02dd05427..25c54eb5553 100644 --- a/Build/source/libs/icu/icu-src/source/io/ustream.cpp +++ b/Build/source/libs/icu/icu-src/source/io/ustream.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (C) 2001-2014, International Business Machines +* Copyright (C) 2001-2016, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * FILE NAME : ustream.cpp @@ -88,7 +88,7 @@ operator>>(STD_ISTREAM& stream, UnicodeString& str) converter = u_getDefaultConverter(&errorCode); if(U_SUCCESS(errorCode)) { UChar *us = uBuffer; - const UChar *uLimit = uBuffer + sizeof(uBuffer)/sizeof(*uBuffer); + const UChar *uLimit = uBuffer + UPRV_LENGTHOF(uBuffer); const char *s, *sLimit; char ch; UChar ch32; |