diff Wnn/jserver/renbn_kai.c @ 3:ed4bb01eb317

- suppress warnings. - partially fixed comparison between pointer and 0.

--- a/Wnn/jserver/renbn_kai.c	Thu Dec 13 17:42:01 2007 +0900
+++ b/Wnn/jserver/renbn_kai.c	Thu Dec 13 19:53:14 2007 +0900
@@ -67,8 +67,8 @@
     buncnt = 0;                 /* 決定した大文節数 */
   struct BZD *rbzdptr;          /* 決定の対象となるノード top pointer */
   struct BZD *brbzdptr,        /* work pointer */
-   *dicide_bp = 0,              /* 決定した大文節の top pointer */
-   *dicide_np,                  /* 決定した大文節への pointer */
+   *dicide_bp = NULL,              /* 決定した大文節の top pointer */
+   *dicide_np = NULL,                  /* 決定した大文節への pointer */
    *wkbzdptr,                   /* work pointer         */
    *maxbzd;                     /* 決定の対象となっている大文節の */
   /* 最大の評価値を持つノードへの pointer */
@@ -76,7 +76,7 @@
   extern int _status;
 
   dicidyno = yomi_sno - 1;
-  rbzdptr = 0;
+  rbzdptr = NULL;
   rtmknode = 1;
 
   _status = 0;
@@ -91,7 +91,7 @@
     return (-1);
   while (dicidyno + 1 < yomi_eno)
     {
-      if (rbzdptr == 0)
+      if (rbzdptr == NULL)
         {
           if (dbn_kai (dicidyno + 1, yomi_eno, beginvect,
 #ifndef NO_FZK
@@ -103,16 +103,16 @@
               init_work_areas ();
               return (-1);      /* ERROR */
             }
-          if (rbzdptr == 0)
+          if (rbzdptr == NULL)
             {
               if (set_kata_giji_bzd (dicidyno + 1, yomi_eno, endvect, endvect1, &rbzdptr, buncnt) < 0)
                 return (-1);
               buncnt++;
               rtmknode = 0;
-              if (dicide_bp == 0)
+              if (dicide_bp == NULL)
                 dicide_bp = rbzdptr;
-              else
-                dicide_np->lnk_son = rbzdptr;
+              else if (dicide_np != NULL)
+                  dicide_np->lnk_son = rbzdptr;
               break;
             }
         }
@@ -180,12 +180,12 @@
     }
 
   cnt_bzd (dicide_bp, &dbn_cnt, &sbn_cnt);
-  if ((*dsd_dbn = get_dsd_dbn (dbn_cnt)) <= (struct DSD_DBN *) 0)
+  if ((*dsd_dbn = get_dsd_dbn (dbn_cnt)) == NULL)
     {
       init_work_areas ();
       return (-1);
     }
-  if ((dsd_sbn = get_dsd_sbn (sbn_cnt)) <= (struct DSD_SBN *) 0)
+  if ((dsd_sbn = get_dsd_sbn (sbn_cnt)) == NULL)
     {
       init_work_areas ();
       return (-1);
@@ -247,7 +247,7 @@
       wkbzdptr = brbzdptr->lnk_br;
       if (brbzdptr->j_c == yomi_eno - 1)
         {                       /* 文節長さ */
-          if (maxbzd == 0)
+          if (maxbzd == NULL)
             {
               maxbzd = brbzdptr;
             }
@@ -267,18 +267,18 @@
         }
     }
 
-  if (maxbzd == 0)
+  if (maxbzd == NULL)
     {
       if (set_kata_giji_bzd (yomi_sno, yomi_eno, endvect, endvect1, &maxbzd, 0) < 0)
         return (-1);
     }
   cnt_bzd (maxbzd, &dbn_cnt, &sbn_cnt);
-  if ((*dsd_dbn = get_dsd_dbn (dbn_cnt)) <= (struct DSD_DBN *) 0)
+  if ((*dsd_dbn = get_dsd_dbn (dbn_cnt)) == NULL)
     {
       init_work_areas ();
       return (-1);
     }
-  if ((dsd_sbn = get_dsd_sbn (sbn_cnt)) <= (struct DSD_SBN *) 0)
+  if ((dsd_sbn = get_dsd_sbn (sbn_cnt)) == NULL)
     {
       init_work_areas ();
       return (-1);
@@ -333,7 +333,7 @@
       wksbnptr = brsbnptr->lnk_br;
       if (brsbnptr->j_c == yomi_eno - 1)
         {                       /* 文節長さ */
-          if (maxsbn == 0)
+          if (maxsbn == NULL)
             {
               maxsbn = brsbnptr;
               divid = get_status (brsbnptr->kangovect, beginvect,
@@ -373,7 +373,7 @@
         }
     }
 
-  if (maxsbn == 0)
+  if (maxsbn == NULL)
     {
       if (set_kata_giji_sbn (yomi_sno, yomi_eno, endvect, endvect1, &maxsbn) < 0)
         return (-1);
@@ -381,7 +381,7 @@
   if (maxsbn->jentptr == 0 && maxsbn->status == WNN_NOT_CONNECT)
     maxsbn->status = WNN_GIJI;
   sbn_cnt = cnt_syo (maxsbn);
-  if ((*dsd_sbn = get_dsd_sbn (sbn_cnt)) <= (struct DSD_SBN *) 0)
+  if ((*dsd_sbn = get_dsd_sbn (sbn_cnt)) == NULL)
     {
       init_work_areas ();
       return (-1);