diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-07-11 08:31:53 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-07-11 08:31:53 +0400 |
| commit | 984e7f300ef0bfec7be97c9bbaff5a6295a43aa2 (patch) | |
| tree | 579e8e59109167073410ec78ea8c0ce5479c901f /src/frame.c | |
| parent | 9d596af370080cba1e67978018d72a836dba008a (diff) | |
| download | emacs-984e7f300ef0bfec7be97c9bbaff5a6295a43aa2.tar.gz | |
Avoid calls to strlen in font processing functions.
* font.c (font_parse_name, font_parse_xlfd, font_parse_fcname)
(font_open_by_name): Changed to use length argument. Adjust
users accordingly.
* font.h (font_open_by_name, font_parse_xlfd): Adjust prototypes.
* xfont.c (xfont_decode_coding_xlfd): Changed to return ptrdiff_t.
(xfont_list_pattern, xfont_match): Use length returned by
xfont_decode_coding_xlfd.
* xfns.c (x_default_font_parameter): Omit useless xstrdup.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c index 8d7981777bf..8f4bdc84a31 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3167,7 +3167,7 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) fontset = fs_query_fontset (arg, 0); if (fontset < 0) { - font_object = font_open_by_name (f, SSDATA (arg)); + font_object = font_open_by_name (f, SSDATA (arg), SBYTES (arg)); if (NILP (font_object)) error ("Font `%s' is not defined", SSDATA (arg)); arg = AREF (font_object, FONT_NAME_INDEX); @@ -3176,7 +3176,7 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { Lisp_Object ascii_font = fontset_ascii (fontset); - font_object = font_open_by_name (f, SSDATA (ascii_font)); + font_object = font_open_by_name (f, SSDATA (ascii_font), SBYTES (ascii_font)); if (NILP (font_object)) error ("Font `%s' is not defined", SDATA (arg)); arg = AREF (font_object, FONT_NAME_INDEX); |