diff options
| author | Dan Nicolaescu | 2010-08-09 15:03:38 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-08-09 15:03:38 -0700 |
| commit | 09d93395c3ceeb0bd23d9fd9c7ef316dc03af08b (patch) | |
| tree | 78a65ed0a4c1623ad9ee308d5727d8ad1f229c32 | |
| parent | 1cbf3dd9101a5574347253648148e30bd8979cf9 (diff) | |
| download | emacs-09d93395c3ceeb0bd23d9fd9c7ef316dc03af08b.tar.gz emacs-09d93395c3ceeb0bd23d9fd9c7ef316dc03af08b.zip | |
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.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/font.c | 12 | ||||
| -rw-r--r-- | src/font.h | 8 |
3 files changed, 17 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 09a6bea487d..a3e08cf699d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2010-08-09 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * font.h (font_parse_xlfd, font_parse_fcname, font_unparse_fcname) | ||
| 4 | (font_parse_name): font_open_by_name): | ||
| 5 | * font.c (font_parse_xlfd, font_parse_fcname, font_unparse_fcname) | ||
| 6 | (font_parse_name): font_open_by_name): Remove const. | ||
| 7 | |||
| 1 | 2010-08-09 Andreas Schwab <schwab@linux-m68k.org> | 8 | 2010-08-09 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 9 | ||
| 3 | Use autoconf determined WORDS_BIGENDIAN instead of hardcoded | 10 | Use autoconf determined WORDS_BIGENDIAN instead of hardcoded |
diff --git a/src/font.c b/src/font.c index 1ac994d6375..eba75c11b2f 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -701,7 +701,7 @@ font_put_extra (Lisp_Object font, Lisp_Object prop, Lisp_Object val) | |||
| 701 | 701 | ||
| 702 | static int parse_matrix (const char *); | 702 | static int parse_matrix (const char *); |
| 703 | static int font_expand_wildcards (Lisp_Object *, int); | 703 | static int font_expand_wildcards (Lisp_Object *, int); |
| 704 | static int font_parse_name (const char *, Lisp_Object); | 704 | static int font_parse_name (char *, Lisp_Object); |
| 705 | 705 | ||
| 706 | /* An enumerator for each field of an XLFD font name. */ | 706 | /* An enumerator for each field of an XLFD font name. */ |
| 707 | enum xlfd_field_index | 707 | enum xlfd_field_index |
| @@ -981,7 +981,7 @@ font_expand_wildcards (Lisp_Object *field, int n) | |||
| 981 | a fully specified XLFD. */ | 981 | a fully specified XLFD. */ |
| 982 | 982 | ||
| 983 | int | 983 | int |
| 984 | font_parse_xlfd (const char *name, Lisp_Object font) | 984 | font_parse_xlfd (char *name, Lisp_Object font) |
| 985 | { | 985 | { |
| 986 | int len = strlen (name); | 986 | int len = strlen (name); |
| 987 | int i, j, n; | 987 | int i, j, n; |
| @@ -1306,7 +1306,7 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes) | |||
| 1306 | This function tries to guess which format it is. */ | 1306 | This function tries to guess which format it is. */ |
| 1307 | 1307 | ||
| 1308 | int | 1308 | int |
| 1309 | font_parse_fcname (const char *name, Lisp_Object font) | 1309 | font_parse_fcname (char *name, Lisp_Object font) |
| 1310 | { | 1310 | { |
| 1311 | char *p, *q; | 1311 | char *p, *q; |
| 1312 | char *size_beg = NULL, *size_end = NULL; | 1312 | char *size_beg = NULL, *size_end = NULL; |
| @@ -1563,7 +1563,7 @@ font_parse_fcname (const char *name, Lisp_Object font) | |||
| 1563 | FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */ | 1563 | FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */ |
| 1564 | 1564 | ||
| 1565 | int | 1565 | int |
| 1566 | font_unparse_fcname (Lisp_Object font, int pixel_size, const char *name, int nbytes) | 1566 | font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes) |
| 1567 | { | 1567 | { |
| 1568 | Lisp_Object family, foundry; | 1568 | Lisp_Object family, foundry; |
| 1569 | Lisp_Object tail, val; | 1569 | Lisp_Object tail, val; |
| @@ -1765,7 +1765,7 @@ font_unparse_gtkname (Lisp_Object font, struct frame *f, char *name, int nbytes) | |||
| 1765 | 0. Otherwise return -1. */ | 1765 | 0. Otherwise return -1. */ |
| 1766 | 1766 | ||
| 1767 | static int | 1767 | static int |
| 1768 | font_parse_name (const char *name, Lisp_Object font) | 1768 | font_parse_name (char *name, Lisp_Object font) |
| 1769 | { | 1769 | { |
| 1770 | if (name[0] == '-' || strchr (name, '*') || strchr (name, '?')) | 1770 | if (name[0] == '-' || strchr (name, '*') || strchr (name, '?')) |
| 1771 | return font_parse_xlfd (name, font); | 1771 | return font_parse_xlfd (name, font); |
| @@ -3506,7 +3506,7 @@ font_open_by_spec (FRAME_PTR f, Lisp_Object spec) | |||
| 3506 | found, return Qnil. */ | 3506 | found, return Qnil. */ |
| 3507 | 3507 | ||
| 3508 | Lisp_Object | 3508 | Lisp_Object |
| 3509 | font_open_by_name (FRAME_PTR f, const char *name) | 3509 | font_open_by_name (FRAME_PTR f, char *name) |
| 3510 | { | 3510 | { |
| 3511 | Lisp_Object args[2]; | 3511 | Lisp_Object args[2]; |
| 3512 | Lisp_Object spec, ret; | 3512 | Lisp_Object spec, ret; |
diff --git a/src/font.h b/src/font.h index d37f0c86a23..5f1a442b59e 100644 --- a/src/font.h +++ b/src/font.h | |||
| @@ -783,7 +783,7 @@ extern void font_prepare_for_face (FRAME_PTR f, struct face *face); | |||
| 783 | extern void font_done_for_face (FRAME_PTR f, struct face *face); | 783 | extern void font_done_for_face (FRAME_PTR f, struct face *face); |
| 784 | 784 | ||
| 785 | extern Lisp_Object font_open_by_spec (FRAME_PTR f, Lisp_Object spec); | 785 | extern Lisp_Object font_open_by_spec (FRAME_PTR f, Lisp_Object spec); |
| 786 | extern Lisp_Object font_open_by_name (FRAME_PTR f, const char *name); | 786 | extern Lisp_Object font_open_by_name (FRAME_PTR f, char *name); |
| 787 | extern void font_close_object (FRAME_PTR f, Lisp_Object font_object); | 787 | extern void font_close_object (FRAME_PTR f, Lisp_Object font_object); |
| 788 | 788 | ||
| 789 | extern Lisp_Object font_intern_prop (const char *str, int len, int force_symbol); | 789 | extern Lisp_Object font_intern_prop (const char *str, int len, int force_symbol); |
| @@ -795,12 +795,12 @@ extern void font_parse_family_registry (Lisp_Object family, | |||
| 795 | extern Lisp_Object font_spec_from_family_registry (Lisp_Object family, | 795 | extern Lisp_Object font_spec_from_family_registry (Lisp_Object family, |
| 796 | Lisp_Object registry); | 796 | Lisp_Object registry); |
| 797 | 797 | ||
| 798 | extern int font_parse_xlfd (const char *name, Lisp_Object font); | 798 | extern int font_parse_xlfd (char *name, Lisp_Object font); |
| 799 | extern int font_unparse_xlfd (Lisp_Object font, int pixel_size, | 799 | extern int font_unparse_xlfd (Lisp_Object font, int pixel_size, |
| 800 | char *name, int bytes); | 800 | char *name, int bytes); |
| 801 | extern int font_parse_fcname (const char *name, Lisp_Object font); | 801 | extern int font_parse_fcname (char *name, Lisp_Object font); |
| 802 | extern int font_unparse_fcname (Lisp_Object font, int pixel_size, | 802 | extern int font_unparse_fcname (Lisp_Object font, int pixel_size, |
| 803 | const char *name, int bytes); | 803 | char *name, int bytes); |
| 804 | extern int font_unparse_gtkname (Lisp_Object, struct frame *, char *, int); | 804 | extern int font_unparse_gtkname (Lisp_Object, struct frame *, char *, int); |
| 805 | extern void register_font_driver (struct font_driver *driver, FRAME_PTR f); | 805 | extern void register_font_driver (struct font_driver *driver, FRAME_PTR f); |
| 806 | extern void free_font_driver_list (FRAME_PTR f); | 806 | extern void free_font_driver_list (FRAME_PTR f); |