diff Wnn/jserver/renbn_kai.c @ 25:466fe6732d8d

- fixed more NULL pointer related errata - suppress warnings

--- a/Wnn/jserver/renbn_kai.c	Fri Mar 05 20:46:36 2010 +0900
+++ b/Wnn/jserver/renbn_kai.c	Sat Mar 06 04:37:31 2010 +0900
@@ -25,8 +25,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-static char rcs_id[] = "$Id: renbn_kai.c,v 1.4 2002/09/01 17:13:11 hiroo Exp $";
-
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -121,7 +119,7 @@
         {
           /* 各文節の評価値の足し算(son_v)は、mknode でやるんだけど kaidbno が 1
              つまり 1文節解析の場合は、そこを通らないからここでやろう */
-          for (brbzdptr = rbzdptr->lnk_br; brbzdptr != 0; brbzdptr = brbzdptr->lnk_br)
+          for (brbzdptr = rbzdptr->lnk_br; brbzdptr != NULL; brbzdptr = brbzdptr->lnk_br)
             brbzdptr->son_v = brbzdptr->v_jc;
         }
       else
@@ -151,7 +149,7 @@
         }
 
       /* 最大の評価を持つノードを見つける */
-      for (brbzdptr = rbzdptr->lnk_br, maxbzd = rbzdptr; brbzdptr != 0; brbzdptr = wkbzdptr)
+      for (brbzdptr = rbzdptr->lnk_br, maxbzd = rbzdptr; brbzdptr != NULL; brbzdptr = wkbzdptr)
         {
           wkbzdptr = brbzdptr->lnk_br;
           if (maxbzd->son_v <= brbzdptr->son_v)
@@ -227,7 +225,7 @@
     }
   ft = (struct FT *) files[c_env->fzk_fid].area;
 
-  rbzdptr = 0;
+  rbzdptr = NULL;
   _status = 0;
   if (chk_yomi_endvect (yomi_sno, yomi_eno, endvect, endvect1) < 0)
     return (-1);
@@ -242,7 +240,7 @@
     }
 
   /* 最大の評価値を持つノードを見つける */
-  for (brbzdptr = rbzdptr, maxbzd = 0; brbzdptr != 0; brbzdptr = wkbzdptr)
+  for (brbzdptr = rbzdptr, maxbzd = NULL; brbzdptr != NULL; brbzdptr = wkbzdptr)
     {
       wkbzdptr = brbzdptr->lnk_br;
       if (brbzdptr->j_c == yomi_eno - 1)
@@ -317,18 +315,18 @@
     }
   ft = (struct FT *) files[c_env->fzk_fid].area;
 
-  rsbnptr = 0;
+  rsbnptr = NULL;
   _status = 0;
   if (chk_yomi_endvect (yomi_sno, yomi_eno, endvect, endvect1) < 0)
     return (-1);
-  if (sbn_kai (yomi_sno, yomi_eno, endvect, endvect1, &rsbnptr, 1, 0) < 0)
+  if (sbn_kai (yomi_sno, yomi_eno, endvect, endvect1, &rsbnptr, 1, NULL) < 0)
     {
       init_work_areas ();
       return (-1);              /* ERROR */
     }
 
   /* 最大の評価値を持つノードを見つける */
-  for (brsbnptr = rsbnptr, maxsbn = 0; brsbnptr != 0; brsbnptr = wksbnptr)
+  for (brsbnptr = rsbnptr, maxsbn = NULL; brsbnptr != NULL; brsbnptr = wksbnptr)
     {
       wksbnptr = brsbnptr->lnk_br;
       if (brsbnptr->j_c == yomi_eno - 1)
@@ -378,7 +376,7 @@
       if (set_kata_giji_sbn (yomi_sno, yomi_eno, endvect, endvect1, &maxsbn) < 0)
         return (-1);
     }
-  if (maxsbn->jentptr == 0 && maxsbn->status == WNN_NOT_CONNECT)
+  if (maxsbn->jentptr == NULL && maxsbn->status == WNN_NOT_CONNECT)
     maxsbn->status = WNN_GIJI;
   sbn_cnt = cnt_syo (maxsbn);
   if ((*dsd_sbn = get_dsd_sbn (sbn_cnt)) == NULL)
@@ -404,7 +402,7 @@
   struct DSD_DBN *dsd_dbn_head;
   struct BZD *s_bzd;   /* Buffer son's bzd     */
   dsd_dbn_head = dsd_dbn;
-  while (bzd != 0)
+  while (bzd != NULL)
     {
       nextp = dsd_dbn++;
       nextp->bun_m = bzd->bend_m;
@@ -424,7 +422,7 @@
     }
   return (dsd_dbn_head);
 #else /* CONVERT_from_TOP */
-  if (bzd == 0)
+  if (bzd == NULL)
     return (dsd_dbn);
   nextp = dcdbn_set (dsd_dbn, dsd_sbn, bzd->lnk_son);
   nextp->bun_m = bzd->bend_m;
@@ -446,7 +444,7 @@
 dcdsbn_set (struct DSD_SBN *dsd_sbn,
 	struct SYO_BNSETSU *sbn)
 {
-  if (sbn == 0)
+  if (sbn == NULL)
     return (dsd_sbn);
 #ifdef  CONVERT_from_TOP
   dsd_sbn = dcdsbn_set (dsd_sbn, sbn->parent);
@@ -474,6 +472,7 @@
 {
   int cnt;
   cnt = 0;
+
   while (sbn)
     {
       cnt++;
@@ -563,14 +562,14 @@
         }
     }
 
-  if ((*sbn = getsbnsp ()) == 0)
+  if ((*sbn = getsbnsp ()) == NULL)
     return (-1);
 
   (*sbn)->j_c = yomi_eno - 1;
   (*sbn)->i_jc = getfzkoh (ichbnpbp, tempi)->offset + yomi_sno;
   (*sbn)->bend_m = yomi_sno;
   (*sbn)->v_jc = 0;
-  (*sbn)->jentptr = 0;
+  (*sbn)->jentptr = NULL;
   (*sbn)->t_jc = WNN_KATAKANA;
   (*sbn)->kangovect = ft->kango_hinsi_area[giji_no];
   (*sbn)->hinsi_fk = giji_no;
@@ -589,7 +588,7 @@
 	struct BZD **bzd,
 	int buncnt)
 {
-  if ((*bzd = getbzdsp ()) == 0)
+  if ((*bzd = getbzdsp ()) == NULL)
     return (-1);
   if (set_kata_giji_sbn (yomi_sno, yomi_eno, endvect, endvect1, &(*bzd)->sbn) < 0)
     return (-1);