procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove incorrect const use.

Browse source 
* 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.
This commit is contained in:
Dan Nicolaescu 2010-08-09 15:03:38 -07:00
parent 1cbf3dd910
commit 09d93395c3
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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

12
src/font.c
View file

@ -701,7 +701,7 @@ font_put_extra (Lisp_Object font, Lisp_Object prop, Lisp_Object val)
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 @@ font_expand_wildcards (Lisp_Object *field, int n)
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 @@ 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 (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_parse_fcname (const 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, 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 @@ font_unparse_gtkname (Lisp_Object font, struct frame *f, char *name, int nbytes)
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 @@ font_open_by_spec (FRAME_PTR f, Lisp_Object spec)
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;

8
src/font.h
View file

@ -783,7 +783,7 @@ extern void font_prepare_for_face (FRAME_PTR f, struct face *face);
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 void font_parse_family_registry (Lisp_Object family,
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);