From 3aeb2d4203c7d19b5f208e82874c16f7275e2dd6 Mon Sep 17 00:00:00 2001 From: handa Date: Fri, 14 Jul 2006 06:54:12 +0000 Subject: [PATCH] (xfont_list_family_names): Delete unused var. Fix declarations of foundry and fam local vars. (xft_driver): Make it static. --- src/m17n-X.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/m17n-X.c b/src/m17n-X.c index ae0d2ab..3bb06f4 100644 --- a/src/m17n-X.c +++ b/src/m17n-X.c @@ -1009,7 +1009,7 @@ static void xfont_list_family_names (MFrame *frame, MPlist *plist) { MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info; - char **font_names, **names; + char **font_names; int i, nfonts; MSymbol last_family = Mnil; @@ -1018,10 +1018,10 @@ xfont_list_family_names (MFrame *frame, MPlist *plist) for (i = 0; i < nfonts; i++) { MSymbol family; - char *foundry, *fam; + char foundry[256], fam[256]; MPlist *p; - if (sscanf (font_names[i], "-%s-%s-", &foundry, &fam) < 2) + if (sscanf (font_names[i], "-%s-%s-", foundry, fam) < 2) continue; family = msymbol (fam); if (family == last_family) @@ -1081,7 +1081,7 @@ static void xft_render (MDrawWindow, int, int, MGlyphString *, MGlyph *, MGlyph *, int, MDrawRegion); static int xft_check_capability (MRealizedFont *rfont, MSymbol capability); -MFontDriver xft_driver = +static MFontDriver xft_driver = { NULL, xft_open, xft_find_metric, xft_has_char, xft_encode_char, xft_render, NULL, NULL, xft_check_capability -- 1.7.10.4