ICU-64260.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / ucol.cpp

diff --git a/icuSources/i18n/ucol.cpp b/icuSources/i18n/ucol.cpp
index 8c7c3f92c6ab578487f7f646040baec39136762a..f59333ede3c890276404b2d5c73adf29495dcafc 100644 (file)
--- a/icuSources/i18n/ucol.cpp
+++ b/icuSources/i18n/ucol.cpp
@@ -1,10 +1,12 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 *******************************************************************************
 /*
 *******************************************************************************

-*   Copyright (C) 1996-2014, International Business Machines
+*   Copyright (C) 1996-2015, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  ucol.cpp
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  ucol.cpp

-*   encoding:   US-ASCII
+*   encoding:   UTF-8

 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   tab size:   8 (not used)
 *   indentation:4
 *


@@ -93,6 +95,7 @@ ucol_safeClone(const UCollator *coll, void * /*stackBuffer*/, int32_t * pBufferS
     Collator *newColl = Collator::fromUCollator(coll)->clone();
     if (newColl == NULL) {
         *status = U_MEMORY_ALLOCATION_ERROR;
     Collator *newColl = Collator::fromUCollator(coll)->clone();
     if (newColl == NULL) {
         *status = U_MEMORY_ALLOCATION_ERROR;

+        return nullptr;

     } else {
         *status = U_SAFECLONE_ALLOCATED_WARNING;
     }
     } else {
         *status = U_SAFECLONE_ALLOCATED_WARNING;
     }


@@ -441,8 +444,6 @@ ucol_strcoll( const UCollator    *coll,
               const UChar        *target,
               int32_t            targetLength)
 {
               const UChar        *target,
               int32_t            targetLength)
 {

-    U_ALIGN_CODE(16);
-

     UTRACE_ENTRY(UTRACE_UCOL_STRCOLL);
     if (UTRACE_LEVEL(UTRACE_VERBOSE)) {
         UTRACE_DATA3(UTRACE_VERBOSE, "coll=%p, source=%p, target=%p", coll, source, target);
     UTRACE_ENTRY(UTRACE_UCOL_STRCOLL);
     if (UTRACE_LEVEL(UTRACE_VERBOSE)) {
         UTRACE_DATA3(UTRACE_VERBOSE, "coll=%p, source=%p, target=%p", coll, source, target);


@@ -466,8 +467,6 @@ ucol_strcollUTF8(
         int32_t         targetLength,
         UErrorCode      *status)
 {
         int32_t         targetLength,
         UErrorCode      *status)
 {

-    U_ALIGN_CODE(16);
-

     UTRACE_ENTRY(UTRACE_UCOL_STRCOLLUTF8);
     if (UTRACE_LEVEL(UTRACE_VERBOSE)) {
         UTRACE_DATA3(UTRACE_VERBOSE, "coll=%p, source=%p, target=%p", coll, source, target);
     UTRACE_ENTRY(UTRACE_UCOL_STRCOLLUTF8);
     if (UTRACE_LEVEL(UTRACE_VERBOSE)) {
         UTRACE_DATA3(UTRACE_VERBOSE, "coll=%p, source=%p, target=%p", coll, source, target);