ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/common/usc_impl.c b/icuSources/common/usc_impl.c
index 1807e1bda4826d82ca7db8e2be30549840e924f9..1769269378b26c13487d9e48c91f23c0f03c1e33 100644 (file)
--- a/icuSources/common/usc_impl.c
+++ b/icuSources/common/usc_impl.c
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-*   Copyright (C) 1999-2004, International Business Machines
+*   Copyright (C) 1999-2016, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *


@@ -17,8 +17,6 @@
 #include "usc_impl.h"
 #include "cmemory.h"
 
 #include "usc_impl.h"
 #include "cmemory.h"
 

-#define ARRAY_SIZE(array) (sizeof array  / sizeof array[0])
-

 #define PAREN_STACK_DEPTH 32
 
 #define MOD(sp) ((sp) % PAREN_STACK_DEPTH)
 #define PAREN_STACK_DEPTH 32
 
 #define MOD(sp) ((sp) % PAREN_STACK_DEPTH)


@@ -146,7 +144,7 @@ highBit(int32_t value)
     }
 
     if (value >= 1 << 1) {
     }
 
     if (value >= 1 << 1) {

-        value >>= 1;
+        //value >>= 1;

         bit += 1;
     }
 
         bit += 1;
     }
 


@@ -156,30 +154,30 @@ highBit(int32_t value)
 static int32_t
 getPairIndex(UChar32 ch)
 {
 static int32_t
 getPairIndex(UChar32 ch)
 {

-    int32_t pairedCharCount = ARRAY_SIZE(pairedChars);
+    int32_t pairedCharCount = UPRV_LENGTHOF(pairedChars);

     int32_t pairedCharPower = 1 << highBit(pairedCharCount);
     int32_t pairedCharExtra = pairedCharCount - pairedCharPower;
 
     int32_t probe = pairedCharPower;
     int32_t pairedCharPower = 1 << highBit(pairedCharCount);
     int32_t pairedCharExtra = pairedCharCount - pairedCharPower;
 
     int32_t probe = pairedCharPower;

-    int32_t index = 0;
+    int32_t pairIndex = 0;

 
     if (ch >= pairedChars[pairedCharExtra]) {
 
     if (ch >= pairedChars[pairedCharExtra]) {

-        index = pairedCharExtra;
+        pairIndex = pairedCharExtra;

     }
 
     while (probe > (1 << 0)) {
         probe >>= 1;
 
     }
 
     while (probe > (1 << 0)) {
         probe >>= 1;
 

-        if (ch >= pairedChars[index + probe]) {
-            index += probe;
+        if (ch >= pairedChars[pairIndex + probe]) {
+            pairIndex += probe;

         }
     }
 
         }
     }
 

-    if (pairedChars[index] != ch) {
-        index = -1;
+    if (pairedChars[pairIndex] != ch) {
+        pairIndex = -1;

     }
 
     }
 

-    return index;
+    return pairIndex;

 }
 
 static UBool
 }
 
 static UBool