diff Wnn/etc/gethinsi.c @ 22:c966456648ad

- fixed argument style in function definition - created header files for prototype check. (in progress) - suppress warnings
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Thu, 17 Apr 2008 01:17:45 +0900
parents bbc77ca4def5
children 6bfa7ea3b75b
line wrap: on
line diff
--- a/Wnn/etc/gethinsi.c	Tue Apr 15 19:32:47 2008 +0900
+++ b/Wnn/etc/gethinsi.c	Thu Apr 17 01:17:45 2008 +0900
@@ -122,20 +122,19 @@
 int mnode = 0;
 
 static void
-error_long ()
+error_long (void)
 {
   wnnerror_hinsi = WNN_TOO_LONG_HINSI_FILE_LINE;
 }
 
 static void
-error_no_heap ()
+error_no_heap (void)
 {
   wnnerror_hinsi = WNN_TOO_BIG_HINSI_FILE;
 }
 
 static int
-get_char0 (fp)
-     FILE *fp;
+get_char0 (FILE *fp)
 {
   int c, d;
 
@@ -181,8 +180,7 @@
 }
 
 static int
-get_char (fp)                   /* remove null lines */
-     FILE *fp;
+get_char (FILE *fp)                   /* remove null lines */
 {
   static int c = -1;
   int d;
@@ -215,10 +213,7 @@
 
 /* get one phrase and return the separater */
 static int
-get_phrase (s0, size, fp)
-     UCHAR *s0;
-     int size;
-     FILE *fp;
+get_phrase (UCHAR *s0, int size, FILE *fp)
 {
   UCHAR *s = s0;
   int c;
@@ -250,9 +245,7 @@
 }
 
 static int
-stradd (cp, str)
-     w_char **cp;
-     char *str;
+stradd (w_char **cp, char *str)
 {
   int len = strlen (str);
 
@@ -268,9 +261,7 @@
 }
 
 static int
-w_stradd (cp, str)
-     unsigned short **cp;
-     unsigned short *str;
+w_stradd (unsigned short **cp, unsigned short *str)
 {
 
   *cp = whp;
@@ -288,8 +279,7 @@
 }
 
 int
-wnn_loadhinsi (fname)
-     unsigned char *fname;
+wnn_loadhinsi (unsigned char *fname)
 {
   FILE *fp;
   UCHAR buf[SIZE];
@@ -420,8 +410,7 @@
 }
 
 static int
-find_hinsi_by_name (c)
-     register w_char *c;
+find_hinsi_by_name (register w_char *c)
 {
   register int k;
   if (!hinsi_loaded)
@@ -450,8 +439,7 @@
 
 
 int
-wnn_find_hinsi_by_name (c)
-     register char *c;
+wnn_find_hinsi_by_name (register char *c)
 {
   w_char hin[WNN_HINSI_NAME_LEN];
 
@@ -461,8 +449,7 @@
 
 
 static w_char *
-get_hinsi_name (k)
-     int k;
+get_hinsi_name (int k)
 {
   if (!hinsi_loaded)
     {
@@ -483,8 +470,7 @@
 }
 
 char *
-wnn_get_hinsi_name (k)
-     int k;
+wnn_get_hinsi_name (int k)
 {
   w_char *s;
   static char hin[WNN_HINSI_NAME_LEN * 2];
@@ -499,9 +485,7 @@
 static
 #endif                          /* JSERVER */
   int
-wnn_get_fukugou_component_body (k, shp)
-     register int k;
-     register unsigned short **shp;
+wnn_get_fukugou_component_body (register int k, register unsigned short **shp)
 {
   static unsigned short tmp;
   register unsigned short *s;
@@ -526,9 +510,7 @@
 }
 
 int
-wnn_get_fukugou_component (k, shp)
-     register int k;
-     register unsigned short **shp;
+wnn_get_fukugou_component (register int k, register unsigned short **shp)
 {
   if (!hinsi_loaded)
     {
@@ -544,8 +526,7 @@
 #ifdef JSERVER
 
 w_char *
-wnn_hinsi_name (no)
-     int no;
+wnn_hinsi_name (int no)
 {
   w_char *c;
   if ((c = get_hinsi_name (no)) == NULL)
@@ -556,8 +537,7 @@
 }
 
 int
-wnn_hinsi_number (name)
-     w_char *name;
+wnn_hinsi_number (w_char *name)
 {
   int n;
   if ((n = find_hinsi_by_name (name)) == -1)
@@ -568,11 +548,7 @@
 }
 
 int
-wnn_hinsi_list (name, c, mynode, mmynode)
-     w_char *name;
-     w_char **c;
-     struct wnn_hinsi_node *mynode;
-     int mmynode;
+wnn_hinsi_list (w_char *name, w_char **c, struct wnn_hinsi_node *mynode, int mmynode)
 {
   int k;
 
@@ -600,10 +576,7 @@
 }
 
 int
-wnn_has_hinsi (mynode, mmynode, name)
-     struct wnn_hinsi_node *mynode;
-     int mmynode;
-     w_char *name;
+wnn_has_hinsi (struct wnn_hinsi_node *mynode, int mmynode, w_char *name)
 {
   w_char *c;
   int k, j;