Convert K&R definitions to ANSI C

This commit is contained in:
Nishi 2026-06-18 14:01:01 +09:00
commit a2161ba1b0
45 changed files with 521 additions and 1073 deletions

View file

@ -35,8 +35,8 @@
void Rdisp();
int i_point;
exec_henkan() {
int exec_henkan(void)
{
Conversion* cv;
int i, j;
wchar16_t * s, *p;
@ -215,8 +215,7 @@ exec_henkan() {
cv->e_point = 0;
cv->Kanji = 1;
}
addBun(cur, end) int cur, end;
int addBun(int cur, int end)
{
int i;
Conversion* cv;
@ -229,8 +228,7 @@ addBun(cur, end) int cur, end;
cv->Bun[i].deststr = cv->Bun[i - 1].deststr;
}
}
delspan(cur) int cur;
int delspan(int cur)
{
int i;
Conversion* cv;
@ -242,8 +240,7 @@ delspan(cur) int cur;
cv->kettei[i] = cv->kettei[i + 1];
}
}
delBun(cur, end) int cur, end;
int delBun(int cur, int end)
{
int i;
Conversion* cv;
@ -258,16 +255,11 @@ delBun(cur, end) int cur, end;
cv->Bun[i].deststr = cv->Bun[i + 1].deststr;
}
}
IsHex(c)
wchar16_t c;
int IsHex(wchar16_t c)
{
return (iswxdigit(c));
}
Getcode(in, out)
wchar16_t* in,
*out;
int Getcode(wchar16_t * in, wchar16_t * out)
{
int c, i, j;
unsigned char s[5];
@ -335,10 +327,7 @@ Getcode(in, out)
}
static unsigned char load_mode;
load_bun(num, s, type) int num;
wchar16_t* s;
unsigned char type;
int load_bun(int num, wchar16_t * s, unsigned char type)
{
Conversion* cv;
int len, ilen;
@ -406,10 +395,7 @@ unsigned char type;
}
return (len);
}
load_bun2(num, htmp, ztmp, omode) int num;
wchar16_t * htmp, *ztmp;
unsigned short* omode;
int load_bun2(int num, wchar16_t * htmp, wchar16_t * ztmp, unsigned short * omode)
{
Conversion* cv;
int i;
@ -451,11 +437,7 @@ unsigned short* omode;
}
return (len);
}
getistr(s, ostr, len)
wchar16_t* s,
*ostr;
int len;
int getistr(wchar16_t * s, wchar16_t * ostr, int len)
{
int ipos, opos;
Conversion* cv;
@ -474,8 +456,7 @@ int len;
*s = (wchar16_t)'\0';
return (rlen);
}
exec_muhenkan(first) int first;
int exec_muhenkan(int first)
{
Conversion* cv;
@ -510,9 +491,7 @@ exec_muhenkan(first) int first;
}
static unsigned char Bstr_mode;
Bstr(bnum, s) int bnum;
wchar16_t* s;
int Bstr(int bnum, wchar16_t * s)
{
Conversion* cv;
int i, len;
@ -556,8 +535,7 @@ wchar16_t* s;
len = -1;
return (len);
}
mode_muhenkan(mod, bkettei) int mod, bkettei;
int mode_muhenkan(int mod, int bkettei)
{
int def;
@ -572,8 +550,7 @@ mode_muhenkan(mod, bkettei) int mod, bkettei;
}
return (KEY_ZHIRA);
}
Bchange(mod) int mod;
int Bchange(int mod)
{
Conversion* cv;
int i;
@ -667,8 +644,8 @@ Bdisp(redraw) {
}
Flush();
}
void Rdisp() {
void Rdisp(void)
{
Conversion* cv;
int i;
int Total;
@ -714,9 +691,7 @@ void Rdisp() {
Cgoto(Total);
Flush();
}
AfterAllPrint(from, Total) int from;
int Total;
int AfterAllPrint(int from, int Total)
{
Conversion* cv;
int i;
@ -760,8 +735,8 @@ int Total;
Cgoto(Total);
Flush();
}
void Bright() {
void Bright(void)
{
Conversion* cv;
int flag;
@ -780,8 +755,8 @@ void Bright() {
} while(cv->Plen[cv->CurBun] <= 0);
Rdisp();
}
void Bleft() {
void Bleft(void)
{
Conversion* cv;
int flag;
@ -800,8 +775,8 @@ void Bleft() {
} while(cv->Plen[cv->CurBun] <= 0);
Rdisp();
}
void Blast() {
void Blast(void)
{
Conversion* cv;
cv = GetConversion();
@ -814,8 +789,8 @@ void Blast() {
}
Rdisp();
}
void Btop() {
void Btop(void)
{
Conversion* cv;
cv = GetConversion();