(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 32e503b33f70fab19d8a68e7fe83fbf937f93580..0853b8af67f56b04ae93810cae14568557033e87 100644 (file)
--- 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");