ICU-461.18.tar.gz

[apple/icu.git] / icuSources / common / utrace.c

diff --git a/icuSources/common/utrace.c b/icuSources/common/utrace.c
index eca15036c5ad4e2f3944d0bce1802571c776684c..803dfcff9766e1ecb146a7ea8320d7d6437993c7 100644 (file)
--- a/icuSources/common/utrace.c
+++ b/icuSources/common/utrace.c
@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-*   Copyright (C) 2003-2004, International Business Machines
+*   Copyright (C) 2003-2008, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  utrace.c
@@ -23,7 +23,7 @@ static UTraceData      *pTraceDataFunc  = NULL;
 static const void      *gTraceContext   = NULL;
 
 U_EXPORT int32_t
-utrace_level;
+utrace_level = UTRACE_ERROR;
 
 U_CAPI void U_EXPORT2
 utrace_entry(int32_t fnNumber) {
@@ -230,7 +230,7 @@ utrace_vformat(char *outBuf, int32_t capacity, int32_t indent, const char *fmt,
             /* UChar * string, with length, len==-1 for null terminated. */
             ptrArg = va_arg(args, void *);             /* Ptr    */
             intArg =(int32_t)va_arg(args, int32_t);    /* Length */
-            outputUString((const unsigned short *)ptrArg, intArg, outBuf, &outIx, capacity, indent);
+            outputUString((const UChar *)ptrArg, intArg, outBuf, &outIx, capacity, indent);
             break;
 
         case 'b':
@@ -338,7 +338,7 @@ utrace_vformat(char *outBuf, int32_t capacity, int32_t indent, const char *fmt,
 
                         case 'S':
                             charsToOutput = 0;
-                            outputUString((const unsigned short *)*ptrPtr, -1, outBuf, &outIx, capacity, indent);
+                            outputUString((const UChar *)*ptrPtr, -1, outBuf, &outIx, capacity, indent);
                             outputChar('\n', outBuf, &outIx, capacity, indent);
                             longArg = *ptrPtr==NULL? 0: 1;   /* for test for null term. array. */
                             ptrPtr++;