From: handa <handa>
Date: Thu, 13 Jul 2006 07:34:12 +0000 (+0000)
Subject: (fc_build_charset): Return NULL if FcCharSet can't be
X-Git-Tag: REL-1-3-4~128
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ee6c2e0f2444981ab393e0fa87a3cb06c306e165;p=m17n%2Fm17n-lib.git

(fc_build_charset): Return NULL if FcCharSet can't be
created.
(ft_check_script): Delete unused var.
(ft_list_capability): Likewise.
---

diff --git a/src/font-ft.c b/src/font-ft.c
index d3fe45d..4fab878 100644
--- a/src/font-ft.c
+++ b/src/font-ft.c
@@ -510,7 +510,7 @@ fc_build_charset (MPlist *char_list, MText *mt)
   FcCharSet *cs = FcCharSetCreate ();
 
   if (! cs)
-    return;
+    return NULL;
   if (char_list)
     {
       for (; ! MPLIST_TAIL_P (char_list); char_list = MPLIST_NEXT (char_list))
@@ -1109,7 +1109,6 @@ static int
 ft_check_script (MFontFT *ft_info, MSymbol script)
 {
   MPlist *char_list = mscript__char_list (script);
-  int i;
 
 #ifdef HAVE_FONTCONFIG
   if (! char_list || ! ft_info->charset)
@@ -1190,7 +1189,7 @@ static MPlist *
 ft_list_capability (MSymbol capability)
 {
   MFontCapability *cap;
-  MPlist *plist = NULL, *pl, *p;
+  MPlist *plist = NULL, *pl;
 
   if (! ft_capability_list)
     ft_capability_list = mplist ();