Reduce non-shared data (#168899, inspired by patches from Tommi Komulainen

2005-03-04  Owen Taylor  <otaylor@redhat.com>

        Reduce non-shared data (#168899, inspired by patches
        from Tommi Komulainen and Ross Burton)

        * pango/pango-color.c pango/pango-color-table.h
        tools/gen-color-table.pl: Redo storage of colors to
        use offsets into a static string rather than embedded
        strings. (Inspired by a patch from Tommi Komulainen,
        #168899)

        * pango/break.c pango/fonts.c pango/pango-color.c
        pango/pango-layout.c pango/pango-markup.c
        pango/pango-script-lang-table.h
        pango/mini-fribidi/fribidi_types.c
        tools/gen-script-for-lang.c: Add const in various places

        * modules/arabic/arabic-fc.c  modules/hebrew/hebrew-fc.c:
        modules/indic/{indic-fc.c,indic-ot-class-tables.c,
        indic-ot.h} modules/syriac/syriac-ot.c (syriac): Further
        addition of const.

1 files changed, 6 insertions, 6 deletions

diff --git a/pango/fonts.c b/pango/fonts.c
index eefe07b9..ebea1783 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -776,18 +776,18 @@ typedef struct
   const char *str;
 } FieldMap;
 
-static FieldMap style_map[] = {
+static const FieldMap style_map[] = {
   { PANGO_STYLE_NORMAL, NULL },
   { PANGO_STYLE_OBLIQUE, "Oblique" },
   { PANGO_STYLE_ITALIC, "Italic" }
 };
 
-static FieldMap variant_map[] = {
+static const FieldMap variant_map[] = {
   { PANGO_VARIANT_NORMAL, NULL },
   { PANGO_VARIANT_SMALL_CAPS, "Small-Caps" }
 };
 
-static FieldMap weight_map[] = {
+static const FieldMap weight_map[] = {
   { PANGO_WEIGHT_ULTRALIGHT, "Ultra-Light" },
   { PANGO_WEIGHT_LIGHT, "Light" },
   { PANGO_WEIGHT_NORMAL, NULL },
@@ -798,7 +798,7 @@ static FieldMap weight_map[] = {
   { PANGO_WEIGHT_HEAVY, "Heavy" }
 };
 
-static FieldMap stretch_map[] = {
+static const FieldMap stretch_map[] = {
   { PANGO_STRETCH_ULTRA_CONDENSED, "Ultra-Condensed" },
   { PANGO_STRETCH_EXTRA_CONDENSED, "Extra-Condensed" },
   { PANGO_STRETCH_CONDENSED,       "Condensed" },
@@ -811,7 +811,7 @@ static FieldMap stretch_map[] = {
 };
 
 static gboolean
-find_field (FieldMap *map, int n_elements, const char *str, int len, int *val)
+find_field (const FieldMap *map, int n_elements, const char *str, int len, int *val)
 {
   int i;
   
@@ -977,7 +977,7 @@ pango_font_description_from_string (const char *str)
 }
 
 static void
-append_field (GString *str, FieldMap *map, int n_elements, int val)
+append_field (GString *str, const FieldMap *map, int n_elements, int val)
 {
   int i;
   for (i=0; i<n_elements; i++)