Update ICU to 54.1 step 1

source/common/brkiter.cpp

 /*
 *******************************************************************************
-* Copyright (C) 1997-2013, International Business Machines Corporation and
+* Copyright (C) 1997-2014, International Business Machines Corporation and
 * others. All Rights Reserved.
 *******************************************************************************
 *
-* File TXTBDRY.CPP
+* File brkiter.cpp
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   02/18/97    aliu        Converted from OpenClass.  Added DONE.
 *   01/13/2000  helena      Added UErrorCode parameter to createXXXInstance methods.
 *****************************************************************************************
 */
 
 // *****************************************************************************
@@ skipping 10 matching lines @@
 #include "unicode/ures.h"
 #include "unicode/ustring.h"
 #include "ucln_cmn.h"
 #include "cstring.h"
 #include "umutex.h"
 #include "servloc.h"
 #include "locbased.h"
 #include "uresimp.h"
 #include "uassert.h"
 #include "ubrkimpl.h"
+#include "charstr.h"
 
 // *****************************************************************************
 // class BreakIterator
 // This class implements methods for finding the location of boundaries in text.
 // Instances of BreakIterator maintain a current position and scan over text
 // returning the index of characters where boundaries occur.
 // *****************************************************************************
 
 U_NAMESPACE_BEGIN
 
 // -------------------------------------
 
 BreakIterator*
 BreakIterator::buildInstance(const Locale& loc, const char *type, int32_t kind, UErrorCode &status)
 {
     char fnbuff[256];
     char ext[4]={'\0'};
-    char actualLocale[ULOC_FULLNAME_CAPACITY];
+    CharString actualLocale;
     int32_t size;
     const UChar* brkfname = NULL;
     UResourceBundle brkRulesStack;
     UResourceBundle brkNameStack;
     UResourceBundle *brkRules = &brkRulesStack;
     UResourceBundle *brkName  = &brkNameStack;
     RuleBasedBreakIterator *result = NULL;
 
     if (U_FAILURE(status))
         return NULL;
@@ skipping 20 matching lines @@
         U_ASSERT((size_t)size<sizeof(fnbuff));
         if ((size_t)size>=sizeof(fnbuff)) {
             size=0;
             if (U_SUCCESS(status)) {
                 status = U_BUFFER_OVERFLOW_ERROR;
             }
         }
 
         // Use the string if we found it
         if (U_SUCCESS(status) && brkfname) {
-            uprv_strncpy(actualLocale,
-                ures_getLocaleInternal(brkName, &status),
-                sizeof(actualLocale)/sizeof(actualLocale[0]));
+            actualLocale.append(ures_getLocaleInternal(brkName, &status), -1, status);
 
             UChar* extStart=u_strchr(brkfname, 0x002e);
             int len = 0;
             if(extStart!=NULL){
                 len = (int)(extStart-brkfname);
                 u_UCharsToChars(extStart+1, ext, sizeof(ext)); // nul terminates the buff
                 u_UCharsToChars(brkfname, fnbuff, len);
             }
             fnbuff[len]=0; // nul terminate
         }
     }
 
     ures_close(brkRules);
     ures_close(brkName);
 
     UDataMemory* file = udata_open(U_ICUDATA_BRKITR, ext, fnbuff, &status);
     if (U_FAILURE(status)) {
         ures_close(b);
         return NULL;
     }
 
     // Create a RuleBasedBreakIterator
     result = new RuleBasedBreakIterator(file, status);
 
     // If there is a result, set the valid locale and actual locale, and the kind
     if (U_SUCCESS(status) && result != NULL) {
         U_LOCALE_BASED(locBased, *(BreakIterator*)result);
-        locBased.setLocaleIDs(ures_getLocaleByType(b, ULOC_VALID_LOCALE, &status), actualLocale);
+        locBased.setLocaleIDs(ures_getLocaleByType(b, ULOC_VALID_LOCALE, &status), 
+                              actualLocale.data());
         result->setBreakType(kind);
     }
 
     ures_close(b);
 
     if (U_FAILURE(status) && result != NULL) {  // Sometimes redundant check, but simple
         delete result;
         return NULL;
     }
 
@@ skipping 317 matching lines @@
         return 0;
     }
     if (capacity < 1) {
         status = U_BUFFER_OVERFLOW_ERROR;
         return 1;
     }
     *fillInVec = 0;
     return 1;
 }
 
+BreakIterator::BreakIterator (const Locale& valid, const Locale& actual) {
+  U_LOCALE_BASED(locBased, (*this));
+  locBased.setLocaleIDs(valid, actual);
+}
+
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 
 //eof