From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Wed, 10 Nov 2010 09:02:54 +0000 (+0900)
Subject: Add const to array elements of font filter properties.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~310
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3106121c9979ea4a2beee1485979f6e46e19f2a6;p=emacs.git

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 d3bf1b58643..9804d57a9cf 100644
--- 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 c08c211199c..ae933df75c8 100644
--- 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 b2d7e49fa29..940eb3d001d 100644
--- 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 b0d10791379..d9ae9be0905 100644
--- 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 f489fe2d763..e7c34378e0d 100644
--- 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",