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

@ -154,8 +154,8 @@ static unsigned short HZtbl[95] = {
0xa3f0, 0xa3f1, 0xa3f2, 0xa3f3, 0xa3f4, 0xa3f5, 0xa3f6, 0xa3f7,
0xa3f8, 0xa3f9, 0xa3fa, 0xa1d0, 0xa1c3, 0xa1d1, 0xa1b1};
#ifdef ADDHK
setl_hktozh() {
#ifdef ADDHK setl_hktozh(void)
{
int i;
unsigned short c, zen1;
wchar16_t rstr[2];
@ -190,8 +190,8 @@ setl_hktozh() {
}
}
#endif
mkkigou() {
int mkkigou(void)
{
int i;
wchar16_t rstr[2];
wchar16_t kstr[2];
@ -210,8 +210,7 @@ mkkigou() {
break;
}
}
sj_addten(prefix, c) unsigned short prefix, c;
int sj_addten(unsigned short prefix, unsigned short c)
{
unsigned short c1, cc;
@ -230,8 +229,7 @@ sj_addten(prefix, c) unsigned short prefix, c;
}
return (cc);
}
sj_han2zen(c) unsigned short c;
int sj_han2zen(unsigned short c)
{
int i;
unsigned short cc;
@ -269,8 +267,7 @@ sj_han2zen(c) unsigned short c;
}
int sj3_hantozen_w16(wchar16_t*, wchar16_t*);
sj3_hantozen(out, in) unsigned char* out, *in;
int sj3_hantozen(unsigned char * out, unsigned char * in)
{
wchar16_t * winstr, *woutstr;
unsigned char* mstr;
@ -361,8 +358,7 @@ sj3_hantozen(out, in) unsigned char* out, *in;
return inlen;
}
}
sj3_hantozen_euc(out, in) unsigned char* out, *in;
int sj3_hantozen_euc(unsigned char * out, unsigned char * in)
{
wchar16_t * winstr, *woutstr;
unsigned char* mstr;
@ -453,25 +449,18 @@ sj3_hantozen_euc(out, in) unsigned char* out, *in;
return inlen;
}
}
sj3_hantozen_mb(s1, s2) unsigned char* s1, *s2;
int sj3_hantozen_mb(unsigned char * s1, unsigned char * s2)
{
if(current_locale == LC_CTYPE_EUC)
return sj3_hantozen_euc(s1, s2);
else
return sj3_hantozen(s1, s2);
}
int sj3_hantozen_w16(s1, s2)
wchar16_t *s1, *s2;
int sj3_hantozen_w16(wchar16_t * s1, wchar16_t * s2)
{
return sj_hantozen(s1, s2, wslen(s2));
}
sj_hantozen(s1, s2, len)
wchar16_t* s1,
*s2;
int len;
int sj_hantozen(wchar16_t * s1, wchar16_t * s2, int len)
{
unsigned short c1, cc, prefix;
wchar16_t c;
@ -502,8 +491,7 @@ int len;
*s1 = '\0';
return (rlen);
}
sj_zen2han(c) unsigned short c;
int sj_zen2han(unsigned short c)
{
int i;
unsigned short cc;
@ -538,8 +526,7 @@ sj_zen2han(c) unsigned short c;
}
int sj3_zentohan_w16(wchar16_t*, wchar16_t*);
sj3_zentohan(out, in) unsigned char* out, *in;
int sj3_zentohan(unsigned char * out, unsigned char * in)
{
wchar16_t * winstr, *woutstr;
unsigned char* mstr;
@ -627,8 +614,7 @@ sj3_zentohan(out, in) unsigned char* out, *in;
return ret;
}
sj3_zentohan_euc(out, in) unsigned char* out, *in;
int sj3_zentohan_euc(unsigned char * out, unsigned char * in)
{
wchar16_t * winstr, *woutstr;
unsigned char* mstr;
@ -717,25 +703,18 @@ sj3_zentohan_euc(out, in) unsigned char* out, *in;
return ret;
}
sj3_zentohan_mb(s1, s2) unsigned char* s1, *s2;
int sj3_zentohan_mb(unsigned char * s1, unsigned char * s2)
{
if(current_locale == LC_CTYPE_EUC)
return sj3_zentohan_euc(s1, s2);
else
return sj3_zentohan(s1, s2);
}
int sj3_zentohan_w16(s1, s2)
wchar16_t *s1, *s2;
int sj3_zentohan_w16(wchar16_t * s1, wchar16_t * s2)
{
return sj_zentohan(s1, s2, wslen(s2));
}
sj_zentohan(s1, s2, len)
wchar16_t* s1,
*s2;
int len;
int sj_zentohan(wchar16_t * s1, wchar16_t * s2, int len)
{
unsigned short cc;
wchar16_t c;
@ -766,28 +745,21 @@ int len;
*s1 = (wchar16_t)'\0';
return (rlen);
}
sj_tokata(c)
wchar16_t c;
int sj_tokata(wchar16_t c)
{
if(sj_ishira(c)) {
c += 0x0100;
}
return (c);
}
sj_tohira(c)
wchar16_t c;
int sj_tohira(wchar16_t c)
{
if(sj_iskata(c) && (short)c <= (short)0xa5f3) {
c -= 0x0100;
}
return (c);
}
sj_htok(s1, s2)
wchar16_t* s1,
*s2;
int sj_htok(wchar16_t * s1, wchar16_t * s2)
{
wchar16_t cc;
wchar16_t c;
@ -801,10 +773,7 @@ sj_htok(s1, s2)
}
*s1 = (wchar16_t)'\0';
}
sj_ktoh(s1, s2)
wchar16_t* s1,
*s2;
int sj_ktoh(wchar16_t * s1, wchar16_t * s2)
{
wchar16_t cc;
wchar16_t c;