Commit 7de51af5 authored by Paul Eggert's avatar Paul Eggert

* xfont.c (xfont_match): Avoid need for strlen.

parent 25ed6cc3
2011-06-21 Paul Eggert <eggert@cs.ucla.edu>
* xfont.c (xfont_match): Avoid need for strlen.
* xfns.c: Don't assume strlen fits in int.
(xic_create_fontsetname, x_window): Use ptrdiff_t, not int.
......
......@@ -594,16 +594,14 @@ xfont_match (Lisp_Object frame, Lisp_Object spec)
{
if (XGetFontProperty (xfont, XA_FONT, &value))
{
int len;
char *s;
s = (char *) XGetAtomName (display, (Atom) value);
len = strlen (s);
/* If DXPC (a Differential X Protocol Compressor)
Ver.3.7 is running, XGetAtomName will return null
string. We must avoid such a name. */
if (len > 0)
if (*s)
{
entity = font_make_entity ();
ASET (entity, FONT_TYPE_INDEX, Qx);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment