walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix hidden variable warning.

This commit is contained in:
Patrick Lam 2006-02-07 03:53:32 +00:00
parent 799157dbbf
commit a81f23c0ce
13 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2006-02-07 Dirk Mueller <dmueller@suse.com>
reviewed by: plam
* src/fccache.c (FcCacheReadString, FcCacheSkipString): * src/fccache.c (FcCacheReadString, FcCacheSkipString):

1
fc-lang/de.orth
View File

@ -47,3 +47,4 @@
#201c # double quotes #201c # double quotes
#201e # double quotes #201e # double quotes
#2039-203a # angle quotes #2039-203a # angle quotes
20AC # EURO SIGN

1
fc-lang/el.orth
View File

@ -30,3 +30,4 @@
038c 038c
038e-03a1 038e-03a1
03a3-03ce 03a3-03ce
20AC # EURO SIGN

1
fc-lang/en.orth
View File

@ -38,3 +38,4 @@
00f6 00f6
#2018-2019 # single quotes #2018-2019 # single quotes
#201c-201d # double quotes #201c-201d # double quotes
20AC # EURO SIGN

1
fc-lang/es.orth
View File

@ -47,4 +47,5 @@
00F3 # LATIN SMALL LETTER O WITH ACUTE 00F3 # LATIN SMALL LETTER O WITH ACUTE
00FA # LATIN SMALL LETTER U WITH ACUTE 00FA # LATIN SMALL LETTER U WITH ACUTE
00FC # LATIN SMALL LETTER U WITH DIAERESIS 00FC # LATIN SMALL LETTER U WITH DIAERESIS
20AC # EURO SIGN
# #

6
fc-lang/fc-lang.c
View File

@ -37,9 +37,9 @@
* functions are also needed in slightly modified form * functions are also needed in slightly modified form
*/ */
const FcChar16 *langBankNumbers = 0; const FcChar16 langBankNumbers[1]; /* place holders so that externs resolve */
const FcCharLeaf *langBankLeaves = 0; const FcCharLeaf langBankLeaves[1];
const int *langBankLeafIdx = 0; const int langBankLeafIdx[1];
void void
FcMemAlloc (int kind, int size) FcMemAlloc (int kind, int size)

2
fc-lang/fi.orth
View File

@ -49,4 +49,4 @@
#2019 # single quote #2019 # single quote
#201d # double quote #201d # double quote
#203a # angle quote #203a # angle quote
20AC # EURO SIGN

1
fc-lang/fr.orth
View File

@ -56,3 +56,4 @@
00FF # LATIN SMALL LETTER Y WITH DIAERESIS 00FF # LATIN SMALL LETTER Y WITH DIAERESIS
00C6 # LATIN CAPITAL LETTER AE (ash) * 00C6 # LATIN CAPITAL LETTER AE (ash) *
00E6 # LATIN SMALL LETTER AE (ash) * 00E6 # LATIN SMALL LETTER AE (ash) *
20AC # EURO SIGN

1
fc-lang/it.orth
View File

@ -49,3 +49,4 @@
00f2-00f3 00f2-00f3
00f9 00f9
00fa 00fa
20AC # EURO SIGN

1
fc-lang/nl.orth
View File

@ -60,4 +60,5 @@
00fb 00fb
00fc 00fc
#0132-0133 # IJ and ij ligatures #0132-0133 # IJ and ij ligatures
20AC # EURO SIGN

1
fc-lang/pt.orth
View File

@ -62,3 +62,4 @@
00fc 00fc
##203a # angle quote ##203a # angle quote
# #
20AC # EURO SIGN

1
src/fccache.c
View File

@ -92,7 +92,6 @@ FcCacheReadString (int fd, char *dest, int len)
if (size > 0) if (size > 0)
{ {
int slen;
dest[size] = '\0'; dest[size] = '\0';
slen = strlen (dest); slen = strlen (dest);

9
src/fccharset.c
View File

@ -38,9 +38,9 @@ static int charset_leaf_ptr, charset_leaf_count;
static int ** leaf_idx = 0; static int ** leaf_idx = 0;
static int charset_leaf_idx_ptr, charset_leaf_idx_count; static int charset_leaf_idx_ptr, charset_leaf_idx_count;
extern const FcChar16 *langBankNumbers; extern const FcChar16 langBankNumbers[];
extern const FcCharLeaf *langBankLeaves; extern const FcCharLeaf langBankLeaves[];
extern const int *langBankLeafIdx; extern const int langBankLeafIdx[];
static FcBool static FcBool
FcCharSetEnsureBank (int bi); FcCharSetEnsureBank (int bi);
@ -263,7 +263,8 @@ FcCharSetInsertLeaf (FcCharSet *fcs, FcChar32 ucs4, FcCharLeaf *leaf)
} }
else 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; return FcTrue;
} }