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

Eliminate unused vars reported by Intel's compiler. 

reviewed by: plam
This commit is contained in:
Patrick Lam 2006-02-21 15:40:18 +00:00
parent 2b90aee363
commit b023dbd384
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-02-21 Kjartan Maraas <kmaraas@gnome.org>
reviewed by: plam
* fc-list/fc-list.c (main):
* src/fcfreetype.c (FcFreeTypeCharSetAndSpacing):
* src/fcstr.c (FcStrStr):
* src/fcxml.c (FcConfigSaveAttr):
Eliminate unused vars reported by Intel's compiler.
2006-02-21 Aiet Kolkhi <aietkolkhi@gmail.com> 2006-02-21 Aiet Kolkhi <aietkolkhi@gmail.com>
reviewed by: plam reviewed by: plam

4
fc-list/fc-list.c
View File

@ -85,7 +85,7 @@ static void usage (char *program)
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
int verbose = 0; /*int verbose = 0;*/
int i; int i;
FcObjectSet *os = 0; FcObjectSet *os = 0;
FcFontSet *fs; FcFontSet *fs;
@ -105,7 +105,7 @@ main (int argc, char **argv)
FC_MAJOR, FC_MINOR, FC_REVISION); FC_MAJOR, FC_MINOR, FC_REVISION);
exit (0); exit (0);
case 'v': case 'v':
verbose = 1; /* verbose = 1; */
break; break;
default: default:
usage (argv[0]); usage (argv[0]);

3
src/fcfreetype.c
View File

@ -2433,7 +2433,7 @@ FcFreeTypeCheckGlyph (FT_Face face, FcChar32 ucs4,
FcCharSet * FcCharSet *
FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing) FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
{ {
FcChar32 page, off, max, ucs4; FcChar32 page, off, ucs4;
#ifdef CHECK #ifdef CHECK
FcChar32 font_max = 0; FcChar32 font_max = 0;
#endif #endif
@ -2514,7 +2514,6 @@ FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
{ {
FT_UInt gindex; FT_UInt gindex;
max = fcFontDecoders[o].max;
/* /*
* Find the first encoded character in the font * Find the first encoded character in the font
*/ */

3
src/fcstr.c
View File

@ -449,8 +449,7 @@ again:
++ s1; ++ s1;
++ s2; ++ s2;
} }
/* never reached. */
return 0;
} }
int int

2
src/fcxml.c
View File

@ -924,7 +924,6 @@ FcVStackElements (FcConfigParse *parse)
static FcChar8 ** static FcChar8 **
FcConfigSaveAttr (const XML_Char **attr) FcConfigSaveAttr (const XML_Char **attr)
{ {
int n;
int slen; int slen;
int i; int i;
FcChar8 **new; FcChar8 **new;
@ -935,7 +934,6 @@ FcConfigSaveAttr (const XML_Char **attr)
slen = 0; slen = 0;
for (i = 0; attr[i]; i++) for (i = 0; attr[i]; i++)
slen += strlen ((char *) attr[i]) + 1; slen += strlen ((char *) attr[i]) + 1;
n = i;
new = malloc ((i + 1) * sizeof (FcChar8 *) + slen); new = malloc ((i + 1) * sizeof (FcChar8 *) + slen);
if (!new) if (!new)
return 0; return 0;