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

diff --git a/src/ChangeLog b/src/ChangeLog
index b1e30e68a0cbf47577bc05143a3dacdf7c3a4f5d..857b0fa79e2b5a98f62a263de1e74e13fe8b0b8d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 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.
 

diff --git a/src/xfont.c b/src/xfont.c
index 5dd6aae384624d364e36af1f2dc7b7541a4dd5d3..2c3ca911623b0373f1f3c28e63839c727ec2d944 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -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);