Patch from Neil H.
authorRobin Dunn <robin@alldunn.com>
Thu, 7 Feb 2002 23:15:28 +0000 (23:15 +0000)
committerRobin Dunn <robin@alldunn.com>
Thu, 7 Feb 2002 23:15:28 +0000 (23:15 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/src/stc/scintilla/src/PropSet.cxx
src/stc/scintilla/src/PropSet.cxx

index 4e875087964e940afbdb55e6305e0d0ac8efa25b..e97a7f7bef439732c831fab3106c291096b7bb70 100644 (file)
@@ -32,49 +32,40 @@ static inline bool IsLetter(char ch) {
 
 
 int CompareCaseInsensitive(const char *a, const char *b) {
-       while (*a && *b) {
-               if (*a != *b) {
-                       if (IsLetter(*a) && IsLetter(*b)) {
-                               char upperA = MakeUpperCase(*a);
-                               char upperB = MakeUpperCase(*b);
-                               if (upperA != upperB)
-                                       return upperA - upperB;
-                       }
-                       else {
-                               return *a - *b;
-                       }
-               }
-               a++;
-               b++;
-       }
-       // Either *a or *b is nul
-       return *a - *b;
+    while (*a && *b) {
+        if (*a != *b) {
+            char upperA = MakeUpperCase(*a);
+            char upperB = MakeUpperCase(*b);
+            if (upperA != upperB)
+                return upperA - upperB;
+        }
+        a++;
+        b++;
+    }
+    // Either *a or *b is nul
+    return *a - *b;
 }
 
 int CompareNCaseInsensitive(const char *a, const char *b, int len) {
-       while (*a && *b && len) {
-               if (*a != *b) {
-                       if (IsLetter(*a) && IsLetter(*b)) {
-                               char upperA = MakeUpperCase(*a);
-                               char upperB = MakeUpperCase(*b);
-                               if (upperA != upperB)
-                                       return upperA - upperB;
-                       }
-                       else {
-                               return *a - *b;
-                       }
-               }
-               a++;
-               b++;
-               len--;
-       }
-       if (len == 0)
-               return 0;
-       else
-               // Either *a or *b is nul
-               return *a - *b;
+    while (*a && *b && len) {
+        if (*a != *b) {
+            char upperA = MakeUpperCase(*a);
+            char upperB = MakeUpperCase(*b);
+            if (upperA != upperB)
+                return upperA - upperB;
+        }
+        a++;
+        b++;
+        len--;
+    }
+    if (len == 0)
+        return 0;
+    else
+        // Either *a or *b is nul
+        return *a - *b;
 }
 
+
 bool EqualCaseInsensitive(const char *a, const char *b) {
        return 0 == CompareCaseInsensitive(a, b);
 }
index 4e875087964e940afbdb55e6305e0d0ac8efa25b..e97a7f7bef439732c831fab3106c291096b7bb70 100644 (file)
@@ -32,49 +32,40 @@ static inline bool IsLetter(char ch) {
 
 
 int CompareCaseInsensitive(const char *a, const char *b) {
-       while (*a && *b) {
-               if (*a != *b) {
-                       if (IsLetter(*a) && IsLetter(*b)) {
-                               char upperA = MakeUpperCase(*a);
-                               char upperB = MakeUpperCase(*b);
-                               if (upperA != upperB)
-                                       return upperA - upperB;
-                       }
-                       else {
-                               return *a - *b;
-                       }
-               }
-               a++;
-               b++;
-       }
-       // Either *a or *b is nul
-       return *a - *b;
+    while (*a && *b) {
+        if (*a != *b) {
+            char upperA = MakeUpperCase(*a);
+            char upperB = MakeUpperCase(*b);
+            if (upperA != upperB)
+                return upperA - upperB;
+        }
+        a++;
+        b++;
+    }
+    // Either *a or *b is nul
+    return *a - *b;
 }
 
 int CompareNCaseInsensitive(const char *a, const char *b, int len) {
-       while (*a && *b && len) {
-               if (*a != *b) {
-                       if (IsLetter(*a) && IsLetter(*b)) {
-                               char upperA = MakeUpperCase(*a);
-                               char upperB = MakeUpperCase(*b);
-                               if (upperA != upperB)
-                                       return upperA - upperB;
-                       }
-                       else {
-                               return *a - *b;
-                       }
-               }
-               a++;
-               b++;
-               len--;
-       }
-       if (len == 0)
-               return 0;
-       else
-               // Either *a or *b is nul
-               return *a - *b;
+    while (*a && *b && len) {
+        if (*a != *b) {
+            char upperA = MakeUpperCase(*a);
+            char upperB = MakeUpperCase(*b);
+            if (upperA != upperB)
+                return upperA - upperB;
+        }
+        a++;
+        b++;
+        len--;
+    }
+    if (len == 0)
+        return 0;
+    else
+        // Either *a or *b is nul
+        return *a - *b;
 }
 
+
 bool EqualCaseInsensitive(const char *a, const char *b) {
        return 0 == CompareCaseInsensitive(a, b);
 }