aboutsummaryrefslogtreecommitdiffstats
path: root/src/ftfont.c
diff options
context:
space:
mode:
authorDan Nicolaescu2010-08-08 14:03:45 -0700
committerDan Nicolaescu2010-08-08 14:03:45 -0700
commit675e2c697bc8a0ff827fcb33297f63f4cc7ecad3 (patch)
tree5b0adfdb3d4cce40512b0fad0de9088d21dfb694 /src/ftfont.c
parent25717ca11cae32e191e3dc9318562190d682f425 (diff)
downloademacs-675e2c697bc8a0ff827fcb33297f63f4cc7ecad3.tar.gz
emacs-675e2c697bc8a0ff827fcb33297f63f4cc7ecad3.zip
Use const char* instead of char*.
* src/xterm.c (x_create_toolkit_scroll_bar): * src/xfont.c (xfont_list_pattern): * src/xfns.c (x_default_scroll_bar_color_parameter) (xic_create_fontsetname, x_default_font_parameter) (x_screen_planes): * src/xdisp.c (c_string_pos, number_of_chars, reseat_to_string) (store_mode_line_string, decode_mode_spec, display_string): * src/menu.c (digest_single_submenu): * src/keymap.h (initial_define_key, initial_define_lispy_key): * src/keymap.c (initial_define_key, initial_define_lispy_key): * src/image.c (image_error, image_keyword): * src/gtkutil.h (xg_create_widget, xg_create_scroll_bar): * src/gtkutil.c (xg_create_widget, xg_create_scroll_bar): * src/ftfont.c (struct fc_charset_table, ftfont_spec_pattern) (ftfont_list, ftfont_match): * src/frame.c (frame_parm_table): * src/font.h (font_intern_prop, font_parse_xlfd, font_parse_fcname) (font_unparse_fcname, font_unparse_fcname, font_open_by_name) (font_add_log, font_deferred_log): * src/font.c (font_intern_prop, font_parse_xlfd, font_parse_fcname) (font_unparse_fcname, font_unparse_fcname, font_open_by_name) (font_add_log, font_deferred_log): * src/emacs.c (argmatch): * src/dispextern.h (struct it): * src/coding.c (ENCODE_DESIGNATION): * src/charset.c (define_charset_internal): Use const.
Diffstat (limited to 'src/ftfont.c')
-rw-r--r--src/ftfont.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/ftfont.c b/src/ftfont.c
index 27165e67428..b99e50ca3ff 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -96,11 +96,11 @@ Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object);
96static struct 96static struct
97{ 97{
98 /* registry name */ 98 /* registry name */
99 char *name; 99 const char *name;
100 /* characters to distinguish the charset from the others */ 100 /* characters to distinguish the charset from the others */
101 int uniquifier[6]; 101 int uniquifier[6];
102 /* additional constraint by language */ 102 /* additional constraint by language */
103 char *lang; 103 const char *lang;
104 /* set on demand */ 104 /* set on demand */
105 FcCharSet *fc_charset; 105 FcCharSet *fc_charset;
106} fc_charset_table[] = 106} fc_charset_table[] =
@@ -691,12 +691,8 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec)
691 return spec; 691 return spec;
692} 692}
693 693
694static FcPattern *ftfont_spec_pattern (Lisp_Object, char *,
695 struct OpenTypeSpec **,
696 char **langname);
697
698static FcPattern * 694static FcPattern *
699ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **otspec, char **langname) 695ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **otspec, const char **langname)
700{ 696{
701 Lisp_Object tmp, extra; 697 Lisp_Object tmp, extra;
702 FcPattern *pattern = NULL; 698 FcPattern *pattern = NULL;
@@ -866,7 +862,7 @@ ftfont_list (Lisp_Object frame, Lisp_Object spec)
866 char otlayout[15]; /* For "otlayout:XXXX" */ 862 char otlayout[15]; /* For "otlayout:XXXX" */
867 struct OpenTypeSpec *otspec = NULL; 863 struct OpenTypeSpec *otspec = NULL;
868 int spacing = -1; 864 int spacing = -1;
869 char *langname = NULL; 865 const char *langname = NULL;
870 866
871 if (! fc_initialized) 867 if (! fc_initialized)
872 { 868 {
@@ -1057,7 +1053,7 @@ ftfont_match (Lisp_Object frame, Lisp_Object spec)
1057 FcResult result; 1053 FcResult result;
1058 char otlayout[15]; /* For "otlayout:XXXX" */ 1054 char otlayout[15]; /* For "otlayout:XXXX" */
1059 struct OpenTypeSpec *otspec = NULL; 1055 struct OpenTypeSpec *otspec = NULL;
1060 char *langname = NULL; 1056 const char *langname = NULL;
1061 1057
1062 if (! fc_initialized) 1058 if (! fc_initialized)
1063 { 1059 {
@@ -2630,7 +2626,7 @@ ftfont_filter_properties (Lisp_Object font, Lisp_Object alist)
2630 2626
2631 if (strcmp (ftfont_booleans[i], keystr) == 0) 2627 if (strcmp (ftfont_booleans[i], keystr) == 0)
2632 { 2628 {
2633 char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL; 2629 const char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL;
2634 if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false"; 2630 if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false";
2635 if (str == NULL) str = "true"; 2631 if (str == NULL) str = "true";
2636 2632