Fontconfig - Sep 2006 - fontconfig: Branch ''master'' - 2 commits

fc-arch/fcarch.tmpl.h |    2 ++
 fc-cache/Makefile.am  |    2 +-
 fc-cache/fc-cache.c   |   31 ++++++++-----------------------
 3 files changed, 11 insertions(+), 24 deletions(-)

New commits:
diff-tree b190ad9da46ff2e8a9ede0afcb59a6c59641515b (from
7943a75b7d6750d8a71eb8316bd3bbcb32f1cc47)
Author: Keith Packard <keithp@neko.keithp.com>
Date:   Wed Sep 13 18:55:45 2006 -0700

    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...)

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 4bb767b..26ca40d 100644
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -33,7 +33,7 @@ install-data-local:
 uninstall-local:
 	-$(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
 
diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index de29351..bda8b14 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -113,21 +113,6 @@ usage (char *program)
 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
 scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
FcBool verbose)
 {
     int		    ret = 0;
@@ -275,14 +260,14 @@ cleanCacheDirectory (FcConfig *config, F
 {
     DIR		*d;
     struct dirent *ent;
-    char	*dir_base;
+    FcChar8	*dir_base;
     FcBool	ret = FcTrue;
     FcBool	remove;
     FcCache	*cache;
     struct stat	file_stat;
     struct stat	target_stat;
 
-    dir_base = FcStrPlus (dir, "/");
+    dir_base = FcStrPlus (dir, (FcChar8 *) "/");
     if (!dir_base)
     {
 	fprintf (stderr, "%s: out of memory\n", dir);
@@ -297,10 +282,10 @@ cleanCacheDirectory (FcConfig *config, F
     }
     if (verbose)
 	printf ("%s: cleaning cache directory\n", dir);
-    d = opendir (dir);
+    d = opendir ((char *) dir);
     if (!d)
     {
-	perror (dir);
+	perror ((char *) dir);
 	FcStrFree (dir_base);
 	return FcFalse;
     }
@@ -311,7 +296,7 @@ cleanCacheDirectory (FcConfig *config, F
 
 	if (ent->d_name[0] == ''.'')
 	    continue;
-	file_name = FcStrPlus (dir_base, ent->d_name);
+	file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name);
 	if (!file_name)
 	{
 	    fprintf (stderr, "%s: allocation failure\n", dir);
@@ -328,7 +313,7 @@ cleanCacheDirectory (FcConfig *config, F
 	}
 	target_dir = FcCacheDir (cache);
 	remove = FcFalse;
-	if (stat (target_dir, &target_stat) < 0)
+	if (stat ((char *) target_dir, &target_stat) < 0)
 	{
 	    if (verbose)
 		printf ("%s: %s: missing directory: %s \n",
@@ -344,9 +329,9 @@ cleanCacheDirectory (FcConfig *config, F
 	}
 	if (remove)
 	{
-	    if (unlink (file_name) < 0)
+	    if (unlink ((char *) file_name) < 0)
 	    {
-		perror (file_name);
+		perror ((char *) file_name);
 		ret = FcFalse;
 	    }
 	}
diff-tree 7943a75b7d6750d8a71eb8316bd3bbcb32f1cc47 (from
fb47a1f752417d45ad0eac98526cf9de893fc9ca)
Author: Keith Packard <keithp@neko.keithp.com>
Date:   Wed Sep 13 18:51:11 2006 -0700

    Add signatures for m68k and mipsel (thanks debian buildd)

diff --git a/fc-arch/fcarch.tmpl.h b/fc-arch/fcarch.tmpl.h
index 73bdf07..c7c4567 100644
--- a/fc-arch/fcarch.tmpl.h
+++ b/fc-arch/fcarch.tmpl.h
@@ -33,3 +33,5 @@ x86	    78563412_00000001_00000004_00000
 x86-64	   
78563412_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000030
 ppc	   
12345678_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_00000010_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c
 ppc64	   
12345678_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000030
+m68k	   
12345678_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c
+mipsel	   
78563412_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_00000010_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c