nishiTV/sj3
1
0
Fork 0
Code Pull requests Activity

Convert K&R definitions to ANSI C

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

115
rk_conv.c
View file

@ -112,21 +112,18 @@ static StrbufRec strpbuf, *strpp;
static wchar16_t* shp;
static YmibufRec ymipbuf, *ymipp;
static unsigned short* yhp;
sj3_rkcode(code) int code;
int sj3_rkcode(int code)
{
if(code)
file_code = SJ3_NO;
}
sj3_rkinit2(rkfile, erase) char* rkfile;
int erase;
int sj3_rkinit2(char * rkfile, int erase)
{
rk_erase = erase;
return (sj3_rkinit_mb(rkfile));
}
rcode_sjis_init() {
int rcode_sjis_init(void)
{
int i, rkeylen = 0, ryomilen = 0, rstrlen = 0;
int klen, ylen, slen, tablnum = 0, tablsize;
unsigned char * mbstr, *mptr, mtmp[BUFSIZ], mtmp2[BUFSIZ];
@ -283,8 +280,8 @@ rcode_sjis_init() {
}
return 1;
}
rcode_euc_init() {
int rcode_euc_init(void)
{
int i, rkeylen = 0, ryomilen = 0, rstrlen = 0;
int klen, ylen, slen, tablnum = 0, tablsize;
unsigned char * mbstr, *mptr, mtmp[BUFSIZ], mtmp2[BUFSIZ];
@ -441,18 +438,15 @@ rcode_euc_init() {
}
return 1;
}
sj3_rkinit(rkfile) char* rkfile;
int sj3_rkinit(char * rkfile)
{
return sj3_rkinit_sub(rkfile, rcode_sjis_init);
}
sj3_rkinit_euc(rkfile) char* rkfile;
int sj3_rkinit_euc(char * rkfile)
{
return sj3_rkinit_sub(rkfile, rcode_euc_init);
}
sj3_rkinit_mb(rkfile) char* rkfile;
int sj3_rkinit_mb(char * rkfile)
{
if(current_locale == LC_CTYPE_EUC)
return sj3_rkinit_sub(rkfile, rcode_euc_init);
@ -460,8 +454,7 @@ sj3_rkinit_mb(rkfile) char* rkfile;
return sj3_rkinit_sub(rkfile, rcode_sjis_init);
}
sj3_rkinit_sub(rkfile, mbfunc) char* rkfile;
int (*mbfunc)();
int sj3_rkinit_sub(char* rkfile, int (*mbfunc)())
{
char* p;
int len, klen, rlen, retv;
@ -525,11 +518,7 @@ int (*mbfunc)();
sj3_rkclear();
return (retv);
}
char* getkey(istr, ostr, len)
char* istr;
wchar16_t* ostr;
int* len;
char* getkey(char * istr, wchar16_t * ostr, int * len)
{
char c, *p;
int i;
@ -580,11 +569,7 @@ int* len;
return (p);
return (NULL);
}
char* rkgetyomi(istr, ostr, len)
char* istr;
wchar16_t* ostr;
int* len;
char* rkgetyomi(char * istr, wchar16_t * ostr, int * len)
{
unsigned char c;
unsigned char* p;
@ -640,8 +625,8 @@ int* len;
return ((char*)p);
return (NULL);
}
cltable() {
int cltable(void)
{
int i;
if(rkpp != NULL) {
@ -657,11 +642,7 @@ cltable() {
yhp = ymipp->ymibuf;
}
}
chk_rstr(rstr, rkey, rlen, klen)
wchar16_t* rstr,
*rkey;
int rlen, klen;
int chk_rstr(wchar16_t * rstr, wchar16_t * rkey, int rlen, int klen)
{
int i;
wchar16_t* p;
@ -678,8 +659,8 @@ int rlen, klen;
return (1);
}
RkTablW16*
rkalloc() {
RkTablW16* rkalloc(void)
{
RkTablW16* rkp;
RkbufRec* rkbrp;
@ -710,11 +691,7 @@ rkalloc() {
rkp->next = NULL;
return (rkp);
}
stradd(cp, str, len)
wchar16_t** cp;
wchar16_t* str;
int len;
int stradd(wchar16_t ** cp, wchar16_t * str, int len)
{
wchar16_t* strp;
StrbufRec* sbrp;
@ -745,11 +722,7 @@ int len;
shp += len;
return (0);
}
kstradd(cp, kstr, len)
wchar16_t** cp,
*kstr;
int len;
int kstradd(wchar16_t ** cp, wchar16_t * kstr, int len)
{
int i;
wchar16_t* usp;
@ -782,10 +755,7 @@ int len;
return (0);
}
RkTablW16*
mktable(key, len)
wchar16_t* key;
int len;
RkTablW16* mktable(wchar16_t * key, int len)
{
int i;
RkTablW16 * nrktp, *orktp;
@ -828,27 +798,23 @@ int len;
}
return (rktp);
}
sj3_rkebell(err) int err;
int sj3_rkebell(int err)
{
rk_errin = err;
}
sj3_rkclear() {
int sj3_rkclear(void)
{
rline[0] = NSTR;
lstr[0] = NSTR;
rktblp = NULL;
rk_klen = 0;
sj3_rkreset();
}
sj3_rkreset() {
int sj3_rkreset(void)
{
rk_cflag = -1;
}
sj3_rkconvc(c, rkstr)
wchar16_t c;
unsigned int* rkstr;
int sj3_rkconvc(wchar16_t c, unsigned int * rkstr)
{
int i;
wchar16_t * p, *q;
@ -916,11 +882,7 @@ unsigned int* rkstr;
}
*rkstr = RKEND;
}
sj3_rkconv2(wstr, kstr, wlen)
wchar16_t* wstr;
unsigned int* kstr;
int wlen;
int sj3_rkconv2(wchar16_t * wstr, unsigned int * kstr, int wlen)
{
int i;
@ -1014,9 +976,7 @@ int wlen;
}
int sj3_rkconv_w16(wchar16_t*, wchar16_t*);
sj3_rkconv(romaji, kana) unsigned char* romaji;
unsigned char* kana;
int sj3_rkconv(unsigned char * romaji, unsigned char * kana)
{
wchar16_t* wstr;
int len, mflag = 0, ret;
@ -1059,9 +1019,7 @@ unsigned char* kana;
return len;
}
}
sj3_rkconv_euc(romaji, kana) unsigned char* romaji;
unsigned char* kana;
int sj3_rkconv_euc(unsigned char * romaji, unsigned char * kana)
{
wchar16_t* wstr;
int len, mflag = 0, ret;
@ -1104,19 +1062,14 @@ unsigned char* kana;
return len;
}
}
sj3_rkconv_mb(romaji, kana) unsigned char* romaji;
unsigned char* kana;
int sj3_rkconv_mb(unsigned char * romaji, unsigned char * kana)
{
if(current_locale == LC_CTYPE_EUC)
return sj3_rkconv_euc(romaji, kana);
else
return sj3_rkconv(romaji, kana);
}
int sj3_rkconv_w16(wstr, kstr)
wchar16_t* wstr;
wchar16_t* kstr;
int sj3_rkconv_w16(wchar16_t * wstr, wchar16_t * kstr)
{
int i;
@ -1175,11 +1128,7 @@ wchar16_t* kstr;
*kstr = NSTR;
return (rlen);
}
rkmatch(s1, s2, len)
wchar16_t* s1,
*s2;
int len;
int rkmatch(wchar16_t * s1, wchar16_t * s2, int len)
{
int i;