comparison Wnn/jutil/dtoa.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 a7ccf412ba02
comparison
equal deleted inserted replaced
21:22b754fbd8fe 22:c966456648ad
68 #ifdef CONVERT_with_SiSheng 68 #ifdef CONVERT_with_SiSheng
69 #include "cplib.h" 69 #include "cplib.h"
70 extern int pzy_flag; /* Pinyin or Zhuyin */ 70 extern int pzy_flag; /* Pinyin or Zhuyin */
71 #endif 71 #endif
72 72
73 extern void parse_options (), usage (), input_dic (), udtoujis (), kset (), sdtoujis (), ghindo (), sort (), output_ujis (), exit1 (), init_jeary (), get_kanji_str (); 73 /* prototypes */
74 extern int input_header (), input_comment (), input_hinsi_list (), little_endian (), revdic (), wnn_loadhinsi (), init_heap (), w_stradd (), input_hindo_header (), motoni2 (); 74 void parse_options(int *argc, char ***argv);
75 void usage(void);
76 void input_dic(FILE *ifpter);
77 void udtoujis(void);
78 void kset(void);
79 void sdtoujis(char *hopter, register int level);
80 void ghindo (int argc, char **argv);
81 int input_comment (register FILE *fp);
82 int input_hinsi_list (register FILE *fp);
83 static int rdtoujis (void);
84 static int set_hinsi (void);
85 static int input_hindo (register FILE *ifpter);
86 static int add_hindo (register FILE *ifpter, int num);
87
88 /* extern */
89 void sort (void);
90 void output_ujis (register FILE *opter, int serial_out, int esc_exp);
91 void exit1 (void);
92 void init_jeary (void);
93 void get_kanji_str (UCHAR* kptr, w_char* kanji, w_char* yomi, w_char* comment);
94
95 int input_header (FILE* ifpter, struct JT* jtp, struct wnn_file_head* fhp);
96 int little_endian (void);
97 int revdic (struct JT *jtl, int match);
98 int wnn_loadhinsi (unsigned char *fname);
99 int w_stradd (register w_char *str, register w_char **cp);
100 int motoni2 (int hin);
101 int init_heap (int hpb, int yhpb, int l, int rl, FILE *ipf);
102 int input_hindo_header (FILE* ifpter, struct HJT* hjtp, struct wnn_file_head* fhp);
103
75 #ifdef CONVERT_with_SiSheng 104 #ifdef CONVERT_with_SiSheng
76 extern int cwnn_yincod_pzy_str (), input_sisheng (); 105 int cwnn_yincod_pzy (register w_char *pzy_buf, register w_char c, int which);
77 #endif 106 int input_sisheng (register FILE *ifpter);
78 static int rdtoujis (), set_hinsi (), input_hindo (), add_hindo (); 107 #endif
108
79 /* Moved from Wnn/etc/bdic.c */ 109 /* Moved from Wnn/etc/bdic.c */
80 int get_n_EU_str (FILE* ifpter, int n, w_char* st); 110 int get_n_EU_str (FILE* ifpter, int n, w_char* st);
81 int get_short (short* sp, FILE* ifpter); 111 int get_short (short* sp, FILE* ifpter);
82 112
83 int which_dict; 113 int which_dict;
92 struct wnn_file_head file_head; 122 struct wnn_file_head file_head;
93 123
94 char *hinsi_file_name = NULL; 124 char *hinsi_file_name = NULL;
95 125
96 int 126 int
97 main (argc, argv) 127 main (int argc, char **argv)
98 int argc;
99 char **argv;
100 { 128 {
101 FILE *ifpter; 129 FILE *ifpter;
102 char *cswidth_name; 130 char *cswidth_name;
103 extern char *get_cswidth_name (); 131 extern char *get_cswidth_name ();
104 extern void set_cswidth (); 132 extern void set_cswidth ();
154 exit (0); 182 exit (0);
155 } 183 }
156 184
157 185
158 void 186 void
159 parse_options (argc, argv) 187 parse_options (int *argc, char ***argv)
160 int *argc;
161 char ***argv;
162 { 188 {
163 int c; 189 int c;
164 extern int optind; 190 extern int optind;
165 extern char *optarg; 191 extern char *optarg;
166 192
216 } 242 }
217 } 243 }
218 244
219 245
220 void 246 void
221 usage () 247 usage (void)
222 { 248 {
223 fprintf (stderr, "Usage: %s [-nse -h hinsi_file_name] <dictionary file> <hindo file>*\n", com_name); 249 fprintf (stderr, "Usage: %s [-nse -h hinsi_file_name] <dictionary file> <hindo file>*\n", com_name);
224 fprintf (stderr, "Output the Text dictionary to stdout\n"); 250 fprintf (stderr, "Output the Text dictionary to stdout\n");
225 #ifdef CONVERT_with_SiSheng 251 #ifdef CONVERT_with_SiSheng
226 fprintf (stderr, "-z : Output Zhuyin (Default is Pinyin)\n"); 252 fprintf (stderr, "-z : Output Zhuyin (Default is Pinyin)\n");
227 #endif 253 #endif
228 exit1 (); 254 exit1 ();
229 } 255 }
230 256
231 void 257 void
232 input_dic (ifpter) 258 input_dic (FILE *ifpter)
233 FILE *ifpter;
234 { 259 {
235 260
236 init_heap (0, /* jt.maxkanji, */ 261 init_heap (0, /* jt.maxkanji, */
237 jt.maxserial * YOMI_PER_LINE * 5, /* may be enough */ 262 jt.maxserial * YOMI_PER_LINE * 5, /* may be enough */
238 jt.maxserial, jt.maxserial, stdin); 263 jt.maxserial, jt.maxserial, stdin);
264 fread (jt.hontai, 1, jt.maxhontai, ifpter); 289 fread (jt.hontai, 1, jt.maxhontai, ifpter);
265 fread (jt.ri2, sizeof (struct rind2), jt.maxserial, ifpter); 290 fread (jt.ri2, sizeof (struct rind2), jt.maxserial, ifpter);
266 } 291 }
267 292
268 void 293 void
269 udtoujis () 294 udtoujis (void)
270 { 295 {
271 296
272 w_char yomi[LENGTHYOMI]; /* 2 byte yomi */ 297 w_char yomi[LENGTHYOMI]; /* 2 byte yomi */
273 w_char kan[LENGTHYOMI]; /* 2 byte kanji */ 298 w_char kan[LENGTHYOMI]; /* 2 byte kanji */
274 w_char comm[LENGTHYOMI]; 299 w_char comm[LENGTHYOMI];
321 346
322 w_char yomi[LENGTHYOMI]; 347 w_char yomi[LENGTHYOMI];
323 int je = 0; 348 int je = 0;
324 349
325 void 350 void
326 kset () 351 kset (void)
327 { 352 {
328 int i; 353 int i;
329 UCHAR *c; 354 UCHAR *c;
330 w_char kan[LENGTHYOMI]; /* 2 byte kanji */ 355 w_char kan[LENGTHYOMI]; /* 2 byte kanji */
331 w_char comm[LENGTHYOMI]; /* 2 byte kanji */ 356 w_char comm[LENGTHYOMI]; /* 2 byte kanji */
341 c += *c; 366 c += *c;
342 } 367 }
343 } 368 }
344 369
345 void 370 void
346 sdtoujis (hopter, level) 371 sdtoujis (char *hopter, register int level)
347 char *hopter;
348 register int level;
349 { 372 {
350 register int k, j; 373 register int k, j;
351 register int tsize; 374 register int tsize;
352 register w_char *charst; 375 register w_char *charst;
353 register w_char *sumst; 376 register w_char *sumst;
431 break; 454 break;
432 } 455 }
433 } 456 }
434 457
435 static int 458 static int
436 rdtoujis () 459 rdtoujis (void)
437 { 460 {
438 w_char yomi[LENGTHYOMI]; /* 2 byte yomi */ 461 w_char yomi[LENGTHYOMI]; /* 2 byte yomi */
439 w_char kan[LENGTHYOMI]; /* 2 byte yomi */ 462 w_char kan[LENGTHYOMI]; /* 2 byte yomi */
440 w_char comm[LENGTHYOMI]; /* 2 byte yomi */ 463 w_char comm[LENGTHYOMI]; /* 2 byte yomi */
441 register struct rind2 *hop; 464 register struct rind2 *hop;
464 } 487 }
465 return (0); 488 return (0);
466 } 489 }
467 490
468 void 491 void
469 ghindo (argc, argv) 492 ghindo (int argc, char **argv)
470 int argc;
471 char **argv;
472 { 493 {
473 FILE *fp; 494 FILE *fp;
474 struct wnn_file_head h_file_head; 495 struct wnn_file_head h_file_head;
475 struct HJT hjt; 496 struct HJT hjt;
476 497
496 add_hindo (fp, hjt.maxserial); 517 add_hindo (fp, hjt.maxserial);
497 } 518 }
498 } 519 }
499 520
500 static int 521 static int
501 add_hindo (ifpter, num) 522 add_hindo (register FILE *ifpter, int num)
502 register FILE *ifpter;
503 int num;
504 { 523 {
505 register int i; 524 register int i;
506 register int k; 525 register int k;
507 for (i = 0; i < num; i++) 526 for (i = 0; i < num; i++)
508 { 527 {
514 } 533 }
515 534
516 /* input dict routines */ 535 /* input dict routines */
517 536
518 int 537 int
519 input_comment (fp) 538 input_comment (register FILE *fp)
520 register FILE *fp;
521 { 539 {
522 return (get_n_EU_str (fp, jt.maxcomment, file_comment)); 540 return (get_n_EU_str (fp, jt.maxcomment, file_comment));
523 } 541 }
524 542
525 int 543 int
526 input_hinsi_list (fp) 544 input_hinsi_list (register FILE *fp)
527 register FILE *fp;
528 { 545 {
529 return (get_n_EU_str (fp, jt.maxhinsi_list, hinsi_list)); 546 return (get_n_EU_str (fp, jt.maxhinsi_list, hinsi_list));
530 } 547 }
531 548
532 549
533 static int 550 static int
534 input_hindo (ifpter) 551 input_hindo (register FILE *ifpter)
535 register FILE *ifpter;
536 { 552 {
537 register int i; 553 register int i;
538 register int k; 554 register int k;
539 for (i = 0; i < jt.maxserial; i++) 555 for (i = 0; i < jt.maxserial; i++)
540 { 556 {
544 } 560 }
545 return (0); 561 return (0);
546 } 562 }
547 563
548 static int 564 static int
549 set_hinsi () 565 set_hinsi (void)
550 { 566 {
551 register int i; 567 register int i;
552 568
553 for (i = 0; i < jt.maxserial; i++) 569 for (i = 0; i < jt.maxserial; i++)
554 { 570 {
557 return (0); 573 return (0);
558 } 574 }
559 575
560 #ifdef CONVERT_with_SiSheng 576 #ifdef CONVERT_with_SiSheng
561 int 577 int
562 input_sisheng (ifpter) 578 input_sisheng (register FILE *ifpter)
563 register FILE *ifpter;
564 { 579 {
565 register int i; 580 register int i;
566 unsigned short s; 581 unsigned short s;
567 582
568 for (i = 0; i < jt.maxserial; i++) 583 for (i = 0; i < jt.maxserial; i++)