From 982b598278315de60721740047a1b57f4a5895b8 Mon Sep 17 00:00:00 2001 From: Patrick Lam Date: Wed, 7 Dec 2005 03:55:25 +0000 Subject: [PATCH] Fix warnings. --- ChangeLog | 5 +++++ fc-cat/fc-cat.c | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64c37cc..b13ebbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-06 Patrick Lam + * fc-cat/fc-cat.c (FcCachePrintSet, FcCacheGlobalFileReadAndPrint): + + Fix warnings. + 2005-12-05 Patrick Lam * src/fcname.c (FcNameGetObjectType): diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c index 9fb930b..1414bc8 100644 --- 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; } -- 2.39.5