freewnn: Wnn/jserver/renbn

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

- fixed more NULL pointer related errata - suppress warnings

author	Yoshiki Yazawa <yaz@honeyplanet.jp>
date	Sat, 06 Mar 2010 04:37:31 +0900
parents	ed4bb01eb317
children

comparison

equal deleted inserted replaced

-:becc60787557
+:466fe6732d8d
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * 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
 /* #include <stdio.h> */	/* for debug only  */
 /* 1 文節決定可能になるまでノードを作る */
 if (kaidbno == 1)
 {
 /* 各文節の評価値の足し算(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
 {
 while ((int) (rbzdptr->kbcnt) < kaidbno && rtmknode > 0)
 }
 }
 }
 /* 最大の評価を持つノードを見つける */
-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)
 {
 clr_node (maxbzd);        /* garbage collection */
 wnn_errorno = WNN_FZK_FILE_NO_LOAD;
 return (-1);
 }
 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);
 if (dbn_kai (yomi_sno, yomi_eno, beginvect,
 #ifndef NO_FZK
 init_work_areas ();
 return (-1);              /* ERROR */
 }
 /* 最大の評価値を持つノードを見つける */
-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)
 {                       /* 文節長さ */
 if (maxbzd == NULL)
 wnn_errorno = WNN_FZK_FILE_NO_LOAD;
 return (-1);
 }
 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)
 {                       /* 文節長さ */
 if (maxsbn == NULL)
 if (maxsbn == NULL)
 {
 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)
 {
 init_work_areas ();
 struct DSD_DBN *nextp;
 #ifdef  CONVERT_from_TOP
 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;
 nextp->bun_jc = bzd->j_c;
 nextp->sbncnt = bzd->sbn_cnt;
 freebzd (bzd);
 bzd = s_bzd;
 }
 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;
 nextp->bun_jc = bzd->j_c;
 nextp->sbncnt = bzd->sbn_cnt;
 static struct DSD_SBN *
 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);
 #endif /* CONVERT_from_TOP */
 dsd_sbn->bun_m = sbn->bend_m;
 static int
 cnt_syo (struct SYO_BNSETSU *sbn)
 {
 int cnt;
 cnt = 0;
 while (sbn)
 {
 cnt++;
 sbn = sbn->parent;
 }
 log_err ("tan_syo(): cannot make tanbunsetu kouho.");
 return (-1);
 }
 }
-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;
 (*sbn)->status = WNN_GIJI;
 (*sbn)->status_bkwd = connect_flg;
 	int endvect,		/* 終端ベクタ */
 	int endvect1,		/* 終端ベクタ */
 	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);
 (*bzd)->j_c = yomi_eno - 1;
 (*bzd)->bend_m = yomi_sno;

Mercurial > freewnn

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