Remove some unused variables, and initialize some other ones so gcc doesn't

    warn us.

diff --git a/ChangeLog b/ChangeLog
index d2bcbeef1bb05d650a5fcceb0a9ddc388de21beb..e350f6d483ea1b297d43fbfd630d67c97be12f1d 100644 (file)
--- 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 a9b8947271b5f99f3bf13de0df52402e8a7dd099..407dd2c240cbb28dd6e4580261019b5ea884f648 100644 (file)
--- 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 1fa4dd66bf87b1a2c0a4df0a5bfafc8b650182c9..b0a0894aa9997f53d9315cc4711f68fb6b80fef3 100644 (file)
--- 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)
        {