Convert K&R definitions to ANSI C

This commit is contained in:
Nishi 2026-06-18 14:01:01 +09:00
commit 6bea197400
45 changed files with 522 additions and 1074 deletions

61
libif.c
View file

@ -49,10 +49,7 @@ int (*len_func[3])() = {0, sjislen, euclen};
#define YOMILEN 32
#define KLEN 64
SJ2_henkan(yomiout, bun, kanjiout, kanjilen) struct bunsetu_sj3* bun;
wchar16_t *yomiout, *kanjiout;
int kanjilen;
int SJ2_henkan(wchar16_t * yomiout, struct bunsetu_sj3 * bun, wchar16_t * kanjiout, int kanjilen)
{
int retv;
SJ3_BUNSETU sbun[BUFFLENGTH];
@ -84,9 +81,7 @@ int kanjilen;
return (retv);
}
int sjislen(str, max)
unsigned char* str;
int max;
int sjislen(unsigned char * str, int max)
{
int len = 0, bytes = 1;
@ -105,9 +100,7 @@ int max;
}
return len;
}
euclen(str, max) unsigned char* str;
int max;
int euclen(unsigned char * str, int max)
{
int len = 0, bytes = 1;
@ -134,13 +127,7 @@ int max;
}
return len;
}
SJ2_getdouon(s, d, n, choice, reconv)
wchar16_t* s;
struct douon_sj3* d;
int n;
int choice;
int reconv;
int SJ2_getdouon(wchar16_t * s, struct douon_sj3 * d, int n, int choice, int reconv)
{
int i, ret;
SJ3_DOUON d_sjis[DOUON_N];
@ -173,16 +160,11 @@ int reconv;
}
return (ret + 1);
}
SJ2_study(dcid) struct studyrec* dcid;
int SJ2_study(struct studyrec * dcid)
{
sj3_gakusyuu(dcid);
}
SJ2_clstudy(yomi1, yomi2, dcid)
wchar16_t* yomi1,
*yomi2;
struct studyrec* dcid;
int SJ2_clstudy(wchar16_t * yomi1, wchar16_t * yomi2, struct studyrec * dcid)
{
unsigned char y1[BUFFLENGTH * 2];
unsigned char y2[BUFFLENGTH * 2];
@ -196,11 +178,7 @@ struct studyrec* dcid;
sj3_gakusyuu2_euc(y1, y2, dcid);
}
}
SJ2_toroku(yomi, kanji, hinshi)
wchar16_t* yomi,
*kanji;
int hinshi;
int SJ2_toroku(wchar16_t * yomi, wchar16_t * kanji, int hinshi)
{
unsigned char y[(YOMILEN + 1) * 3];
unsigned char k[(KLEN + 1) * 3];
@ -215,11 +193,7 @@ int hinshi;
}
return (ret);
}
SJ2_syoukyo(yomi, kanji, hinshi)
wchar16_t* yomi,
*kanji;
int hinshi;
int SJ2_syoukyo(wchar16_t * yomi, wchar16_t * kanji, int hinshi)
{
unsigned char y[(YOMILEN + 1) * 3];
unsigned char k[(KLEN + 1) * 3];
@ -234,8 +208,7 @@ int hinshi;
}
return (ret);
}
sj_check_error(err) int err;
int sj_check_error(int err)
{
if(err & SJ3_SERVER_DEAD)
SJ_warnning(WCServer_Dead);
@ -256,8 +229,8 @@ sj_check_error(err) int err;
if(err & SJ3_CANNOT_OPEN_STUDY)
SJ_warnning(WCNopen_Study);
}
SJ2_reconnect() {
int SJ2_reconnect(void)
{
int err;
sj3_close();
@ -267,12 +240,12 @@ SJ2_reconnect() {
err = sj3_open(chmyhname(cur_serv), user_name);
return (err);
}
SJ2_henkan_end() {
int SJ2_henkan_end(void)
{
sj3_close();
}
SJ2_henkan_init() {
int SJ2_henkan_init(void)
{
int i, err;
int* err_dict = NULL;
int err_num = 0;
@ -311,8 +284,8 @@ SJ2_henkan_init() {
return (0);
}
}
sj3_autocon() {
int sj3_autocon(void)
{
int i, err;
if(dict_num && dict_list) {