Fix warnings.

diff --git a/ChangeLog b/ChangeLog
index 64c37ccff783040f582e2aab9482af75d802a94c..b13ebbb9e93209b7b5f8fdb784716d8d46925b5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06  Patrick Lam  <plam@mit.edu>
+       * fc-cat/fc-cat.c (FcCachePrintSet, FcCacheGlobalFileReadAndPrint):
+
+       Fix warnings.
+
 2005-12-05  Patrick Lam  <plam@mit.edu>
        * src/fcname.c (FcNameGetObjectType):
 

diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index 9fb930bb81883499cf58dca30070ffc329d550c4..1414bc896a65bd590d999e3b60b6b422b3c81845 100644 (file)
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -78,6 +78,9 @@ extern int optind, opterr, optopt;
 #define PUTC(c,f) putc(c,f)
 #endif
 
+FcBool
+FcCachePrintSet (FcFontSet *set, FcStrSet *dirs, char *cache_file);
+
 static FcBool
 FcCacheWriteChars (FILE *f, const FcChar8 *chars)
 {
@@ -169,11 +172,9 @@ FcCacheGlobalFileReadAndPrint (FcFontSet * set, FcStrSet *dirs, char * dir, char
 {
     char               name_buf[8192];
     int fd;
-    FcGlobalCacheDir   *d, *next;
     char * current_arch_machine_name;
     char candidate_arch_machine_name[9+MACHINE_SIGNATURE_SIZE];
     off_t current_arch_start = 0;
-    char subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1];
 
     if (!cache_file)
        goto bail;
@@ -194,8 +195,6 @@ FcCacheGlobalFileReadAndPrint (FcFontSet * set, FcStrSet *dirs, char * dir, char
 
     while (1) 
     {
-       off_t targ;
-
        FcCacheReadString (fd, name_buf, sizeof (name_buf));
        if (!strlen(name_buf))
            break;
@@ -343,8 +342,6 @@ FcCachePrintSet (FcFontSet *set, FcStrSet *dirs, char *cache_file)
 bail3:
     FcStrListDone (list);
 bail2:
-bail1:
-bail0:
     return FcFalse;
 }