Update ICU to 54.1 step 1

source/extra/uconv/uwmsg.c

 /*
 **********************************************************************
-* Copyright (C) 1998-2012, International Business Machines Corporation
+* Copyright (C) 1998-2014, International Business Machines Corporation
 * and others.  All Rights Reserved.
 **********************************************************************
 *
 * File uwmsg.c
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   06/14/99    stephen     Creation.
 *******************************************************************************
 */
 
 #include "unicode/ucnv.h"
 #include "unicode/ustring.h"
 #include "unicode/umsg.h"
 #include "unicode/uwmsg.h"
 #include "unicode/ures.h"
 #include "unicode/putil.h"
 #include "cstring.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
-#define LENGTHOF(array) (sizeof(array)/sizeof((array)[0]))
-
 #define BUF_SIZE 128
 
 /* Print a ustring to the specified FILE* in the default codepage */
 static void
 uprint(const UChar *s,
        int32_t sourceLen,
        FILE *f,
        UErrorCode *status)
 {
     /* converter */
@@ skipping 79 matching lines @@
 /* Format a message and print it's output to fp */
 U_CFUNC int u_wmsg(FILE *fp, const char *tag, ... )
 {
     const UChar *msg;
     int32_t      msgLen;
     UErrorCode  err = U_ZERO_ERROR;
 #if !UCONFIG_NO_FORMATTING
     va_list ap;
 #endif
     UChar   result[4096];
-    int32_t resultLength = LENGTHOF(result);
+    int32_t resultLength = UPRV_LENGTHOF(result);
 
     if(gBundle == NULL)
     {
 #if 0
         fprintf(stderr, "u_wmsg: No path set!!\n"); /* FIXME: codepage?? */
 #endif
         return -1;
     }
 
     msg = ures_getStringByKey(gBundle, tag, &msgLen, &err);
 
     if(U_FAILURE(err))
     {
         return -1;
     }
 
 #if UCONFIG_NO_FORMATTING
     resultLength = sizeof(gNoFormatting) / U_SIZEOF_UCHAR;
-    if((msgLen + resultLength) <= LENGTHOF(result)) {
+    if((msgLen + resultLength) <= UPRV_LENGTHOF(result)) {
         memcpy(result, msg, msgLen * U_SIZEOF_UCHAR);
         memcpy(result + msgLen, gNoFormatting, resultLength);
         resultLength += msgLen;
         uprint(result, resultLength, fp, &err);
     } else {
         uprint(msg,msgLen, fp, &err);
     }
 #else
     va_start(ap, tag);
 
@@ skipping 95 matching lines @@
         u_charsToUChars(textMsg, msg, (int32_t)(strlen(textMsg)+1));
     }
 
     if(err>=0)
         gErrMessages[err] = msg;
     else
         gInfoMessages[err-U_ERROR_WARNING_START] = msg;
 
     return msg;
 }