diff Wnn/jserver/jishoop.c @ 1:790205f476c0

applied wnn_dec12.diff

--- a/Wnn/jserver/jishoop.c	Thu Dec 13 04:30:14 2007 +0900
+++ b/Wnn/jserver/jishoop.c	Thu Dec 13 04:47:24 2007 +0900
@@ -304,22 +304,22 @@
   Sreverse (yomi, pyomi);
 
   if ((jtl->bufsize_hontai <= jtl->maxhontai + sizeof (struct uind2) + Strlen (yomi))
-      && (ud_realloc_hontai (jtl) == NULL))
+      && (!ud_realloc_hontai (jtl)))
     {
       return (-1);
     }
   if ((jtl->bufsize_kanji <= jtl->maxkanji + (Strlen (kanji) + Strlen (comment) + Strlen (yomi) + 3) * sizeof (w_char) + 1)
-      && (ud_realloc_kanji (jtl) == NULL))
+      && (!ud_realloc_kanji (jtl)))
     {
       return (-1);
     }
   if (jtl->bufsize_serial <= jtl->maxserial + 4
-     && ud_realloc_serial (jtl) == NULL)
+     && !ud_realloc_serial (jtl))
     {
       return (-1);
     }
   if (jtl->bufsize_table <= jtl->maxtable + sizeof (struct uind1)
-     && ud_realloc_table (jtl) == NULL)
+     && !ud_realloc_table (jtl))
     {
       return (-1);
     }
@@ -333,7 +333,7 @@
       key += 1;
       for (key0 = key - 1; key0 >= 0; key0 = tary[key0].pter1)
         {
-          hop = (struct uind2 *) (jtl->hontai + tary[key0].pter);
+            hop = (struct uind2 *) (jtl->hontai + tary[key0].pter);
           if (Substrud (&tary[key0], yomi, hop->yomi[0], jtl))
             {
               break;
@@ -386,7 +386,7 @@
             }
           if (hopter1->next == 0)
             break;
-          hopter1 = (struct uind2 *) (hopter1->next + (char *) (jtl->hontai));
+               hopter1 = (struct uind2 *) (hopter1->next + (char *) (jtl->hontai));
         }
     }
   hopter->next = tary[key].pter;
@@ -411,7 +411,7 @@
      w_char *kanji, *comment, *yomi;
 {
   register UCHAR *dest = jtl->kanji + jtl->maxkanji;
-  int len;
+  long len;
 
 #if     defined(CONVERT_by_STROKE) || defined(CONVERT_with_SiSheng)
   if ((jtl->syurui & 0xff) != WNN_REV_DICT)
@@ -422,7 +422,7 @@
 #endif /* CONVERT_by_STROKE || CONVERT_with_SiSheng */
       yomi = NULL;
     }
-  len = (int) kanjiaddr (dest, kanji, yomi, comment);
+  len = (long) kanjiaddr (dest, kanji, yomi, comment);
   jtl->maxkanji += len;
 }
 
@@ -523,7 +523,7 @@
   if (p->kosuu == 1)
     {
       *next_pter = p->next;
-      if (tary[ind1].pter == NULL)
+      if (tary[ind1].pter == 0)
         remove_space (tary, ind1, jtl, tary[ind1].pter1);
       if (p->serial == jtl->maxserial - 1)
         {
@@ -556,7 +556,7 @@
       if (jtl->bufsize_hontai <= jtl->maxhontai + sizeof (struct uind2) + Strlen (yomi))
         {
           tmp = (char *) p - (char *) jtl->hontai;
-          if (ud_realloc_hontai (jtl) == NULL)
+          if (ud_realloc_hontai (jtl) == 0)
             {
               return (-1);
             }
@@ -647,7 +647,7 @@
     {
       if (jtl->bufsize_kanji <= jtl->maxkanji + (Strlen (kanji) + Strlen (comment) + Strlen (yomi1) + 4) * 2)
         {
-          if (ud_realloc_kanji (jtl) == NULL)
+          if (ud_realloc_kanji (jtl) == 0)
             {
               return (-1);
             }
@@ -667,7 +667,7 @@
           /* We need to spend one serial_no to ensure that the entry
              before this and after this are not connected */
           if (jtl->bufsize_serial <= jtl->maxserial + 4
-	     && ud_realloc_serial (jtl) == NULL)
+	     && ud_realloc_serial (jtl) == 0)
             {
               return (-1);
             }
@@ -762,7 +762,7 @@
         {
           while (hjtp->bufsize_serial <= jtp->maxserial)
             {
-              if (hindo_file_realloc (hjtp) == NULL)
+              if (hindo_file_realloc (hjtp) == 0)
                 return (-1);
             }
           error1 ("Dic file size is bigger than that of Hindo file!");