diff Wnn/jlib/jl.c @ 1:790205f476c0

applied wnn_dec12.diff

--- a/Wnn/jlib/jl.c	Thu Dec 13 04:30:14 2007 +0900
+++ b/Wnn/jlib/jl.c	Thu Dec 13 04:47:24 2007 +0900
@@ -1519,7 +1519,7 @@
           jl_disconnect (env);
           return (-1);
         }
-      if ((int) error_handler == WNN_NO_CREATE || (rw == WNN_DIC_RDONLY))
+      if (error_handler == (void *)WNN_NO_CREATE || (rw == WNN_DIC_RDONLY))
         {
           sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 200, NULL, env->lang), dic_name, msg_get (wnn_msg_cat, 201, NULL, env->lang));
           /*
@@ -1533,7 +1533,7 @@
       /*
          "辞書ファイル \"%s\" が無いよ。作る?(Y/N)",
        */
-      if ((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
+      if (error_handler == (void *)WNN_CREATE || call_error_handler (error_handler, tmp))
         {
           if (create_file (env, dic_name, JISHO, -1,    /* -1 is dummy */
                            pwd_dic, (hindo_name && *hindo_name) ? "" : pwd_hindo, error_handler, message_handler) == -1)
@@ -1558,7 +1558,7 @@
               jl_disconnect (env);
               return (-1);
             }
-          if ((int) error_handler == WNN_NO_CREATE || (hrw == WNN_DIC_RDONLY))
+          if (error_handler == (void *)WNN_NO_CREATE || (hrw == WNN_DIC_RDONLY))
             {
               sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 203, NULL, env->lang), hindo_name, msg_get (wnn_msg_cat, 201, NULL, env->lang));
               /*
@@ -1572,7 +1572,7 @@
           /*
              "頻度ファイル \"%s\" が無いよ。作る?(Y/N)",
            */
-          if ((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
+          if (error_handler == (void *)WNN_CREATE || call_error_handler (error_handler, tmp))
             {
               if (create_file (env, hindo_name, HINDO, fid, "", pwd_hindo, error_handler, message_handler) == -1)
                 return (-1);
@@ -1601,7 +1601,7 @@
         }
       else if (wnn_errorno == WNN_HINDO_NO_MATCH)
         {
-          if ((int) error_handler == WNN_NO_CREATE)
+            if (error_handler == (void *)WNN_NO_CREATE)
             {
               return (-1);
             }
@@ -1609,7 +1609,7 @@
           /*
              "辞書と頻度 \"%s\" の整合性が無いよ。作り直す?(Y/N)",
            */
-          if (!((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp)))
+          if (!(error_handler == (void *)WNN_CREATE || call_error_handler (error_handler, tmp)))
             {
               return (-1);
             }
@@ -2755,11 +2755,11 @@
   int level = 0;
   int x;
   wnn_errorno = 0;
-  if ((int) error_handler == WNN_CREATE)
+  if (error_handler == (void *)WNN_CREATE)
     {
       confirm_state = CREATE_WITHOUT_CONFIRM;
     }
-  else if ((int) error_handler == WNN_NO_CREATE)
+  else if (error_handler == (void *)WNN_NO_CREATE)
     {
       confirm_state = NO_CREATE;
     }
@@ -3076,7 +3076,7 @@
 
   total = 0;
   flag = 0;
-  while (*st != NULL)
+  while (*st != '\0')
     {
       if (isdigit (*st))
         {
@@ -3287,7 +3287,7 @@
           return (0);           /* dir already exists */
         }
     }
-  if ((int) error_handler != WNN_CREATE)
+  if (error_handler != (void *)WNN_CREATE)
     {
       sprintf (gomi, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 210, NULL, env->lang), dirname, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang));
       /*