From: Kenichi Handa <handa@m17n.org>
Date: Wed, 29 Nov 2006 12:17:27 +0000 (+0000)
Subject: (ftfont_driver): Initialize ftfont_driver.type by 0.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~654
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=09a56ce40943169cb68eae4d593427af48a23cc8;p=emacs.git

(ftfont_driver): Initialize ftfont_driver.type by 0.
(ftfont_font_format): Fix previous change.
---

diff --git a/src/ftfont.c b/src/ftfont.c
index 32e503b33f7..0853b8af67f 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -278,7 +278,7 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int,
 
 struct font_driver ftfont_driver =
   {
-    (Lisp_Object) NULL,		/* Qfreetype */
+    0,				/* Qfreetype */
     ftfont_get_cache,
     ftfont_list,
     ftfont_match,
@@ -966,7 +966,7 @@ ftfont_font_format (FcPattern *pattern)
   if (strcmp ((char *) str, "BDF") == 0)  
     return intern ("bdf");
 #else  /* not FC_FONTFORMAT */
-  if (FcPatternGetString (pattern, FC_FILE, 0, &file) != FcResultMatch)
+  if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch)
     return Qnil;
   if (strcasestr ((char *) str, ".ttf") == 0)
     return intern ("truetype");