Fix hidden variable warning.

diff --git a/ChangeLog b/ChangeLog
index 098f167ddb1bcb784b38cbfd4091d0ca5f60c087..c60206120bf537d8c26f7a806ca142ebe7452cc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
+2006-02-07  Patrick Lam  <plam@mit.edu>
+       * src/fccache.c (FcCacheReadString):
+
+       Fix hidden variable warning.
+
 2006-02-07  Dirk Mueller  <dmueller@suse.com>
+       reviewed by: plam
 
         * src/fccache.c (FcCacheReadString, FcCacheSkipString):
        

diff --git a/fc-lang/de.orth b/fc-lang/de.orth
index 20bac0323302311788ae6523f09bc89ad76ed55e..b9a4dc296469a53ce6c3754c8ad2d68a6374468e 100644 (file)
--- a/fc-lang/de.orth
+++ b/fc-lang/de.orth
@@ -47,3 +47,4 @@
 #201c          # double quotes
 #201e          # double quotes
 #2039-203a     # angle quotes
+20AC            # EURO SIGN

diff --git a/fc-lang/el.orth b/fc-lang/el.orth
index bae0c898e7dd72fb88358e0d9d0ab8070210e627..0e5a732ee739c8dacc528a146b3eab66f1d79b45 100644 (file)
--- a/fc-lang/el.orth
+++ b/fc-lang/el.orth
@@ -30,3 +30,4 @@
 038c
 038e-03a1
 03a3-03ce
+20AC            # EURO SIGN

diff --git a/fc-lang/en.orth b/fc-lang/en.orth
index 94988b30af58af09d5609d1f0bcec374d168f162..7e504fab49ae7ee83837e2de94ded9da371e337d 100644 (file)
--- a/fc-lang/en.orth
+++ b/fc-lang/en.orth
@@ -38,3 +38,4 @@
 00f6
 #2018-2019     # single quotes
 #201c-201d     # double quotes
+20AC            # EURO SIGN

diff --git a/fc-lang/es.orth b/fc-lang/es.orth
index 10798f683f888c6e380575deb6b52ae6f6098e66..77947f3db0e7f1249fc38b5cf022e88d3d79ef47 100644 (file)
--- a/fc-lang/es.orth
+++ b/fc-lang/es.orth
@@ -47,4 +47,5 @@
 00F3           # LATIN SMALL LETTER O WITH ACUTE
 00FA           # LATIN SMALL LETTER U WITH ACUTE
 00FC           # LATIN SMALL LETTER U WITH DIAERESIS
+20AC            # EURO SIGN
 #

diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index 936a00b25e9f5b4e47b59c9ca8a87eb91ef9c22d..97ffa6515e96d7af71b7688c899e4ce07953eec8 100644 (file)
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -37,9 +37,9 @@
  * functions are also needed in slightly modified form
  */
 
-const FcChar16 *langBankNumbers = 0;
-const FcCharLeaf       *langBankLeaves = 0;
-const int *langBankLeafIdx = 0;
+const FcChar16 langBankNumbers[1]; /* place holders so that externs resolve */
+const FcCharLeaf       langBankLeaves[1];
+const int langBankLeafIdx[1];
 
 void
 FcMemAlloc (int kind, int size)

diff --git a/fc-lang/fi.orth b/fc-lang/fi.orth
index 3c53ea4554d3eba31f5e9a093d2cdd903084d322..971bb833e1fc5ef1165146311125b3eb00989e43 100644 (file)
--- a/fc-lang/fi.orth
+++ b/fc-lang/fi.orth
@@ -49,4 +49,4 @@
 #2019          # single quote
 #201d          # double quote
 #203a          # angle quote
-
+20AC            # EURO SIGN

diff --git a/fc-lang/fr.orth b/fc-lang/fr.orth
index 7b8b7d3a1b2bbfee159603422882d01c172a6866..e3cc0522ac87872757494586f6493574891a978d 100644 (file)
--- a/fc-lang/fr.orth
+++ b/fc-lang/fr.orth
@@ -56,3 +56,4 @@
 00FF # LATIN SMALL LETTER Y WITH DIAERESIS
 00C6 # LATIN CAPITAL LETTER AE (ash) *
 00E6 # LATIN SMALL LETTER AE (ash) *
+20AC # EURO SIGN

diff --git a/fc-lang/it.orth b/fc-lang/it.orth
index 3d006472b8a3e3705e64615755a72ea3fdc20c01..04e87038fe776ddf6339d27f2288bf3eaea34c52 100644 (file)
--- a/fc-lang/it.orth
+++ b/fc-lang/it.orth
@@ -49,3 +49,4 @@
 00f2-00f3
 00f9
 00fa
+20AC            # EURO SIGN

diff --git a/fc-lang/nl.orth b/fc-lang/nl.orth
index d6e0088ded41c90ebe0833ed80267f2e21f5a52e..c07dd464a37b9ac66baadb1aa82ff927902e60ac 100644 (file)
--- a/fc-lang/nl.orth
+++ b/fc-lang/nl.orth
@@ -60,4 +60,5 @@
 00fb
 00fc
 #0132-0133     # IJ and ij ligatures
+20AC            # EURO SIGN
 

diff --git a/fc-lang/pt.orth b/fc-lang/pt.orth
index 4b0a72b8312723e4f5be1bf5feaa143694759921..cca7bf080c61413ec360702f9f0eff91229de945 100644 (file)
--- a/fc-lang/pt.orth
+++ b/fc-lang/pt.orth
@@ -62,3 +62,4 @@
 00fc
 ##203a # angle quote
 #
+20AC            # EURO SIGN

diff --git a/src/fccache.c b/src/fccache.c
index dd03322bb64b1c140cde8bce2da6d1f70967861f..aafc485cd6bba2fd59aa8090fa4f954e0a90be63 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -92,7 +92,6 @@ FcCacheReadString (int fd, char *dest, int len)
 
     if (size > 0)
     {
-       int slen;
        dest[size] = '\0';
        slen = strlen (dest);
 

diff --git a/src/fccharset.c b/src/fccharset.c
index 8a66cc2a93f90c25dee532d032da1691aae99b68..85b394743ad2c59b42eb8d3b16cdfc65df80b3f4 100644 (file)
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -38,9 +38,9 @@ static int charset_leaf_ptr, charset_leaf_count;
 static int ** leaf_idx = 0;
 static int charset_leaf_idx_ptr, charset_leaf_idx_count;
 
-extern const FcChar16 *langBankNumbers;
-extern const FcCharLeaf        *langBankLeaves;
-extern const int *langBankLeafIdx;
+extern const FcChar16 langBankNumbers[];
+extern const FcCharLeaf        langBankLeaves[];
+extern const int langBankLeafIdx[];
 
 static FcBool
 FcCharSetEnsureBank (int bi);
@@ -263,7 +263,8 @@ FcCharSetInsertLeaf (FcCharSet *fcs, FcChar32 ucs4, FcCharLeaf *leaf)
        }
        else
        {
-           leaves[fcs->bank][leaf_idx[fcs->bank][fcs->u.stat.leafidx_offset]+pos] = *leaf;
+           int bi = FcCacheBankToIndex(fcs->bank);
+           leaves[bi][leaf_idx[fcs->bank][fcs->u.stat.leafidx_offset]+pos] = *leaf;
        }
        return FcTrue;
     }