# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1065910709 0
# Node ID 01eb71b7bb3fda2c1d40c366d7bb6e55d4ce1166
# Parent  25001d51c9f5cab53e5540eb78b06c30d03de325
(w32_load_bdf_font): Clear font_info before filling.
encoding becomes encoding_type.

diff -r 25001d51c9f5 -r 01eb71b7bb3f src/w32bdf.c
--- a/src/w32bdf.c	Sat Oct 11 22:15:08 2003 +0000
+++ b/src/w32bdf.c	Sat Oct 11 22:18:29 2003 +0000
@@ -201,7 +201,7 @@
     else if (search_file_line("CHARSET_ENCODING", start, len,
 			      (char **)&p, (char **)&q) == 1)
       {
-        fontp->encoding = get_quoted_string(p, q);
+	fontp->encoding = get_quoted_string(p, q);
       }
     else if (search_file_line("SLANT", start, len,
 			      (char **)&p, (char **)&q) == 1)
@@ -768,6 +768,7 @@
 
   /* Now fill in the slots of *FONTP.  */
   BLOCK_INPUT;
+  bzero (fontp, sizeof (*fontp));
   fontp->font = font;
   fontp->font_idx = dpyinfo->n_fonts;
   fontp->name = (char *) xmalloc (strlen (fontname) + 1);
@@ -785,7 +786,7 @@
        uses this font.  So, we set informatoin in fontp->encoding[1]
        which is never used by any charset.  If mapping can't be
        decided, set FONT_ENCODING_NOT_DECIDED.  */
-    fontp->encoding[1] = FONT_ENCODING_NOT_DECIDED;
+    fontp->encoding_type = FONT_ENCODING_NOT_DECIDED;
     fontp->baseline_offset = bdf_font->yoffset;
     fontp->relative_compose = bdf_font->relative_compose;
     fontp->default_ascent = bdf_font->default_ascent;