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

Unified Diff: source/common/locdispnames.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/locbased.cpp ('k') | source/common/locdspnm.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/locdispnames.cpp
diff --git a/source/common/locdispnames.cpp b/source/common/locdispnames.cpp
index 3ea9602d055a1d31482100e2f6c989a9a8278a09..d60920c61245846058a2dfafab1290c21675db26 100644
--- a/source/common/locdispnames.cpp
+++ b/source/common/locdispnames.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) 1997-2013, International Business Machines
+* Copyright (C) 1997-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -638,7 +640,7 @@ uloc_getDisplayName(const char *locale,
break;
case 3:
kenum = uloc_openKeywords(locale, pErrorCode);
- /* fall through */
+ U_FALLTHROUGH;
default: {
const char* kw=uenum_next(kenum, &len, pErrorCode);
if (kw == NULL) {
@@ -852,7 +854,7 @@ uloc_getDisplayKeywordValue( const char* locale,
/* now copy the dispName over if not NULL */
if(dispName != NULL){
if(dispNameLen <= destCapacity){
- uprv_memcpy(dest, dispName, dispNameLen * U_SIZEOF_UCHAR);
+ u_memcpy(dest, dispName, dispNameLen);
return u_terminateUChars(dest, destCapacity, dispNameLen, status);
}else{
*status = U_BUFFER_OVERFLOW_ERROR;
« no previous file with comments | « source/common/locbased.cpp ('k') | source/common/locdspnm.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698