walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add warning flags to fc-cache build. Clean up warnings in fc-cache. 

Looks like the last directory in the project which didn't use $(WARN_CFLAGS)
for some reason. Adding that found the usual collection of char * vs FcChar8
* issues (why, oh why is FcChar8 not just char...)
This commit is contained in:
Keith Packard 2006-09-13 18:55:45 -07:00
parent 7943a75b7d
commit b190ad9da4
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fc-cache/Makefile.am
View File

@ -33,7 +33,7 @@ install-data-local:
uninstall-local: uninstall-local:
-$(RM) -rf "$(DESTDIR)$(fc_cachedir)" -$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(FREETYPE_CFLAGS) INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
bin_PROGRAMS=fc-cache bin_PROGRAMS=fc-cache

31
fc-cache/fc-cache.c
View File

@ -112,21 +112,6 @@ usage (char *program)
static FcStrSet *processed_dirs; static FcStrSet *processed_dirs;
static int
nsubdirs (FcStrSet *set)
{
FcStrList *list;
int n = 0;
list = FcStrListCreate (set);
if (!list)
return 0;
while (FcStrListNext (list))
n++;
FcStrListDone (list);
return n;
}
static int static int
scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose) scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose)
{ {
@ -275,14 +260,14 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
{ {
DIR *d; DIR *d;
struct dirent *ent; struct dirent *ent;
char *dir_base; FcChar8 *dir_base;
FcBool ret = FcTrue; FcBool ret = FcTrue;
FcBool remove; FcBool remove;
FcCache *cache; FcCache *cache;
struct stat file_stat; struct stat file_stat;
struct stat target_stat; struct stat target_stat;
dir_base = FcStrPlus (dir, "/"); dir_base = FcStrPlus (dir, (FcChar8 *) "/");
if (!dir_base) if (!dir_base)
{ {
fprintf (stderr, "%s: out of memory\n", dir); fprintf (stderr, "%s: out of memory\n", dir);
@ -297,10 +282,10 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
} }
if (verbose) if (verbose)
printf ("%s: cleaning cache directory\n", dir); printf ("%s: cleaning cache directory\n", dir);
d = opendir (dir); d = opendir ((char *) dir);
if (!d) if (!d)
{ {
perror (dir); perror ((char *) dir);
FcStrFree (dir_base); FcStrFree (dir_base);
return FcFalse; return FcFalse;
} }
@ -311,7 +296,7 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
if (ent->d_name[0] == '.') if (ent->d_name[0] == '.')
continue; continue;
file_name = FcStrPlus (dir_base, ent->d_name); file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name);
if (!file_name) if (!file_name)
{ {
fprintf (stderr, "%s: allocation failure\n", dir); fprintf (stderr, "%s: allocation failure\n", dir);
@ -328,7 +313,7 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
} }
target_dir = FcCacheDir (cache); target_dir = FcCacheDir (cache);
remove = FcFalse; remove = FcFalse;
if (stat (target_dir, &target_stat) < 0) if (stat ((char *) target_dir, &target_stat) < 0)
{ {
if (verbose) if (verbose)
printf ("%s: %s: missing directory: %s \n", printf ("%s: %s: missing directory: %s \n",
@ -344,9 +329,9 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
} }
if (remove) if (remove)
{ {
if (unlink (file_name) < 0) if (unlink ((char *) file_name) < 0)
{ {
perror (file_name); perror ((char *) file_name);
ret = FcFalse; ret = FcFalse;
} }
} }