diff Wnn/jutil/dtoa.c @ 22:c966456648ad

- fixed argument style in function definition - created header files for prototype check. (in progress) - suppress warnings

--- a/Wnn/jutil/dtoa.c	Tue Apr 15 19:32:47 2008 +0900
+++ b/Wnn/jutil/dtoa.c	Thu Apr 17 01:17:45 2008 +0900
@@ -70,12 +70,42 @@
 extern int pzy_flag;            /* Pinyin or Zhuyin */
 #endif
 
-extern void parse_options (), usage (), input_dic (), udtoujis (), kset (), sdtoujis (), ghindo (), sort (), output_ujis (), exit1 (), init_jeary (), get_kanji_str ();
-extern int input_header (), input_comment (), input_hinsi_list (), little_endian (), revdic (), wnn_loadhinsi (), init_heap (), w_stradd (), input_hindo_header (), motoni2 ();
+/* prototypes */
+void parse_options(int *argc, char ***argv);
+void usage(void);
+void input_dic(FILE *ifpter);
+void udtoujis(void);
+void kset(void);
+void sdtoujis(char *hopter, register int level);
+void ghindo (int argc, char **argv);
+int input_comment (register FILE *fp);
+int input_hinsi_list (register FILE *fp);
+static int rdtoujis (void);
+static int set_hinsi (void);
+static int input_hindo (register FILE *ifpter);
+static int add_hindo (register FILE *ifpter, int num);
+
+/* extern */
+void sort (void);
+void output_ujis (register FILE *opter, int serial_out, int esc_exp);
+void exit1 (void);
+void init_jeary (void);
+void get_kanji_str (UCHAR* kptr, w_char* kanji, w_char* yomi, w_char* comment);
+
+int input_header (FILE* ifpter, struct JT* jtp, struct wnn_file_head* fhp);
+int little_endian (void);
+int revdic (struct JT *jtl, int match);
+int wnn_loadhinsi (unsigned char *fname);
+int w_stradd (register w_char *str, register w_char **cp);
+int motoni2 (int hin);
+int init_heap (int hpb, int yhpb, int l, int rl, FILE *ipf);
+int input_hindo_header (FILE* ifpter, struct HJT* hjtp, struct wnn_file_head* fhp);
+
 #ifdef CONVERT_with_SiSheng
-extern int cwnn_yincod_pzy_str (), input_sisheng ();
+  int cwnn_yincod_pzy (register w_char *pzy_buf, register w_char c, int which);
+  int input_sisheng (register FILE *ifpter);
 #endif
-static int rdtoujis (), set_hinsi (), input_hindo (), add_hindo ();
+
 /* Moved from Wnn/etc/bdic.c */
 int get_n_EU_str (FILE* ifpter, int n, w_char* st);
 int get_short (short* sp, FILE* ifpter);
@@ -94,9 +124,7 @@
 char *hinsi_file_name = NULL;
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   FILE *ifpter;
   char *cswidth_name;
@@ -156,9 +184,7 @@
 
 
 void
-parse_options (argc, argv)
-     int *argc;
-     char ***argv;
+parse_options (int *argc, char ***argv)
 {
   int c;
   extern int optind;
@@ -218,7 +244,7 @@
 
 
 void
-usage ()
+usage (void)
 {
   fprintf (stderr, "Usage: %s [-nse -h hinsi_file_name] <dictionary file> <hindo file>*\n", com_name);
   fprintf (stderr, "Output the Text dictionary to stdout\n");
@@ -229,8 +255,7 @@
 }
 
 void
-input_dic (ifpter)
-     FILE *ifpter;
+input_dic (FILE *ifpter)
 {
 
   init_heap (0,                 /* jt.maxkanji, */
@@ -266,7 +291,7 @@
 }
 
 void
-udtoujis ()
+udtoujis (void)
 {
 
   w_char yomi[LENGTHYOMI];      /* 2 byte yomi */
@@ -323,7 +348,7 @@
 int je = 0;
 
 void
-kset ()
+kset (void)
 {
   int i;
   UCHAR *c;
@@ -343,9 +368,7 @@
 }
 
 void
-sdtoujis (hopter, level)
-     char *hopter;
-     register int level;
+sdtoujis (char *hopter, register int level)
 {
   register int k, j;
   register int tsize;
@@ -433,7 +456,7 @@
 }
 
 static int
-rdtoujis ()
+rdtoujis (void)
 {
   w_char yomi[LENGTHYOMI];      /* 2 byte yomi */
   w_char kan[LENGTHYOMI];       /* 2 byte yomi */
@@ -466,9 +489,7 @@
 }
 
 void
-ghindo (argc, argv)
-     int argc;
-     char **argv;
+ghindo (int argc, char **argv)
 {
   FILE *fp;
   struct wnn_file_head h_file_head;
@@ -498,9 +519,7 @@
 }
 
 static int
-add_hindo (ifpter, num)
-     register FILE *ifpter;
-     int num;
+add_hindo (register FILE *ifpter, int num)
 {
   register int i;
   register int k;
@@ -516,23 +535,20 @@
 /* input dict routines */
 
 int
-input_comment (fp)
-     register FILE *fp;
+input_comment (register FILE *fp)
 {
   return (get_n_EU_str (fp, jt.maxcomment, file_comment));
 }
 
 int
-input_hinsi_list (fp)
-     register FILE *fp;
+input_hinsi_list (register FILE *fp)
 {
   return (get_n_EU_str (fp, jt.maxhinsi_list, hinsi_list));
 }
 
 
 static int
-input_hindo (ifpter)
-     register FILE *ifpter;
+input_hindo (register FILE *ifpter)
 {
   register int i;
   register int k;
@@ -546,7 +562,7 @@
 }
 
 static int
-set_hinsi ()
+set_hinsi (void)
 {
   register int i;
 
@@ -559,8 +575,7 @@
 
 #ifdef  CONVERT_with_SiSheng
 int
-input_sisheng (ifpter)
-     register FILE *ifpter;
+input_sisheng (register FILE *ifpter)
 {
   register int i;
   unsigned short s;