summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2003-04-17 17:43:04 +0000
committerColin Walters <walters@verbum.org>2003-04-17 17:43:04 +0000
commit12d49d3cf48a145189af5e27d88bdf4858d5c2b6 (patch)
treeaf9383b7c9adb7a919a79b879b0ebe0438af5448
parent996580dce5cd74dfdfe18c9f20e0a27817e5ed1b (diff)
Remove some unused variables, and initialize some other ones so gcc doesn't
warn us.
-rw-r--r--ChangeLog5
-rw-r--r--doc/edit-sgml.c1
-rw-r--r--src/fclang.c6
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d2bcbeef..e350f6d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-17 Colin Walters <walters@debian.org>
+
+ + Remove some unused variables, and initialize some other ones so
+ gcc doesn't warn us.
+
2003-04-16 Keith Packard <keithp@keithp.com>
+ tag version 2.1.94
diff --git a/doc/edit-sgml.c b/doc/edit-sgml.c
index a9b89472..407dd2c2 100644
--- a/doc/edit-sgml.c
+++ b/doc/edit-sgml.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <ctype.h>
typedef enum { False, True } Bool;
diff --git a/src/fclang.c b/src/fclang.c
index 1fa4dd66..b0a0894a 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -259,8 +259,8 @@ bail0:
static int
FcLangSetIndex (const FcChar8 *lang)
{
- int low, high, mid;
- int cmp;
+ int low, high, mid = 0;
+ int cmp = 0;
FcChar8 firstChar = FcToLower(lang[0]);
if (firstChar < 'a')
@@ -582,7 +582,6 @@ static FcBool
FcLangSetContainsLang (const FcLangSet *ls, const FcChar8 *lang)
{
int id;
- FcLangResult r;
int i;
id = FcLangSetIndex (lang);
@@ -613,7 +612,6 @@ FcLangSetContainsLang (const FcLangSet *ls, const FcChar8 *lang)
{
FcStrList *list = FcStrListCreate (ls->extra);
FcChar8 *extra;
- FcLangResult r;
if (list)
{