summaryrefslogtreecommitdiff
path: root/src/font.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-08-08 14:03:45 -0700
committerDan Nicolaescu <dann@ics.uci.edu>2010-08-08 14:03:45 -0700
commit675e2c697bc8a0ff827fcb33297f63f4cc7ecad3 (patch)
tree5b0adfdb3d4cce40512b0fad0de9088d21dfb694 /src/font.c
parent25717ca11cae32e191e3dc9318562190d682f425 (diff)
downloademacs-675e2c697bc8a0ff827fcb33297f63f4cc7ecad3.tar.gz
emacs-675e2c697bc8a0ff827fcb33297f63f4cc7ecad3.tar.bz2
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/font.c')
-rw-r--r--src/font.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/font.c b/src/font.c
index 4b59d89b884..f902ff4c588 100644
--- a/src/font.c
+++ b/src/font.c
@@ -232,7 +232,7 @@ static int num_font_drivers;
STR. */
Lisp_Object
-font_intern_prop (char *str, int len, int force_symbol)
+font_intern_prop (const char *str, int len, int force_symbol)
{
int i;
Lisp_Object tem;
@@ -981,7 +981,7 @@ font_expand_wildcards (Lisp_Object *field, int n)
a fully specified XLFD. */
int
-font_parse_xlfd (char *name, Lisp_Object font)
+font_parse_xlfd (const char *name, Lisp_Object font)
{
int len = strlen (name);
int i, j, n;
@@ -1306,7 +1306,7 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
This function tries to guess which format it is. */
int
-font_parse_fcname (char *name, Lisp_Object font)
+font_parse_fcname (const char *name, Lisp_Object font)
{
char *p, *q;
char *size_beg = NULL, *size_end = NULL;
@@ -1563,7 +1563,7 @@ font_parse_fcname (char *name, Lisp_Object font)
FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */
int
-font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
+font_unparse_fcname (Lisp_Object font, int pixel_size, const char *name, int nbytes)
{
Lisp_Object family, foundry;
Lisp_Object tail, val;
@@ -1571,7 +1571,7 @@ font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
int i, len = 1;
char *p;
Lisp_Object styles[3];
- char *style_names[3] = { "weight", "slant", "width" };
+ const char *style_names[3] = { "weight", "slant", "width" };
char work[256];
family = AREF (font, FONT_FAMILY_INDEX);
@@ -3506,7 +3506,7 @@ font_open_by_spec (FRAME_PTR f, Lisp_Object spec)
found, return Qnil. */
Lisp_Object
-font_open_by_name (FRAME_PTR f, char *name)
+font_open_by_name (FRAME_PTR f, const char *name)
{
Lisp_Object args[2];
Lisp_Object spec, ret;
@@ -5060,7 +5060,7 @@ static Lisp_Object Vfont_log_deferred;
opening), ARG is the argument for the action, and RESULT is the
result of the action. */
void
-font_add_log (char *action, Lisp_Object arg, Lisp_Object result)
+font_add_log (const char *action, Lisp_Object arg, Lisp_Object result)
{
Lisp_Object tail, val;
int i;
@@ -5146,7 +5146,7 @@ font_add_log (char *action, Lisp_Object arg, Lisp_Object result)
as font_add_log. */
void
-font_deferred_log (char *action, Lisp_Object arg, Lisp_Object result)
+font_deferred_log (const char *action, Lisp_Object arg, Lisp_Object result)
{
if (EQ (Vfont_log, Qt))
return;