Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: source/common/ucnv_ext.cpp

Issue 2440913002: Update ICU to 58.1
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/common/ucnv_ext.h ('k') | source/common/ucnv_imp.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/ucnv_ext.cpp
diff --git a/source/common/ucnv_ext.cpp b/source/common/ucnv_ext.cpp
index 5cd1ab6174737c535431e0bb25dcc4c7b84e4d38..f8605187240159d6c4c87db9abc4e1dfe53f35b4 100644
--- a/source/common/ucnv_ext.cpp
+++ b/source/common/ucnv_ext.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) 2003-2013, International Business Machines
+* Copyright (C) 2003-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -690,10 +692,13 @@ ucnv_extWriteFromU(UConverter *cnv, const int32_t *cx,
switch(length) {
case 3:
*p++=(uint8_t)(value>>16);
- case 2: /*fall through*/
+ U_FALLTHROUGH;
+ case 2:
*p++=(uint8_t)(value>>8);
- case 1: /*fall through*/
+ U_FALLTHROUGH;
+ case 1:
*p++=(uint8_t)value;
+ U_FALLTHROUGH;
default:
break; /* will never occur */
}
@@ -880,7 +885,7 @@ ucnv_extContinueMatchFromU(UConverter *cnv,
} else {
/* the match did not use all of preFromU[] - keep the rest for replay */
int32_t length=cnv->preFromULength-match;
- uprv_memmove(cnv->preFromU, cnv->preFromU+match, length*U_SIZEOF_UCHAR);
+ u_memmove(cnv->preFromU, cnv->preFromU+match, length);
cnv->preFromULength=(int8_t)-length;
}
« no previous file with comments | « source/common/ucnv_ext.h ('k') | source/common/ucnv_imp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698