From e9971c4d3308ae21c4dbbf1773a1520fc378c573 Mon Sep 17 00:00:00 2001 From: handa Date: Tue, 28 Sep 2004 11:20:14 +0000 Subject: [PATCH] Fix previous change. --- src/font-ft.c | 5 ++--- src/m17n-X.c | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/font-ft.c b/src/font-ft.c index 67b331e..590fd76 100644 --- a/src/font-ft.c +++ b/src/font-ft.c @@ -775,7 +775,7 @@ ft_render (MDrawWindow win, int x, int y, } } -static MPlist * +static void ft_list (MFrame *frame, MPlist *plist, MFont *font, MSymbol language) { MPlist *pl, *p; @@ -798,7 +798,7 @@ ft_list (MFrame *frame, MPlist *plist, MFont *font, MSymbol language) { pl = mplist_find_by_key (ft_font_list, family); if (! pl) - return NULL; + return; } MPLIST_DO (pl, pl) @@ -817,7 +817,6 @@ ft_list (MFrame *frame, MPlist *plist, MFont *font, MSymbol language) if (family != Mnil) break; } - return plist; } diff --git a/src/m17n-X.c b/src/m17n-X.c index c815a23..1b05558 100644 --- a/src/m17n-X.c +++ b/src/m17n-X.c @@ -423,8 +423,8 @@ static void xfont_find_metric (MRealizedFont *, MGlyphString *, int, int); static unsigned xfont_encode_char (MRealizedFont *, unsigned); static void xfont_render (MDrawWindow, int, int, MGlyphString *, MGlyph *, MGlyph *, int, MDrawRegion); -static MPlist *xfont_list (MFrame *frame, MPlist *plist, - MFont *font, MSymbol language); +static void xfont_list (MFrame *frame, MPlist *plist, + MFont *font, MSymbol language); static MFontDriver xfont_driver = @@ -878,7 +878,7 @@ xfont_render (MDrawWindow win, int x, int y, MGlyphString *gstring, } } -static MPlist * +static void xfont_list (MFrame *frame, MPlist *plist, MFont *font, MSymbol language) { MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info; @@ -889,7 +889,6 @@ xfont_list (MFrame *frame, MPlist *plist, MFont *font, MSymbol language) if (! font || mfont__match_p ((MFont *) MPLIST_VAL (p), font, MFONT_REGISTRY)) mplist_push (plist, MPLIST_KEY (p), MPLIST_VAL (p)); - return plist; } -- 1.7.10.4