Change files from ISO-Latin-1 to UTF-8

[fontconfig.git] / src / fclang.c

diff --git a/src/fclang.c b/src/fclang.c
index b0a0894aa9997f53d9315cc4711f68fb6b80fef3..fabf36a15d7c15584e9a0840c2dbf5948c57c5ed 100644 (file)
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -1,7 +1,7 @@
 /*
  * $RCSId: xc/lib/fontconfig/src/fclang.c,v 1.7 2002/08/26 23:34:31 keithp Exp $
  *
- * Copyright © 2002 Keith Packard
+ * Copyright © 2002 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -144,29 +144,33 @@ FcLangCompare (const FcChar8 *s1, const FcChar8 *s2)
 }
 
 /*
- * Return FcTrue when s1 contains s2. 
+ * Return FcTrue when super contains sub. 
  *
- * s1 contains s2 if s1 equals s2 or if s1 is a
- * language with a country and s2 is just a language
+ * super contains sub if super and sub have the same
+ * language and either the same country or one
+ * is missing the country
  */
 
 static FcBool
-FcLangContains (const FcChar8 *s1, const FcChar8 *s2)
+FcLangContains (const FcChar8 *super, const FcChar8 *sub)
 {
     FcChar8        c1, c2;
 
     for (;;)
     {
-       c1 = *s1++;
-       c2 = *s2++;
+       c1 = *super++;
+       c2 = *sub++;
        
        c1 = FcToLower (c1);
        c2 = FcToLower (c2);
        if (c1 != c2)
        {
-           /* see if s1 has a country while s2 is mising one */
+           /* see if super has a country while sub is mising one */
            if (c1 == '-' && c2 == '\0')
                return FcTrue;
+           /* see if sub has a country while super is mising one */
+           if (c1 == '\0' && c2 == '-')
+               return FcTrue;
            return FcFalse;
        }
        else if (!c1)
@@ -262,6 +266,7 @@ FcLangSetIndex (const FcChar8 *lang)
     int            low, high, mid = 0;
     int            cmp = 0;
     FcChar8 firstChar = FcToLower(lang[0]); 
+    FcChar8 secondChar = firstChar ? FcToLower(lang[1]) : '\0';
     
     if (firstChar < 'a')
     {
@@ -290,22 +295,14 @@ FcLangSetIndex (const FcChar8 *lang)
        else
        {   /* fast path for resolving 2-letter languages (by far the most common) after
             * finding the first char (probably already true because of the hash table) */
-           FcChar8 secondChar = FcToLower(lang[1]);
-           if (fcLangCharSets[mid].lang[1] > secondChar) /* check second chars */
+           cmp = fcLangCharSets[mid].lang[1] - secondChar;
+           if (cmp == 0 && 
+               (fcLangCharSets[mid].lang[2] != '\0' || 
+                lang[2] != '\0'))
            {
-               high = mid - 1;
-               continue;
+               cmp = FcStrCmpIgnoreCase(fcLangCharSets[mid].lang+2, 
+                                        lang+2);
            }
-           else if (fcLangCharSets[mid].lang[1] < secondChar)
-           {
-               low = mid + 1;
-               continue;
-           }
-           else if (fcLangCharSets[mid].lang[2] == '\0' && lang[2] == '\0')
-               return mid;
-
-           else /* identical through the first two charcters, but at least one string didn't end there */
-               cmp = FcStrCmpIgnoreCase(fcLangCharSets[mid].lang+2, lang+2);
        }
        if (cmp == 0)
            return mid;