Reduce amount of dirty rss by const'ing some data structures.

Don't fail if we can't create or remove $(pkgcachedir) i.e.
    /var/cache/fontconfig. (reported by Quanah Gibson-Mount).
reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index 6f5e42739c769aae760dfa2e3882006d7e95278d..ff6b2d918b9c9c217009f01047faf23c892c5113 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-04-06  Diego Pettenò  <flameeyes@gentoo.org>
+       reviewed by: plam
+       * src/fcdefault.c:
+       * src/fcpat.c:
+       * src/fcxml.c:
+
+       Reduce amount of dirty rss by const'ing some data structures.
+
+2006-04-06  Patrick Lam  <plam@mit.edu>
+       * fc-cache/Makefile.am:
+
+       Don't fail if we can't create or remove 
+       $(pkgcachedir) i.e. /var/cache/fontconfig.
+       (reported by Quanah Gibson-Mount).
+
 2006-04-06  Kjartan Maraas  <kmaraas@gnome.org>
        reviewed by: plam
        * fc-case/fc-case.c:

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 285f286577c5d68a94b25033ee57400fb67fe2b5..ef6c968ca71fce7c5feeda0d27346510fe2bc166 100644 (file)
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -30,10 +30,10 @@ SGML = ${FC_CACHE_SRC}/fc-cache.sgml
 AM_CPPFLAGS = -DPKGCACHEDIR='"${pkgcachedir}"'
 
 install-data-local:
-       $(mkinstalldirs) "$(DESTDIR)$(pkgcachedir)"
+       -$(mkinstalldirs) "$(DESTDIR)$(pkgcachedir)"
 
 uninstall-local:
-       $(RM) -rf "$(DESTDIR)$(pkgcachedir)"
+       -$(RM) -rf "$(DESTDIR)$(pkgcachedir)"
 
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
 

diff --git a/src/fcdefault.c b/src/fcdefault.c
index c309ef65afebb2fae250af8d1aeaee239e4666fd..4fd3ed8e8a072c0b8319cca83edb9ac31b8dd2f2 100644 (file)
--- a/src/fcdefault.c
+++ b/src/fcdefault.c
@@ -25,7 +25,7 @@
 #include "fcint.h"
 #include <locale.h>
 
-static struct {
+static const struct {
     const char *field;
     FcBool     value;
 } FcBoolDefaults[] = {

diff --git a/src/fcpat.c b/src/fcpat.c
index a2eb64088dd049cff1f3f72b032fc8b0aed46ddb..4162872fcbdd2b314be178157215168ad45af52f 100644 (file)
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -350,7 +350,7 @@ typedef union _FcValueListAlign {
 
 static int         FcValueListFrozenCount[FcTypeLangSet + 1];
 static int         FcValueListFrozenBytes[FcTypeLangSet + 1];
-static char        FcValueListFrozenName[][8] = {
+static const char   FcValueListFrozenName[][8] = {
     "Void", 
     "Integer", 
     "Double", 

diff --git a/src/fcxml.c b/src/fcxml.c
index fac706c5d10a2bd410175c65510e86870737da48..1afa4e70d03f9d78ecea4f125768e18dc25c54aa 100644 (file)
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -339,7 +339,7 @@ typedef enum _FcElement {
     FcElementUnknown
 } FcElement;
 
-static struct {
+static const struct {
     const char  name[16];
     FcElement   element;
 } fcElementMap[] = {