Mercurial > freewnn
comparison Wnn/jlib/jl.c @ 14:709a803fbbff
fixed prototype erratas
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Sun, 02 Mar 2008 21:49:59 +0900 |
parents | 778894f4449f |
children | a7ccf412ba02 |
comparison
equal
deleted
inserted
replaced
13:778894f4449f | 14:709a803fbbff |
---|---|
422 /* | 422 /* |
423 * Libraries which handle Connection To Jserver | 423 * Libraries which handle Connection To Jserver |
424 */ | 424 */ |
425 | 425 |
426 struct wnn_env * | 426 struct wnn_env * |
427 jl_connect_lang (register char *env_n, register char *server_n, register char *lang, register char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void), int timeout) | 427 jl_connect_lang (register char *env_n, register char *server_n, register char *lang, register char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *), int timeout) |
428 { | 428 { |
429 register WNN_JSERVER_ID *js = NULL; | 429 register WNN_JSERVER_ID *js = NULL; |
430 struct wnn_env *env; | 430 struct wnn_env *env; |
431 int env_exist; | 431 int env_exist; |
432 char p_lang[16]; | 432 char p_lang[16]; |
557 env->js_id = 0; | 557 env->js_id = 0; |
558 } | 558 } |
559 | 559 |
560 | 560 |
561 struct wnn_buf * | 561 struct wnn_buf * |
562 jl_open_lang (char *env_n, char *server_n, char *lang, char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void), int timeout) | 562 jl_open_lang (char *env_n, char *server_n, char *lang, char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *), int timeout) |
563 { | 563 { |
564 register int k, dmy; | 564 register int k, dmy; |
565 register struct wnn_buf *buf; | 565 register struct wnn_buf *buf; |
566 struct wnn_env *env; | 566 struct wnn_env *env; |
567 | 567 |
1434 #define JISHO 1 | 1434 #define JISHO 1 |
1435 #define HINDO 2 | 1435 #define HINDO 2 |
1436 | 1436 |
1437 /*********************************/ | 1437 /*********************************/ |
1438 int | 1438 int |
1439 jl_dic_add_e (register struct wnn_env *env, char *dic_name, char *hindo_name, int rev, int prio, int rw, int hrw, char *pwd_dic, char *pwd_hindo, int (*error_handler)(void), int (*message_handler)(void)) | 1439 jl_dic_add_e (register struct wnn_env *env, char *dic_name, char *hindo_name, int rev, int prio, int rw, int hrw, char *pwd_dic, char *pwd_hindo, int (*error_handler)(char *), int (*message_handler)(char *)) |
1440 { | 1440 { |
1441 char tmp[256]; | 1441 char tmp[256]; |
1442 char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN]; | 1442 char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN]; |
1443 int fid, hfid = -1; | 1443 int fid, hfid = -1; |
1444 register int ret; | 1444 register int ret; |
1609 } | 1609 } |
1610 return (0); | 1610 return (0); |
1611 } | 1611 } |
1612 | 1612 |
1613 static int | 1613 static int |
1614 create_pwd_file (register struct wnn_env *env, char *pwd_file, int (*error_handler)(void), int (*message_handler)(void)) | 1614 create_pwd_file (register struct wnn_env *env, char *pwd_file, int (*error_handler)(char *), int (*message_handler)(char *)) |
1615 { | 1615 { |
1616 FILE *fp; | 1616 FILE *fp; |
1617 char gomi[256]; | 1617 char gomi[256]; |
1618 | 1618 |
1619 if (pwd_file == NULL || *pwd_file == 0) | 1619 if (pwd_file == NULL || *pwd_file == 0) |
2508 return (cnt); | 2508 return (cnt); |
2509 } | 2509 } |
2510 | 2510 |
2511 | 2511 |
2512 static int | 2512 static int |
2513 sort_func_ws (register char *a, register char *b) | 2513 sort_func_ws (const void *a, const void *b) |
2514 { | 2514 { |
2515 int ah, bh, ai, bi, iah, ibh, iai, ibi; | 2515 int ah, bh, ai, bi, iah, ibh, iai, ibi; |
2516 ah = ((struct wnn_jdata *) a)->hindo; | 2516 ah = ((struct wnn_jdata *) a)->hindo; |
2517 bh = ((struct wnn_jdata *) b)->hindo; | 2517 bh = ((struct wnn_jdata *) b)->hindo; |
2518 iah = ((struct wnn_jdata *) a)->int_hindo; | 2518 iah = ((struct wnn_jdata *) a)->int_hindo; |
2628 #define REAL_PARAM(x) (strcmp(x, "-")) | 2628 #define REAL_PARAM(x) (strcmp(x, "-")) |
2629 | 2629 |
2630 | 2630 |
2631 /** wnnrc を見てのパラメータの設定 */ | 2631 /** wnnrc を見てのパラメータの設定 */ |
2632 int | 2632 int |
2633 jl_set_env_wnnrc (register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void)) | 2633 jl_set_env_wnnrc (register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *)) |
2634 { | 2634 { |
2635 int level = 0; | 2635 int level = 0; |
2636 int x; | 2636 int x; |
2637 wnn_errorno = 0; | 2637 wnn_errorno = 0; |
2638 if (error_handler == (void *)WNN_CREATE) | 2638 if (error_handler == (void *)WNN_CREATE) |
2651 confirm_state = 0; | 2651 confirm_state = 0; |
2652 return (x); | 2652 return (x); |
2653 } | 2653 } |
2654 | 2654 |
2655 int | 2655 int |
2656 jl_set_env_wnnrc1 (register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void), int level) | 2656 jl_set_env_wnnrc1 (register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *), int level) |
2657 { | 2657 { |
2658 register int num; | 2658 register int num; |
2659 char s[20][EXPAND_PATH_LENGTH]; | 2659 char s[20][EXPAND_PATH_LENGTH]; |
2660 char code[EXPAND_PATH_LENGTH]; | 2660 char code[EXPAND_PATH_LENGTH]; |
2661 char tmp[1024]; | 2661 char tmp[1024]; |
2992 return (js_access (env, n, 4)); | 2992 return (js_access (env, n, 4)); |
2993 } | 2993 } |
2994 } | 2994 } |
2995 | 2995 |
2996 static int | 2996 static int |
2997 create_file (register struct wnn_env *env, char *n, int d, int fid, char *pwd_dic, char *pwd_hindo, int (*error_handler)(void), int (*message_handler)(void)) | 2997 create_file (register struct wnn_env *env, char *n, int d, int fid, char *pwd_dic, char *pwd_hindo, int (*error_handler)(char *), int (*message_handler)(char *)) |
2998 { | 2998 { |
2999 char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN]; | 2999 char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN]; |
3000 int rev_dict_type; | 3000 int rev_dict_type; |
3001 | 3001 |
3002 if (make_dir_rec1 (env, n, error_handler, message_handler) == -1) | 3002 if (make_dir_rec1 (env, n, error_handler, message_handler) == -1) |
3097 } | 3097 } |
3098 } | 3098 } |
3099 } | 3099 } |
3100 | 3100 |
3101 static int | 3101 static int |
3102 make_dir_rec1 (struct wnn_env *env, register char *path, int (*error_handler)(void), int (*message_handler)(void)) | 3102 make_dir_rec1 (struct wnn_env *env, register char *path, int (*error_handler)(char *), int (*message_handler)(char *)) |
3103 { | 3103 { |
3104 char gomi[128]; | 3104 char gomi[128]; |
3105 register char *c; | 3105 register char *c; |
3106 for (c = path; *c; c++) | 3106 for (c = path; *c; c++) |
3107 { | 3107 { |
3117 } | 3117 } |
3118 return (0); | 3118 return (0); |
3119 } | 3119 } |
3120 | 3120 |
3121 static int | 3121 static int |
3122 make_dir1 (register struct wnn_env *env, register char *dirname, int (*error_handler)(void), int (*message_handler)(void)) | 3122 make_dir1 (register struct wnn_env *env, register char *dirname, int (*error_handler)(char *), int (*message_handler)(char *)) |
3123 { | 3123 { |
3124 char gomi[128]; | 3124 char gomi[128]; |
3125 if (dirname[0] == C_LOCAL) | 3125 if (dirname[0] == C_LOCAL) |
3126 { | 3126 { |
3127 if (*(dirname + 1) == 0) | 3127 if (*(dirname + 1) == 0) |
3174 return (0); | 3174 return (0); |
3175 } | 3175 } |
3176 | 3176 |
3177 | 3177 |
3178 static int | 3178 static int |
3179 call_error_handler (int (*error_handler)(void), char *c) | 3179 call_error_handler (int (*error_handler)(char *), char *c) |
3180 { | 3180 { |
3181 register int x; | 3181 register int x; |
3182 x = error_handler (c); | 3182 x = error_handler (c); |
3183 if (confirm_state == CONFIRM1) | 3183 if (confirm_state == CONFIRM1) |
3184 { | 3184 { |
3189 } | 3189 } |
3190 return (x); | 3190 return (x); |
3191 } | 3191 } |
3192 | 3192 |
3193 static void | 3193 static void |
3194 message_out (int (*message_handler)(void), char *format, int s1, int s2, int s3, int s4, int s5, int s6, int s7, int s8) | 3194 message_out (int (*message_handler)(char *), char *format, int s1, int s2, int s3, int s4, int s5, int s6, int s7, int s8) |
3195 { | 3195 { |
3196 char buf[256]; | 3196 char buf[256]; |
3197 | 3197 |
3198 if (message_handler) | 3198 if (message_handler) |
3199 { | 3199 { |
3418 return (x); | 3418 return (x); |
3419 } | 3419 } |
3420 | 3420 |
3421 | 3421 |
3422 int | 3422 int |
3423 jl_word_comment_set_e (register struct wnn_env *env, int dic_no, int entry, wchar *comment) | 3423 jl_word_comment_set_e (register struct wnn_env *env, int dic_no, int entry, w_char *comment) |
3424 { | 3424 { |
3425 register int x; | 3425 register int x; |
3426 wnn_errorno = 0; | 3426 wnn_errorno = 0; |
3427 if ((x = js_word_comment_set (env, dic_no, entry, comment)) == -1) | 3427 if ((x = js_word_comment_set (env, dic_no, entry, comment)) == -1) |
3428 if_dead_disconnect (env, -1); | 3428 if_dead_disconnect (env, -1); |