ICU-9567 Changes based on Markus's review feedback.

X-SVN-Rev: 32595

diff --git a/icu4c/source/common/unicode/utrace.h b/icu4c/source/common/unicode/utrace.h
index 82b0d85e6c4a2b079b8603d2acc9737fae6421f3..7c89f64ed3951abff88122e5d185d0c9651f9623 100644 (file)
--- a/icu4c/source/common/unicode/utrace.h
+++ b/icu4c/source/common/unicode/utrace.h
@@ -86,8 +86,8 @@ typedef enum UTraceFunctionNumber {
     UTRACE_UCOL_NEXTSORTKEYPART,
     UTRACE_UCOL_STRCOLLITER,
     UTRACE_UCOL_OPEN_FROM_SHORT_STRING,
-    UTRACE_COLLATION_LIMIT,
-    UTRACE_UCOL_STRCOLLUTF8
+    UTRACE_UCOL_STRCOLLUTF8, /** @draft ICU 50 */
+    UTRACE_COLLATION_LIMIT
 } UTraceFunctionNumber;
 
 /**

diff --git a/icu4c/source/i18n/ucol.cpp b/icu4c/source/i18n/ucol.cpp
index 54d5b4879f2539f086760c201c9f66e30a9770cb..ffe756ae2419055403468c736615fcd051fde1a0 100644 (file)
--- a/icu4c/source/i18n/ucol.cpp
+++ b/icu4c/source/i18n/ucol.cpp
@@ -8878,30 +8878,29 @@ ucol_strcollUTF8(
 
     if (U_FAILURE(*status)) {
         /* do nothing */
-        UTRACE_EXIT_VALUE(UCOL_EQUAL);
+        UTRACE_EXIT_VALUE_STATUS(UCOL_EQUAL, *status);
         return UCOL_EQUAL;
     }
 
     if(source == NULL || target == NULL) {
         *status = U_ILLEGAL_ARGUMENT_ERROR;
-        UTRACE_EXIT_VALUE(UCOL_EQUAL);
+        UTRACE_EXIT_VALUE_STATUS(UCOL_EQUAL, *status);
         return UCOL_EQUAL;
     }
 
     /* Quick check if source and target are same strings. */
     /* They should either both be NULL terminated or the explicit length should be set on both. */
     if (source==target && sourceLength==targetLength) {
-        UTRACE_EXIT_VALUE(UCOL_EQUAL);
+        UTRACE_EXIT_VALUE_STATUS(UCOL_EQUAL, *status);
         return UCOL_EQUAL;
     }
 
-    // TODO - provider support
-/*
     if(coll->delegate != NULL) {
-        UErrorCode status = U_ZERO_ERROR;
-        return ((const Collator*)coll->delegate)->compare(source,sourceLength,target,targetLength, status);
+        return ((const Collator*)coll->delegate)->compareUTF8(
+            StringPiece(source, (sourceLength < 0) ? uprv_strlen(source) : sourceLength),
+            StringPiece(target, (targetLength < 0) ? uprv_strlen(target) : targetLength),
+            *status);
     }
-*/
 
     /* Scan the strings.  Find:                                                             */
     /*    The length of any leading portion that is equal                                   */
@@ -8919,7 +8918,7 @@ ucol_strcollUTF8(
             pTarg++;
         }
         if (*pSrc == 0 && *pTarg == 0) {
-            UTRACE_EXIT_VALUE(UCOL_EQUAL);
+            UTRACE_EXIT_VALUE_STATUS(UCOL_EQUAL, *status);
             return UCOL_EQUAL;
         }
         bSrcLimit = (*pSrc == 0);
@@ -8952,7 +8951,7 @@ ucol_strcollUTF8(
         if (bSrcLimit &&    /* At end of src string, however it was specified. */
             bTargLimit)     /* and also at end of dest string                  */
         {
-            UTRACE_EXIT_VALUE(UCOL_EQUAL);
+            UTRACE_EXIT_VALUE_STATUS(UCOL_EQUAL, *status);
             return UCOL_EQUAL;
         }
     }
@@ -9035,8 +9034,8 @@ ucol_strcollUTF8(
         }
     } else {
         // Lead byte of Latin 1 character is 0x00 - 0xC3
-        bSawNonLatin1 = (source && (sourceLength != 0) && (*source > -61 && *source < 0));
-        bSawNonLatin1 |= (target && (targetLength != 0) && (*target > -61 && *target < 0));
+        bSawNonLatin1 = (source && (sourceLength != 0) && ((uint8_t)*source > 0xc3 && *source < 0));
+        bSawNonLatin1 |= (target && (targetLength != 0) && ((uint8_t)*target > 0xc3 && *target < 0));
     }
 
     UCollationResult returnVal;
@@ -9046,7 +9045,7 @@ ucol_strcollUTF8(
     } else {
         returnVal = ucol_strcollUseLatin1UTF8(coll, source, sourceLength, target, targetLength, status);
     }
-    UTRACE_EXIT_VALUE(returnVal);
+    UTRACE_EXIT_VALUE_STATUS(returnVal, *status);
     return returnVal;
 }