# HG changeset patch # User YAMAMOTO Mitsuharu # Date 1289379774 -32400 # Node ID 1e95f3ea022d3678bd212bbade988e423f57489e # Parent 943d9b433fcafeebcbbc22f3205f5ea575d4376d 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 -r 943d9b433fca -r 1e95f3ea022d src/ChangeLog --- a/src/ChangeLog Wed Nov 10 09:48:18 2010 +0100 +++ b/src/ChangeLog Wed Nov 10 18:02:54 2010 +0900 @@ -1,3 +1,15 @@ +2010-11-10 YAMAMOTO Mitsuharu + + * 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 * dbusbind.c (QCdbus_type_unix_fd): New Lisp object. diff -r 943d9b433fca -r 1e95f3ea022d src/font.c --- a/src/font.c Wed Nov 10 09:48:18 2010 +0100 +++ b/src/font.c Wed Nov 10 18:02:54 2010 +0900 @@ -3732,8 +3732,8 @@ 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 -r 943d9b433fca -r 1e95f3ea022d src/font.h --- a/src/font.h Wed Nov 10 09:48:18 2010 +0100 +++ b/src/font.h Wed Nov 10 18:02:54 2010 +0900 @@ -823,8 +823,8 @@ 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 -r 943d9b433fca -r 1e95f3ea022d src/ftfont.c --- a/src/ftfont.c Wed Nov 10 09:48:18 2010 +0100 +++ b/src/ftfont.c Wed Nov 10 18:02:54 2010 +0900 @@ -2598,7 +2598,7 @@ return intern ("unknown"); } -static const char *ftfont_booleans [] = { +static const char *const ftfont_booleans [] = { ":antialias", ":hinting", ":verticallayout", @@ -2611,7 +2611,7 @@ NULL, }; -static const char *ftfont_non_booleans [] = { +static const char *const ftfont_non_booleans [] = { ":family", ":familylang", ":style", diff -r 943d9b433fca -r 1e95f3ea022d src/w32font.c --- a/src/w32font.c Wed Nov 10 09:48:18 2010 +0100 +++ b/src/w32font.c Wed Nov 10 18:02:54 2010 +0900 @@ -2377,11 +2377,11 @@ 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",