Mercurial > emacs
changeset 109735:0fe981e141e3
Remove incorrect const use.
* src/font.h (font_parse_xlfd, font_parse_fcname, font_unparse_fcname)
(font_parse_name): font_open_by_name):
* src/font.c (font_parse_xlfd, font_parse_fcname, font_unparse_fcname)
(font_parse_name): font_open_by_name): Remove const.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 09 Aug 2010 15:03:38 -0700 |
| parents | 1d404d3a1bdd |
| children | b817fe3a4e35 997eb61c5b49 1e3bc66493cd |
| files | src/ChangeLog src/font.c src/font.h |
| diffstat | 3 files changed, 17 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Aug 09 13:01:51 2010 -0700 +++ b/src/ChangeLog Mon Aug 09 15:03:38 2010 -0700 @@ -1,3 +1,10 @@ +2010-08-09 Dan Nicolaescu <dann@ics.uci.edu> + + * font.h (font_parse_xlfd, font_parse_fcname, font_unparse_fcname) + (font_parse_name): font_open_by_name): + * font.c (font_parse_xlfd, font_parse_fcname, font_unparse_fcname) + (font_parse_name): font_open_by_name): Remove const. + 2010-08-09 Andreas Schwab <schwab@linux-m68k.org> Use autoconf determined WORDS_BIGENDIAN instead of hardcoded
--- a/src/font.c Mon Aug 09 13:01:51 2010 -0700 +++ b/src/font.c Mon Aug 09 15:03:38 2010 -0700 @@ -701,7 +701,7 @@ static int parse_matrix (const char *); static int font_expand_wildcards (Lisp_Object *, int); -static int font_parse_name (const char *, Lisp_Object); +static int font_parse_name (char *, Lisp_Object); /* An enumerator for each field of an XLFD font name. */ enum xlfd_field_index @@ -981,7 +981,7 @@ a fully specified XLFD. */ int -font_parse_xlfd (const char *name, Lisp_Object font) +font_parse_xlfd (char *name, Lisp_Object font) { int len = strlen (name); int i, j, n; @@ -1306,7 +1306,7 @@ This function tries to guess which format it is. */ int -font_parse_fcname (const char *name, Lisp_Object font) +font_parse_fcname (char *name, Lisp_Object font) { char *p, *q; char *size_beg = NULL, *size_end = NULL; @@ -1563,7 +1563,7 @@ FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */ int -font_unparse_fcname (Lisp_Object font, int pixel_size, const char *name, int nbytes) +font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes) { Lisp_Object family, foundry; Lisp_Object tail, val; @@ -1765,7 +1765,7 @@ 0. Otherwise return -1. */ static int -font_parse_name (const char *name, Lisp_Object font) +font_parse_name (char *name, Lisp_Object font) { if (name[0] == '-' || strchr (name, '*') || strchr (name, '?')) return font_parse_xlfd (name, font); @@ -3506,7 +3506,7 @@ found, return Qnil. */ Lisp_Object -font_open_by_name (FRAME_PTR f, const char *name) +font_open_by_name (FRAME_PTR f, char *name) { Lisp_Object args[2]; Lisp_Object spec, ret;
--- a/src/font.h Mon Aug 09 13:01:51 2010 -0700 +++ b/src/font.h Mon Aug 09 15:03:38 2010 -0700 @@ -783,7 +783,7 @@ extern void font_done_for_face (FRAME_PTR f, struct face *face); extern Lisp_Object font_open_by_spec (FRAME_PTR f, Lisp_Object spec); -extern Lisp_Object font_open_by_name (FRAME_PTR f, const char *name); +extern Lisp_Object font_open_by_name (FRAME_PTR f, char *name); extern void font_close_object (FRAME_PTR f, Lisp_Object font_object); extern Lisp_Object font_intern_prop (const char *str, int len, int force_symbol); @@ -795,12 +795,12 @@ extern Lisp_Object font_spec_from_family_registry (Lisp_Object family, Lisp_Object registry); -extern int font_parse_xlfd (const char *name, Lisp_Object font); +extern int font_parse_xlfd (char *name, Lisp_Object font); extern int font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int bytes); -extern int font_parse_fcname (const char *name, Lisp_Object font); +extern int font_parse_fcname (char *name, Lisp_Object font); extern int font_unparse_fcname (Lisp_Object font, int pixel_size, - const char *name, int bytes); + char *name, int bytes); extern int font_unparse_gtkname (Lisp_Object, struct frame *, char *, int); extern void register_font_driver (struct font_driver *driver, FRAME_PTR f); extern void free_font_driver_list (FRAME_PTR f);