diff Wnn/romkan/rk_modread.c @ 28:a7ccf412ba02

more warning suppression

--- a/Wnn/romkan/rk_modread.c	Sat Mar 06 18:29:27 2010 +0900
+++ b/Wnn/romkan/rk_modread.c	Sat Mar 06 23:24:53 2010 +0900
@@ -75,36 +75,45 @@
 extern void ERRMOD (), ERMOPN (), BUGreport ();
 extern int filnamchk ();
 
-struct kwdpair
-{
+struct kwdpair {
   /* キーワードとその内部表現の対応を与える構造体。内部表現を
      持たないものに対しては0が与えられている。 */
   char *name;
   int code;
-}
-modfn[] =
-{
-  "defmode", 0,
-    "if", XY2INT (2, 0), "when", XY2INT (2, 1), "path", 0, "search", 0, "on_dispmode", XY2INT (5, 0), "off_dispmode", XY2INT (5, 1), "on_unchg", XY2INT (6, 0), "off_unchg", XY2INT (6, 1), NULL};      /* 下を見よ キーワード定義表はまだあと二つあるのだ */
+};
+
+struct kwdpair modfn[] = {
+  {"defmode", 0},
+  {"if", XY2INT (2, 0)},
+  {"when", XY2INT (2, 1)},
+  {"path", 0},
+  {"search", 0},
+  {"on_dispmode", XY2INT (5, 0)},
+  {"off_dispmode", XY2INT (5, 1)},
+  {"on_unchg", XY2INT (6, 0)},
+  {"off_unchg", XY2INT (6, 1)},
+  {NULL, 0},
+};      /* 下を見よ キーワード定義表はまだあと二つあるのだ */
 
 struct kwdpair modcond[] = {
-  "not", XY2INT (3, 0),
-  "and", XY2INT (3, 1),
-  "or", XY2INT (3, 2),
-  "true", XY2INT (3, 3),
-  "false", XY2INT (3, 4),
-  "=", XY2INT (3, 5),
-  "!=", XY2INT (3, 6),
-  "<", XY2INT (3, 7),
-  ">", XY2INT (3, 8),
-  NULL
+  {"not", XY2INT (3, 0)},
+  {"and", XY2INT (3, 1)},
+  {"or", XY2INT (3, 2)},
+  {"true", XY2INT (3, 3)},
+  {"false", XY2INT (3, 4)},
+  {"=", XY2INT (3, 5)},
+  {"!=", XY2INT (3, 6)},
+  {"<", XY2INT (3, 7)},
+  {">", XY2INT (3, 8)},
+  {NULL, 0}
 };
+
 int condarg[] = { 1, 2, 2, 0, 0, 2, 2, 2, 2 };  /* 条件判断関数の引数個数 */
 
 struct kwdpair swstat[] = {
-  "on", 0,
-  "off", 0,
-  NULL
+  {"on", 0},
+  {"off", 0},
+  {NULL, 0}
 };
  /* 1×2^24代はモード名、4×2^24代はモード表示文字列、7×2^24代はモード状態定
     数の内部表現に使っている */
@@ -121,7 +130,8 @@
     if (!mystrcmp (hyo[i].name, wd))
       return (i);
   ERRMOD (9);
- /*NOTREACHED*/
+  /*NOTREACHED*/
+  return -1; /* dummy */
 }
 
  /** モード表の読み込み */
@@ -1280,7 +1290,7 @@
 mystrcpy (s1, s2)
      char *s1, *s2;
 {
-  while (*s1++ = codeeval (&s2));
+  while ((*s1++ = codeeval(&s2)));
 }
 
  /**    一文字の解釈を行う。普通の文字はそのまま、'\（8進）;'は実際のコードに