Update ICU to 54.1 step 1

source/extra/uconv/uconv.cpp

 /*****************************************************************************
 *
-*   Copyright (C) 1999-2013, International Business Machines
+*   Copyright (C) 1999-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************/
 
 /*
  * uconv(1): an iconv(1)-like converter using ICU.
  *
  * Original code by Jonas Utterstr&#x00F6;m <jonas.utterstrom@vittran.norrnod.se>
  * contributed in 1999.
  *
@@ skipping 45 matching lines @@
 #endif
 #endif
 
 #ifdef UCONVMSG_LINK
 /* below from the README */
 #include "unicode/utypes.h"
 #include "unicode/udata.h"
 U_CFUNC char uconvmsg_dat[];
 #endif
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 #define DEFAULT_BUFSZ   4096
 #define UCONVMSG "uconvmsg"
 
 static UResourceBundle *gBundle = 0;    /* Bundle containing messages. */
 
 /*
  * Initialize the message bundle so that message strings can be fetched
  * by u_wmsg().
  *
  */
@@ skipping 571 matching lines @@
 
     if (translit != NULL && *translit) {
         UParseError parse;
         UnicodeString str(translit), pestr;
 
         /* Create from rules or by ID as needed. */
 
         parse.line = -1;
 
         if (uprv_strchr(translit, ':') || uprv_strchr(translit, '>') || uprv_strchr(translit, '<') || uprv_strchr(translit, '>')) {
-            t = Transliterator::createFromRules("Uconv", str, UTRANS_FORWARD, parse, err);
+            t = Transliterator::createFromRules(UNICODE_STRING_SIMPLE("Uconv"), str, UTRANS_FORWARD, parse, err);
         } else {
-            t = Transliterator::createInstance(translit, UTRANS_FORWARD, err);
+            t = Transliterator::createInstance(UnicodeString(translit, -1, US_INV), UTRANS_FORWARD, err);
         }
 
         if (U_FAILURE(err)) {
             str.append((UChar32) 0);
             initMsg(pname);
 
             if (parse.line >= 0) {
                 UChar linebuf[20], offsetbuf[20];
                 uprv_itou(linebuf, 20, parse.line, 10, 0);
                 uprv_itou(offsetbuf, 20, parse.offset, 10, 0);
@@ skipping 264 matching lines @@
                 if (err == U_BUFFER_OVERFLOW_ERROR) {
                     err = U_ZERO_ERROR;
                 } else if (U_FAILURE(err)) {
                     UChar errorUChars[4];
                     const char *errtag;
                     char pos[32];
                     UChar32 c;
                     int8_t i, length, errorLength;
 
                     UErrorCode localError = U_ZERO_ERROR;
-                    errorLength = (int8_t)LENGTHOF(errorUChars);
+                    errorLength = (int8_t)UPRV_LENGTHOF(errorUChars);
                     ucnv_getInvalidUChars(convto, errorUChars, &errorLength, &localError);
                     if (U_FAILURE(localError) || errorLength == 0) {
                         // need at least 1 so that we don't access beyond the length of fromoffsets[]
                         errorLength = 1;
                     }
 
                     int32_t ferroffset;
 
                     if (useOffsets) {
                         // Unicode buffer offset of the start of the error UChars
@@ skipping 428 matching lines @@
 
 
 /*
  * Hey, Emacs, please set the following:
  *
  * Local Variables:
  * indent-tabs-mode: nil
  * End:
  *
  */