summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--fc-list/fc-list.c4
-rw-r--r--src/fcfreetype.c3
-rw-r--r--src/fcstr.c3
-rw-r--r--src/fcxml.c2
5 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e208043..0aed5dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
reviewed by: plam
diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
index 48fbb601..d8a33645 100644
--- a/fc-list/fc-list.c
+++ b/fc-list/fc-list.c
@@ -85,7 +85,7 @@ static void usage (char *program)
int
main (int argc, char **argv)
{
- int verbose = 0;
+ /*int verbose = 0;*/
int i;
FcObjectSet *os = 0;
FcFontSet *fs;
@@ -105,7 +105,7 @@ main (int argc, char **argv)
FC_MAJOR, FC_MINOR, FC_REVISION);
exit (0);
case 'v':
- verbose = 1;
+ /* verbose = 1; */
break;
default:
usage (argv[0]);
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index cc73f5ce..4ce9f961 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -2433,7 +2433,7 @@ FcFreeTypeCheckGlyph (FT_Face face, FcChar32 ucs4,
FcCharSet *
FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
{
- FcChar32 page, off, max, ucs4;
+ FcChar32 page, off, ucs4;
#ifdef CHECK
FcChar32 font_max = 0;
#endif
@@ -2514,7 +2514,6 @@ FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
{
FT_UInt gindex;
- max = fcFontDecoders[o].max;
/*
* Find the first encoded character in the font
*/
diff --git a/src/fcstr.c b/src/fcstr.c
index b60c082b..c177e077 100644
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -449,8 +449,7 @@ again:
++ s1;
++ s2;
}
-
- return 0;
+ /* never reached. */
}
int
diff --git a/src/fcxml.c b/src/fcxml.c
index 817486fe..9aee8989 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -924,7 +924,6 @@ FcVStackElements (FcConfigParse *parse)
static FcChar8 **
FcConfigSaveAttr (const XML_Char **attr)
{
- int n;
int slen;
int i;
FcChar8 **new;
@@ -935,7 +934,6 @@ FcConfigSaveAttr (const XML_Char **attr)
slen = 0;
for (i = 0; attr[i]; i++)
slen += strlen ((char *) attr[i]) + 1;
- n = i;
new = malloc ((i + 1) * sizeof (FcChar8 *) + slen);
if (!new)
return 0;