Fix warnings.

This commit is contained in:
Patrick Lam 2005-12-07 03:55:25 +00:00
parent c6103dfb22
commit 982b598278
2 changed files with 8 additions and 6 deletions

View File

@ -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):

View File

@ -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;
}