changeset 6:4b72e5129b12

branch merge
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Thu, 13 Dec 2007 23:23:43 +0900
parents 338478efe78d (diff) 422e51e3191e (current diff)
children 6ab41ec6f895
files
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Wnn/jlib/js.c	Thu Dec 13 20:45:52 2007 +0900
+++ b/Wnn/jlib/js.c	Thu Dec 13 23:23:43 2007 +0900
@@ -646,7 +646,7 @@
 getscom (p)
      register char *p;
 {
-  while (*p++ = get1com ())
+    while ((*p++ = get1com ()))
     ;
 }
 
@@ -655,7 +655,7 @@
 getwscom (p)
      w_char register *p;
 {
-  while (*p++ = get2com ())
+    while ((*p++ = get2com ()))
     ;
 }
 
--- a/Wnn/jserver/daibn_kai.c	Thu Dec 13 20:45:52 2007 +0900
+++ b/Wnn/jserver/daibn_kai.c	Thu Dec 13 23:23:43 2007 +0900
@@ -258,7 +258,7 @@
         {
           if (
 #ifndef NO_FZK
-               (fzkchar == NULL || *fzkchar == '\0') &&
+               (fzkchar == NULL || *fzkchar == 0) &&
 #endif /* NO_FZK */
                beginvect == sentou_no)
             {
@@ -324,7 +324,7 @@
 #ifndef NO_FZK
   else
     {
-      if (fzkchar == NULL || *fzkchar == '\0')
+      if (fzkchar == NULL || *fzkchar == 0)
         {
           if ((ll = wnn_get_fukugou_component_body (hinsi, &buf)) == 0)
             {
--- a/Wnn/jserver/fzk.c	Thu Dec 13 20:45:52 2007 +0900
+++ b/Wnn/jserver/fzk.c	Thu Dec 13 23:23:43 2007 +0900
@@ -627,7 +627,7 @@
   for (yomicnt = 0; (yomicnt < YOMI_L) && (start < end); key[yomicnt++] = *start++)
     ;
   key[yomicnt] = 0;
-  for (; yomicnt > 0; key[--yomicnt] = '\0')
+  for (; yomicnt > 0; key[--yomicnt] = 0)
     {
       search_ptr = (struct fzkentry *) bsrch (key);
       if (search_ptr != NULL)
--- a/Wnn/jserver/get_kaiarea.c	Thu Dec 13 20:45:52 2007 +0900
+++ b/Wnn/jserver/get_kaiarea.c	Thu Dec 13 23:23:43 2007 +0900
@@ -51,7 +51,7 @@
 
 /*
  * get_kaiseki_area: take memory areas for analysing.
- * return value: fail = NULL, success != NULL
+ * return value: fail = 0, success = 1
  */
 int
 get_kaiseki_area (size_t kana_len)