Add const to array elements of font filter properties.

* font.c (font_filter_properties): Add const to array elements of properties args.
* font.h (font_filter_properties): Likewise.
* ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array elements.
* w32font.c (w32font_booleans, w32font_non_booleans): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index d3bf1b58643eab403b8c1c180448d189746b104b..9804d57a9cfadf7b6b71dc72902f7728b3aa922d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * font.c (font_filter_properties): Add const to array elements of
+       properties args.
+
+       * font.h (font_filter_properties): Likewise.
+
+       * ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array
+       elements.
+
+       * w32font.c (w32font_booleans, w32font_non_booleans): Likewise.
+
 2010-11-10  Michael Albinus  <michael.albinus@gmx.de>
 
        * dbusbind.c (QCdbus_type_unix_fd): New Lisp object.

diff --git a/src/font.c b/src/font.c
index c08c211199c2f24d329f38902ed099627a0e625e..ae933df75c8b2b33507304f1333144cbdc425de7 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -3732,8 +3732,8 @@ font_get_frame_data (FRAME_PTR f, struct font_driver *driver)
 void
 font_filter_properties (Lisp_Object font,
                        Lisp_Object alist,
-                       const char *boolean_properties[],
-                       const char *non_boolean_properties[])
+                       const char *const boolean_properties[],
+                       const char *const non_boolean_properties[])
 {
   Lisp_Object it;
   int i;

diff --git a/src/font.h b/src/font.h
index b2d7e49fa29b87e70d6fc3159184bddddcbf64cb..940eb3d001dcfe3825836b3d8e63febfb1bc8621 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -823,8 +823,8 @@ extern void *font_get_frame_data (FRAME_PTR f,
 
 extern void font_filter_properties (Lisp_Object font,
                                    Lisp_Object alist,
-                                   const char *boolean_properties[],
-                                   const char *non_boolean_properties[]);
+                                   const char *const boolean_properties[],
+                                   const char *const non_boolean_properties[]);
 
 #ifdef HAVE_FREETYPE
 extern struct font_driver ftfont_driver;

diff --git a/src/ftfont.c b/src/ftfont.c
index b0d10791379a261476292ea7cc069d76bbf2615d..d9ae9be0905c8e490d973afb21f4e83ac36c3997 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2598,7 +2598,7 @@ ftfont_font_format (FcPattern *pattern, Lisp_Object filename)
   return intern ("unknown");
 }
 
-static const char *ftfont_booleans [] = {
+static const char *const ftfont_booleans [] = {
   ":antialias",
   ":hinting",
   ":verticallayout",
@@ -2611,7 +2611,7 @@ static const char *ftfont_booleans [] = {
   NULL,
 };
 
-static const char *ftfont_non_booleans [] = {
+static const char *const ftfont_non_booleans [] = {
   ":family",
   ":familylang",
   ":style",

diff --git a/src/w32font.c b/src/w32font.c
index f489fe2d763ec3b350e5622422de49d96147a34d..e7c34378e0d71b59bb043687d36427a696aeb264 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2377,11 +2377,11 @@ in the font selection dialog. */)
   return DECODE_SYSTEM (build_string (buf));
 }
 
-static const char *w32font_booleans [] = {
+static const char *const w32font_booleans [] = {
   NULL,
 };
 
-static const char *w32font_non_booleans [] = {
+static const char *const w32font_non_booleans [] = {
   ":script",
   ":antialias",
   ":style",