Commit a81f23c0 authored by Patrick Lam's avatar Patrick Lam

Fix hidden variable warning.

parent 799157db
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):
......
......@@ -47,3 +47,4 @@
#201c # double quotes
#201e # double quotes
#2039-203a # angle quotes
20AC # EURO SIGN
......@@ -30,3 +30,4 @@
038c
038e-03a1
03a3-03ce
20AC # EURO SIGN
......@@ -38,3 +38,4 @@
00f6
#2018-2019 # single quotes
#201c-201d # double quotes
20AC # EURO SIGN
......@@ -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
#
......@@ -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)
......
......@@ -49,4 +49,4 @@
#2019 # single quote
#201d # double quote
#203a # angle quote
20AC # EURO SIGN
......@@ -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
......@@ -49,3 +49,4 @@
00f2-00f3
00f9
00fa
20AC # EURO SIGN
......@@ -60,4 +60,5 @@
00fb
00fc
#0132-0133 # IJ and ij ligatures
20AC # EURO SIGN
......@@ -62,3 +62,4 @@
00fc
##203a # angle quote
#
20AC # EURO SIGN
......@@ -92,7 +92,6 @@ FcCacheReadString (int fd, char *dest, int len)
if (size > 0)
{
int slen;
dest[size] = '\0';
slen = strlen (dest);
......
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment