Add consts to variables so as to move arrays into .rodata.

reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index bd2585e37693788c2afb0974596c9ddaf9c6d1ce..10a3d46ca4ad3f03e01faa7c772c917d2821a3fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-14  Ross Burton <ross@burtonini.com>
+       reviewed by: plam
+
+       * fc-glyphname/fc-glyphname.c:
+       * src/fclang.c:
+
+       Add consts to variables so as to move arrays into .rodata.
+
 2005-10-14  Mike Fabian  <mfabian@suse.de>
         reviewed by: plam
 

diff --git a/fc-glyphname/fc-glyphname.c b/fc-glyphname/fc-glyphname.c
index 05a22ae31174da7c720b55e15b1fffeb4033e5a5..47d86e39d58eab5886af7c9ec102719d292d127e 100644 (file)
--- a/fc-glyphname/fc-glyphname.c
+++ b/fc-glyphname/fc-glyphname.c
@@ -219,7 +219,7 @@ dump (FcGlyphName * const *table, const char *name)
 {
     int        i;
     
-    printf ("static FcGlyphName        *%s[%d] = {\n", name, hash);
+    printf ("static const FcGlyphName  *%s[%d] = {\n", name, hash);
 
     for (i = 0; i < hash; i++)
        if (table[i])
@@ -289,7 +289,7 @@ main (int argc, char **argv)
      */
     
     for (i = 0; i < nraw; i++)
-       printf ("static struct { FcChar32 ucs; FcChar8 name[%d]; }"
+       printf ("static const struct { const FcChar32 ucs; const FcChar8 name[%d]; }"
                " glyph%d = { 0x%lx, \"%s\" };\n",
                (int) strlen ((char *) raw[i]->name) + 1,
                i, (unsigned long) raw[i]->ucs, raw[i]->name);

diff --git a/src/fclang.c b/src/fclang.c
index 711cdc75aa9c6e40fa1480df4d38ce35972a88ff..a10641edf953c89586dc9aa03f87879b1712384a 100644 (file)
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -25,8 +25,8 @@
 #include "fcint.h"
 
 typedef struct {
-    FcChar8    *lang;
-    FcCharSet  charset;
+    const FcChar8      *lang;
+    const FcCharSet    charset;
 } FcLangCharSet;
 
 typedef struct {