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

5
cmpstr.c
View file

@ -30,10 +30,7 @@
#include "sj_rename.h" #include "sj_rename.h"
#include "const.h" #include "const.h"
#include "sj_typedef.h" #include "sj_typedef.h"
int cmpstr(unsigned char * src, unsigned char * dst)
int cmpstr(src, dst)
unsigned char* src;
unsigned char* dst;
{ {
while(*src) { while(*src) {
if(*src != *dst) return FALSE; if(*src != *dst) return FALSE;

20
code.c
View file

@ -41,10 +41,7 @@ static unsigned char cbuf[5];
static int cur_code = CODE_EUC; static int cur_code = CODE_EUC;
extern int current_locale; extern int current_locale;
static int ccnt = 0; static int ccnt = 0;
int codeconv(wchar16_t c, unsigned int * rkstr)
codeconv(c, rkstr)
wchar16_t c;
unsigned int* rkstr;
{ {
unsigned short ccode, i; unsigned short ccode, i;
unsigned short CheckCcode(); unsigned short CheckCcode();
@ -82,9 +79,7 @@ unsigned int* rkstr;
*rkstr = RKEND; *rkstr = RKEND;
} }
unsigned short unsigned short CheckCcode(wchar16_t c)
CheckCcode(c)
wchar16_t c;
{ {
unsigned char c1; unsigned char c1;
unsigned short code; unsigned short code;
@ -141,8 +136,8 @@ wchar16_t c;
return (code); return (code);
} }
unsigned short unsigned short strtocode(void)
strtocode() { {
int c; int c;
unsigned short code; unsigned short code;
@ -189,12 +184,11 @@ void ChangeCode(void) {
cur_code++; cur_code++;
} }
} }
int SetCode(int code)
SetCode(code) int code;
{ {
cur_code = code; cur_code = code;
} }
int GetCcode(void)
GetCcode() { {
return (cur_code); return (cur_code);
} }

25
codecnv.c
View file

@ -35,8 +35,8 @@
#include "sjtool.h" #include "sjtool.h"
static int euc_mode; static int euc_mode;
int init_code(void)
int init_code() { {
char* loc; char* loc;
#ifdef LACKOF_SETLOCALE #ifdef LACKOF_SETLOCALE
@ -65,8 +65,7 @@ int init_code() {
return 1; return 1;
} }
void void cnvcode(unsigned char * s)
cnvcode(s) unsigned char* s;
{ {
if(euc_mode) { if(euc_mode) {
unsigned short i; unsigned short i;
@ -97,19 +96,13 @@ void
} }
} }
void void printout_mb(FILE * fp, unsigned char * s)
printout_mb(fp, s)
FILE* fp;
unsigned char* s;
{ {
fputs((char*)s, fp); fputs((char*)s, fp);
fflush(fp); fflush(fp);
} }
void void printout(FILE * fp, unsigned char * s)
printout(fp, s)
FILE* fp;
unsigned char* s;
{ {
unsigned char buf[BUFSIZ]; unsigned char buf[BUFSIZ];
@ -121,9 +114,7 @@ unsigned char* s;
fflush(fp); fflush(fp);
} }
void void normal_out(char * fmt, int p1, int p2, int p3, int p4, int p5)
normal_out(fmt, p1, p2, p3, p4, p5) char* fmt;
int p1, p2, p3, p4, p5;
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
@ -131,9 +122,7 @@ int p1, p2, p3, p4, p5;
printout(stdout, buf); printout(stdout, buf);
} }
void void error_out(char * fmt, int p1, int p2, int p3, int p4, int p5)
error_out(fmt, p1, p2, p3, p4, p5) char* fmt;
int p1, p2, p3, p4, p5;
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];

40
common.c
View file

@ -39,8 +39,8 @@ int flush_conversion;
Conversion* current_conversion; Conversion* current_conversion;
Conversion* default_conversion; Conversion* default_conversion;
Conversion* Conversion* AllocConversion(void)
AllocConversion() { {
Conversion* c; Conversion* c;
if((c = (Conversion*)malloc(sizeof(Conversion))) == NULL) { if((c = (Conversion*)malloc(sizeof(Conversion))) == NULL) {
@ -65,53 +65,45 @@ AllocConversion() {
} }
static Conversion* push_conversion; static Conversion* push_conversion;
int FreeConversion(Conversion * c)
FreeConversion(c)
Conversion* c;
{ {
if(c == push_conversion) if(c == push_conversion)
push_conversion = 0; push_conversion = 0;
free(c); free(c);
} }
int SetConversion(Conversion * c)
SetConversion(c)
Conversion* c;
{ {
PushConversion(current_conversion); PushConversion(current_conversion);
current_conversion = c; current_conversion = c;
} }
int PushConversion(Conversion * c)
PushConversion(c)
Conversion* c;
{ {
push_conversion = c; push_conversion = c;
} }
int PopConversion(void)
PopConversion() { {
if(push_conversion) if(push_conversion)
current_conversion = push_conversion; current_conversion = push_conversion;
} }
Conversion* Conversion* GetConversion(void)
GetConversion() { {
return (current_conversion); return (current_conversion);
} }
int InitConversion(void)
InitConversion() { {
default_conversion = AllocConversion(); default_conversion = AllocConversion();
DefaultConversion(); DefaultConversion();
} }
int DefaultConversion(void)
DefaultConversion() { {
current_conversion = default_conversion; current_conversion = default_conversion;
} }
int EndConversion(void)
EndConversion() { {
free(default_conversion); free(default_conversion);
} }
int wcbyte(wchar16_t * str)
int wcbyte(str)
wchar16_t* str;
{ {
count = 0; count = 0;

7
compats.c
View file

@ -1939,11 +1939,8 @@ void* memmem(const void* l, size_t l_len, const void* s, size_t s_len) {
#include <string.h> #include <string.h>
/* /* * Reverse memchr(void)
* Reverse memchr() {
* Find the last occurrence of 'c' in the buffer 's' of size 'n'.
*/
void* memrchr(const void* s, int c, size_t n) {
const unsigned char* cp; const unsigned char* cp;
if(n != 0) { if(n != 0) {

26
conv.c
View file

@ -121,13 +121,13 @@ extern int master;
extern wchar16_t Ukey[UKEYNUM][SEQLEN + 1]; extern wchar16_t Ukey[UKEYNUM][SEQLEN + 1];
extern int Uvalue[]; extern int Uvalue[];
extern int Unumber; extern int Unumber;
int convert_stat(void)
convert_stat() { {
stat_init(); stat_init();
stat_conv(); stat_conv();
} }
int inputprocess(void)
inputprocess() { {
int c; int c;
wchar16_t obuf[2]; wchar16_t obuf[2];
@ -164,8 +164,8 @@ wchar16_t pars_seq[KEYBUFSIZ];
int buf_count = 0; int buf_count = 0;
int pars_n; int pars_n;
static int escape = 0; static int escape = 0;
int inkey(void)
inkey() { {
Conversion* cv; Conversion* cv;
int i, j; int i, j;
wchar16_t c; wchar16_t c;
@ -217,10 +217,7 @@ inkey() {
} }
return (c); return (c);
} }
int sequence(wchar16_t * buf, int * count)
sequence(buf, count)
wchar16_t* buf;
int* count;
{ {
int n; int n;
@ -258,11 +255,7 @@ int* count;
} }
} }
} }
int parse_escape(wchar16_t * s, int * count, int more)
parse_escape(s, count, more)
wchar16_t* s;
int* count;
int more;
{ {
int i, j; int i, j;
wchar16_t temp[KEYBUFSIZ]; wchar16_t temp[KEYBUFSIZ];
@ -335,8 +328,7 @@ int more;
return (KEY_OTHER); return (KEY_OTHER);
} }
} }
int write_pseq(int mod)
write_pseq(mod) int mod;
{ {
if(mod == 3) { if(mod == 3) {

4
cvtclknj.c
View file

@ -30,8 +30,8 @@
#include "sj_kcnv.h" #include "sj_kcnv.h"
void cvtkouho(), setstyrec(); void cvtkouho(), setstyrec();
void cvtclknj(void)
void cvtclknj() { {
KHREC* krec; KHREC* krec;
int i; int i;

3
dictdisp.c
View file

@ -31,8 +31,7 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
void void dictdisp(char * output)
dictdisp(output) char* output;
{ {
unsigned char buf[BUFSIZ]; unsigned char buf[BUFSIZ];
unsigned char* p; unsigned char* p;

6
dictmake.c
View file

@ -45,8 +45,7 @@
extern int force_flag; extern int force_flag;
extern int verbose_flag; extern int verbose_flag;
extern int _sys_code; extern int _sys_code;
static void touroku(char * y, char * k, char * h)
static void touroku(y, k, h) char *y, *k, *h;
{ {
int err; int err;
int grm; int grm;
@ -124,8 +123,7 @@ static void touroku(y, k, h) char *y, *k, *h;
} }
} }
void void dictmake(char * input)
dictmake(input) char* input;
{ {
unsigned char buf[BUFSIZ]; unsigned char buf[BUFSIZ];
FILE* fp; FILE* fp;

93
display.c
View file

@ -45,8 +45,8 @@ int status_line;
char * CM, *US, *UE, *SO, *SE, *CE, *CS, *BEL, *RP, *AP, *TS, *FS, *DS, *I2; char * CM, *US, *UE, *SO, *SE, *CE, *CS, *BEL, *RP, *AP, *TS, *FS, *DS, *I2;
char * SC, *RC, *SR, *DO; char * SC, *RC, *SR, *DO;
static int keyboard = OTHER_KB; static int keyboard = OTHER_KB;
int checkterm(void)
checkterm() { {
char * kb, *area, *tgetstr(), *tmp; char * kb, *area, *tgetstr(), *tmp;
int val; int val;
Conversion* cv; Conversion* cv;
@ -142,8 +142,7 @@ checkterm() {
strcpy(cmove, CM); strcpy(cmove, CM);
} }
void outc(char c)
void outc(c) char c;
{ {
putchar(c); putchar(c);
} }
@ -151,32 +150,31 @@ void outc(c) char c;
void erroutc(c) { void erroutc(c) {
fputc(c, stderr); fputc(c, stderr);
} }
int start_guideline(void)
start_guideline() { {
if(status_line && I2) if(status_line && I2)
tputs(I2, 1, erroutc); tputs(I2, 1, erroutc);
} }
int end_guideline(void)
end_guideline() { {
if(status_line) { if(status_line) {
tputs(DS, 1, outc); tputs(DS, 1, outc);
fflush(stdout); fflush(stdout);
} }
} }
int put_space(int n)
put_space(n) int n;
{ {
int i; int i;
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
putchar(' '); putchar(' ');
} }
int Backspace(void)
Backspace() { {
putchar(BS); putchar(BS);
} }
int master_flush(void)
master_flush() { {
SELECT_FD ifds; SELECT_FD ifds;
int nc; int nc;
struct timeval t; struct timeval t;
@ -203,8 +201,8 @@ master_flush() {
} while(nc > 0); } while(nc > 0);
return (0); return (0);
} }
int ThroughIntr(void)
ThroughIntr() { {
wchar16_t s[2]; wchar16_t s[2];
SJ_read(s, 1); SJ_read(s, 1);
@ -217,35 +215,33 @@ ThroughIntr() {
return (0); return (0);
} }
} }
int under_in(void)
under_in() { {
tputs(US, 1, outc); tputs(US, 1, outc);
} }
int under_out(void)
under_out() { {
tputs(UE, 1, outc); tputs(UE, 1, outc);
} }
int reverse_in(void)
reverse_in() { {
tputs(SO, 1, outc); tputs(SO, 1, outc);
} }
int reverse_out(void)
reverse_out() { {
tputs(SE, 1, outc); tputs(SE, 1, outc);
} }
int beep(void)
beep() { {
tputs(BEL, 1, outc); tputs(BEL, 1, outc);
Flush(); Flush();
} }
int CursorSet(unsigned short row, unsigned short col)
CursorSet(row, col) unsigned short row, col;
{ {
tputs(tgoto(CM, col - 1, row - 1), 1, outc); tputs(tgoto(CM, col - 1, row - 1), 1, outc);
Flush(); Flush();
} }
int RegionSet(int row1, int row2)
RegionSet(row1, row2) int row1, row2;
{ {
tputs(SC, 1, outc); tputs(SC, 1, outc);
@ -264,8 +260,7 @@ RegionSet(row1, row2) int row1, row2;
#define CRLIMIT 4 #define CRLIMIT 4
int master_flush_flag = 1; int master_flush_flag = 1;
int CursorRead(unsigned short * row, unsigned short * col)
CursorRead(row, col) unsigned short* row, *col;
{ {
int count; int count;
@ -298,9 +293,7 @@ CursorRead(row, col) unsigned short* row, *col;
#define BACKLIM 16 #define BACKLIM 16
#define MARKER '%' #define MARKER '%'
#define SEPARA ';' #define SEPARA ';'
int CRP(int * row, int * col)
CRP(row, col)
int *row, *col;
{ {
char * sa, *sd; char * sa, *sd;
int c; int c;
@ -364,10 +357,7 @@ top:
return (SUCC); return (SUCC);
} }
int unget_inkey2(wchar16_t * s, int n)
unget_inkey2(s, n)
wchar16_t* s;
int n;
{ {
extern wchar16_t ibuf[]; extern wchar16_t ibuf[];
extern int buf_count; extern int buf_count;
@ -378,28 +368,26 @@ int n;
ibuf[buf_count++] = *(s++); ibuf[buf_count++] = *(s++);
} }
} }
int unget_key(int c)
unget_key(c) int c;
{ {
wchar16_t tmp[2]; wchar16_t tmp[2];
tmp[0] = c; tmp[0] = c;
unget_inkey2(tmp, 1); unget_inkey2(tmp, 1);
} }
int CRI(void)
CRI() { {
wchar16_t c; wchar16_t c;
SJ_read(&c, 1); SJ_read(&c, 1);
return (c); return (c);
} }
int Clear_EOL(void)
Clear_EOL() { {
reverse_out(); reverse_out();
tputs(CE, 1, outc); tputs(CE, 1, outc);
} }
int StartGuide(unsigned short * row, unsigned short * col)
StartGuide(row, col) unsigned short* row, *col;
{ {
Conversion* cv; Conversion* cv;
@ -413,8 +401,7 @@ StartGuide(row, col) unsigned short* row, *col;
} }
Flush(); Flush();
} }
int EndGuide(unsigned short row, unsigned short col)
EndGuide(row, col) unsigned short row, col;
{ {
if(status_line) { if(status_line) {
tputs(FS, 1, outc); tputs(FS, 1, outc);
@ -424,12 +411,12 @@ EndGuide(row, col) unsigned short row, col;
Flush(); Flush();
master_flush_flag = 1; master_flush_flag = 1;
} }
int Flush(void)
Flush() { {
fflush(stdout); fflush(stdout);
} }
int Cscroll(void)
Cscroll() { {
return (1); return (1);
} }

54
douon.c
View file

@ -38,13 +38,7 @@ static struct douon_sj3 HenkanDouon[DOUON_N];
static wchar16_t Dkanji[BUFFLENGTH * 2]; static wchar16_t Dkanji[BUFFLENGTH * 2];
void go_gakushuu(); void go_gakushuu();
int SJ_getdouon(wchar16_t * s, struct douon_sj3 * d, int n, int choice, int reconv)
SJ_getdouon(s, d, n, choice, reconv)
wchar16_t* s;
struct douon_sj3* d;
int n;
int choice;
int reconv;
{ {
int len; int len;
@ -63,8 +57,8 @@ int reconv;
} else } else
return (1); return (1);
} }
int exec_douon(void)
exec_douon() { {
Conversion* cv; Conversion* cv;
int val; int val;
@ -81,8 +75,7 @@ exec_douon() {
if(!val) if(!val)
Rdisp(); Rdisp();
} }
int wrap_douon(int back)
wrap_douon(back) int back;
{ {
Conversion* cv; Conversion* cv;
int val; int val;
@ -102,10 +95,7 @@ wrap_douon(back) int back;
if(!val) if(!val)
Rdisp(); Rdisp();
} }
int Cdouon(wchar16_t * yomi, int gnum)
Cdouon(yomi, gnum)
wchar16_t* yomi;
int gnum;
{ {
int i, j; int i, j;
@ -229,8 +219,7 @@ int gnum;
return (TRUE); return (TRUE);
} }
int Dselect(int lim)
Dselect(lim) int lim;
{ {
extern int keyvalue; extern int keyvalue;
int c, num; int c, num;
@ -263,12 +252,7 @@ Dselect(lim) int lim;
} }
return (lim + 1); return (lim + 1);
} }
int Gdouon(wchar16_t * yomi, int num, int choice, int reconv)
Gdouon(yomi, num, choice, reconv)
wchar16_t* yomi;
int num;
int choice;
int reconv;
{ {
int len; int len;
@ -284,8 +268,7 @@ int reconv;
if(HenkanDouon[Dpoint].valid) if(HenkanDouon[Dpoint].valid)
PushGD(num, &HenkanDouon[Dpoint].dcid); PushGD(num, &HenkanDouon[Dpoint].dcid);
} }
int Sdouon(int Choice)
Sdouon(Choice) int Choice;
{ {
Conversion* cv; Conversion* cv;
int i, j; int i, j;
@ -356,8 +339,7 @@ tail:
cv->Bkettei[cv->Bnum] = Bend; cv->Bkettei[cv->Bnum] = Bend;
return (0); return (0);
} }
int Rdouon(int back)
Rdouon(back) int back;
{ {
Conversion* cv; Conversion* cv;
int i, j; int i, j;
@ -388,9 +370,7 @@ Rdouon(back) int back;
} }
return (1); return (1);
} }
int Bkanji(wchar16_t * kanji)
Bkanji(kanji)
wchar16_t* kanji;
{ {
Conversion* cv; Conversion* cv;
int i; int i;
@ -411,14 +391,12 @@ Bkanji(kanji)
} }
struct studyrec Gdata[BUFFLENGTH]; struct studyrec Gdata[BUFFLENGTH];
int PushGD(int num, struct studyrec * wordid)
PushGD(num, wordid) int num;
struct studyrec* wordid;
{ {
Gdata[num] = *wordid; Gdata[num] = *wordid;
} }
int cl_gakushuu(void)
cl_gakushuu() { {
Conversion* cv; Conversion* cv;
int i, j; int i, j;
int o_point, n_point; int o_point, n_point;
@ -441,8 +419,7 @@ cl_gakushuu() {
} }
} }
} }
int check_and_gakushuu(int m, int n)
check_and_gakushuu(m, n) int m, n;
{ {
Conversion* cv; Conversion* cv;
int i, j; int i, j;
@ -458,8 +435,7 @@ check_and_gakushuu(m, n) int m, n;
} }
} }
void void go_gakushuu(int n)
go_gakushuu(n) int n;
{ {
Conversion* cv; Conversion* cv;
int i, j; int i, j;

71
edit.c
View file

@ -35,8 +35,7 @@ void Chain();
static wchar16_t* jpoint; static wchar16_t* jpoint;
static int iedit, jedit; static int iedit, jedit;
static int ilen, jlen; static int ilen, jlen;
int push_obj(int i, int j)
push_obj(i, j) int i, j;
{ {
Conversion* cv; Conversion* cv;
@ -47,8 +46,7 @@ push_obj(i, j) int i, j;
iedit = cv->Bkettei[i]; iedit = cv->Bkettei[i];
jedit = cv->Bkettei[j]; jedit = cv->Bkettei[j];
} }
int pop_obj(int i, int j)
pop_obj(i, j) int i, j;
{ {
Conversion* cv; Conversion* cv;
@ -59,8 +57,8 @@ pop_obj(i, j) int i, j;
cv->Bkettei[i] = iedit; cv->Bkettei[i] = iedit;
cv->Bkettei[j] = jedit; cv->Bkettei[j] = jedit;
} }
int Bbig(void)
Bbig() { {
Conversion* cv; Conversion* cv;
int i, j, k; int i, j, k;
int moji, last, val; int moji, last, val;
@ -116,8 +114,7 @@ Bbig() {
pop_obj(i, j); pop_obj(i, j);
return (0); return (0);
} }
int Bsmall(int small)
Bsmall(small) int small;
{ {
Conversion* cv; Conversion* cv;
int i, j, k, moji; int i, j, k, moji;
@ -211,8 +208,8 @@ Bsmall(small) int small;
} }
return (0); return (0);
} }
void Bdelete(void)
void Bdelete() { {
Conversion* cv; Conversion* cv;
int i, j, deletelen, val; int i, j, deletelen, val;
@ -259,9 +256,7 @@ void Bdelete() {
} }
} }
void void Chain(int n, int len)
Chain(n, len) int n;
int len;
{ {
Conversion* cv; Conversion* cv;
int i; int i;
@ -306,7 +301,8 @@ int len;
static int Elimit; static int Elimit;
static int Ehlimit; static int Ehlimit;
exec_edit() { int exec_edit(void)
{
Conversion* cv; Conversion* cv;
int edit, inc, i; int edit, inc, i;
wchar16_t* s; wchar16_t* s;
@ -559,10 +555,7 @@ exec_edit() {
} }
return (0); return (0);
} }
int getnum(wchar16_t number[], int * numpoint)
getnum(number, numpoint)
wchar16_t number[];
int* numpoint;
{ {
char temp[3]; char temp[3];
int i = 0; int i = 0;
@ -577,12 +570,7 @@ int* numpoint;
return (atoi(temp)); return (atoi(temp));
} }
int Replace(wchar16_t * Hs, wchar16_t * Zs, unsigned short * omode, int cur, int num)
Replace(Hs, Zs, omode, cur, num)
wchar16_t* Hs,
*Zs;
unsigned short* omode;
int cur, num;
{ {
int i, len, inc; int i, len, inc;
int beep_on, icur1, icur2; int beep_on, icur1, icur2;
@ -655,12 +643,7 @@ int cur, num;
beep(); beep();
return (num); return (num);
} }
int Substitute(wchar16_t * Hs, wchar16_t * Zs, unsigned short * omode, int * cur, int num)
Substitute(Hs, Zs, omode, cur, num)
wchar16_t* Hs,
*Zs;
unsigned short* omode;
int * cur, num;
{ {
wchar16_t work[DLEN + 1]; wchar16_t work[DLEN + 1];
wchar16_t work2[DLEN + 1]; wchar16_t work2[DLEN + 1];
@ -684,12 +667,7 @@ int * cur, num;
len -= num; len -= num;
return (len); return (len);
} }
int Insert(wchar16_t * Hs, wchar16_t * Zs, unsigned short * omode, int cur)
Insert(Hs, Zs, omode, cur)
wchar16_t* Hs,
*Zs;
unsigned short* omode;
int cur;
{ {
int inc, len, i; int inc, len, i;
int limit, hlimit, ylen, res, icur, rlen; int limit, hlimit, ylen, res, icur, rlen;
@ -754,12 +732,7 @@ int cur;
} }
return (len); return (len);
} }
int EditDel(wchar16_t * Hs, wchar16_t * Zs, unsigned short * omode, int cur, int num)
EditDel(Hs, Zs, omode, cur, num)
wchar16_t* Hs,
*Zs;
unsigned short* omode;
int cur, num;
{ {
int i, j; int i, j;
int icur, len, rlen; int icur, len, rlen;
@ -789,12 +762,7 @@ int cur, num;
} }
return (len); return (len);
} }
int chhstr(wchar16_t * Hs, wchar16_t * Zs, unsigned short * omode, int cur)
chhstr(Hs, Zs, omode, cur)
wchar16_t* Hs,
*Zs;
unsigned short* omode;
int cur;
{ {
int i, j, len; int i, j, len;
int prep, nextp; int prep, nextp;
@ -820,9 +788,7 @@ int cur;
wscpy(hkp, &Hs[hnextp]); wscpy(hkp, &Hs[hnextp]);
wscpy(&Hs[hprep], hkana); wscpy(&Hs[hprep], hkana);
} }
int Print_EOL(wchar16_t * s)
Print_EOL(s)
wchar16_t* s;
{ {
if(*s != '\0') if(*s != '\0')
SJ_print(s); SJ_print(s);
@ -830,8 +796,7 @@ Print_EOL(s)
if(*s != '\0') if(*s != '\0')
backspace(wcbyte(s)); backspace(wcbyte(s));
} }
int backspace(int n)
backspace(n) int n;
{ {
int i; int i;

46
etc.c
View file

@ -36,8 +36,7 @@ extern char* cur_serv;
static int dcflag = 0; static int dcflag = 0;
void disp_version(); void disp_version();
int exec_etc(int key)
exec_etc(key) int key;
{ {
unsigned short row, col; unsigned short row, col;
int inc; int inc;
@ -148,8 +147,7 @@ exec_etc(key) int key;
Ssbun(1); Ssbun(1);
return (KEY_NORMAL); return (KEY_NORMAL);
} }
int Ssbun(int flag)
Ssbun(flag) int flag;
{ {
Conversion* cv; Conversion* cv;
static short ScurBun, SpreBun; static short ScurBun, SpreBun;
@ -166,8 +164,7 @@ Ssbun(flag) int flag;
SpreBun = cv->PreBun; SpreBun = cv->PreBun;
} }
} }
int etc_map(int key)
etc_map(key) int key;
{ {
extern int u_etckeys; extern int u_etckeys;
extern int Uetckey[], Uetcval[]; extern int Uetckey[], Uetcval[];
@ -204,8 +201,8 @@ etc_map(key) int key;
} }
return (val); return (val);
} }
int helplevel(void)
helplevel() { {
wchar16_t wtmp[BUFFLENGTH]; wchar16_t wtmp[BUFFLENGTH];
unsigned char mtmp[BUFFLENGTH]; unsigned char mtmp[BUFFLENGTH];
unsigned char tmp[BUFFLENGTH]; unsigned char tmp[BUFFLENGTH];
@ -229,8 +226,7 @@ helplevel() {
guide_print_pause(WCGHelp, wtmp); guide_print_pause(WCGHelp, wtmp);
} }
void void disp_version(int c)
disp_version(c) int c;
{ {
extern char *Version, *Copyright, *Date; extern char *Version, *Copyright, *Date;
char tmp[BUFFLENGTH]; char tmp[BUFFLENGTH];
@ -246,8 +242,8 @@ void
(void)mbstowcs(wtmp, tmp, BUFFLENGTH); (void)mbstowcs(wtmp, tmp, BUFFLENGTH);
guide_print_pause(0, wtmp); guide_print_pause(0, wtmp);
} }
int exec_sjrc(void)
exec_sjrc() { {
extern char RCfile[]; extern char RCfile[];
char tmp[BUFFLENGTH]; char tmp[BUFFLENGTH];
unsigned char SUCCorFAIL[BUFFLENGTH]; unsigned char SUCCorFAIL[BUFFLENGTH];
@ -278,8 +274,8 @@ exec_sjrc() {
static int weight = 3; static int weight = 3;
static int seed = 100000; static int seed = 100000;
int change_weight(void)
change_weight() { {
int c; int c;
char s[2]; char s[2];
char tmp[BUFFLENGTH]; char tmp[BUFFLENGTH];
@ -297,8 +293,7 @@ change_weight() {
weight = atoi(s); weight = atoi(s);
} }
} }
int UsecWeight(int sw)
UsecWeight(sw) int sw;
{ {
if(sw) if(sw)
@ -306,8 +301,7 @@ UsecWeight(sw) int sw;
else else
return (seed * weight); return (seed * weight);
} }
int dconnect(int aflag)
dconnect(aflag) int aflag;
{ {
int err; int err;
char tmp[BUFFLENGTH]; char tmp[BUFFLENGTH];
@ -337,17 +331,16 @@ dconnect(aflag) int aflag;
} }
return (dcflag); return (dcflag);
} }
int set_dcflag(int flag)
set_dcflag(flag) int flag;
{ {
dcflag = flag; dcflag = flag;
} }
int IsDcflag(void)
IsDcflag() { {
return (dcflag); return (dcflag);
} }
int reconnect(void)
reconnect() { {
int inc, err; int inc, err;
char tmp[BUFFLENGTH], *hp; char tmp[BUFFLENGTH], *hp;
char newserv[SHORTLENGTH * 2], *nsp; char newserv[SHORTLENGTH * 2], *nsp;
@ -434,10 +427,7 @@ reconnect() {
} }
return (1); return (1);
} }
int guide_print_pause(wchar16_t * s1, wchar16_t * s2)
guide_print_pause(s1, s2)
wchar16_t* s1,
*s2;
{ {
int c; int c;

28
eucmessage.c
View file

@ -249,8 +249,8 @@ wchar16_t* WcMessages[CURMESSAGES];
#define CURWCVTKEY 29 #define CURWCVTKEY 29
struct wcvtkey wcvtkeytbl[CURWCVTKEY]; struct wcvtkey wcvtkeytbl[CURWCVTKEY];
int init_wcvtkey(void)
int init_wcvtkey() { {
int i = 0; int i = 0;
for(i = 0; i < CURWCVTKEY; i++) { for(i = 0; i < CURWCVTKEY; i++) {
@ -288,8 +288,8 @@ int init_wcvtkey() {
} }
wchar16_t* comstr[KEY_OTHER]; wchar16_t* comstr[KEY_OTHER];
int init_comstr(void)
int init_comstr() { {
comstr[0] = WCStart; comstr[0] = WCStart;
comstr[1] = WCHenkan; comstr[1] = WCHenkan;
comstr[2] = WCMuhen; comstr[2] = WCMuhen;
@ -328,8 +328,8 @@ int init_comstr() {
} }
struct valtbl hin_val[5]; struct valtbl hin_val[5];
int init_hin_val(void)
int init_hin_val() { {
hin_val[0].keyword = WCMeishi; hin_val[0].keyword = WCMeishi;
hin_val[0].ivalue = SJ3_H_NRMNOUN; hin_val[0].ivalue = SJ3_H_NRMNOUN;
hin_val[1].keyword = WCMyouji; hin_val[1].keyword = WCMyouji;
@ -350,8 +350,8 @@ extern int set_func(), set_etckeys(), set_intr(),
set_dict(); set_dict();
#define CURFUNCS 29 #define CURFUNCS 29
struct functbl funcs[CURFUNCS]; struct functbl funcs[CURFUNCS];
int init_funcs(void)
int init_funcs() { {
funcs[0].keyword = WCKey; funcs[0].keyword = WCKey;
funcs[0].func = set_func; funcs[0].func = set_func;
funcs[1].keyword = WCEscape; funcs[1].keyword = WCEscape;
@ -401,8 +401,8 @@ int init_funcs() {
} }
struct valtbl mode_val[5]; struct valtbl mode_val[5];
int init_mode_val(void)
int init_mode_val() { {
mode_val[0].keyword = WCHalpha; mode_val[0].keyword = WCHalpha;
mode_val[0].ivalue = MODE_HALPHA; mode_val[0].ivalue = MODE_HALPHA;
mode_val[1].keyword = WCZalpha; mode_val[1].keyword = WCZalpha;
@ -416,8 +416,8 @@ int init_mode_val() {
} }
struct valtbl code_val[8]; struct valtbl code_val[8];
int init_code_val(void)
int init_code_val() { {
code_val[0].keyword = WCShiftjis; code_val[0].keyword = WCShiftjis;
code_val[0].ivalue = CODE_SJIS; code_val[0].ivalue = CODE_SJIS;
code_val[1].keyword = WCSjis; code_val[1].keyword = WCSjis;
@ -435,8 +435,8 @@ int init_code_val() {
code_val[7].keyword = WCKuten2; code_val[7].keyword = WCKuten2;
code_val[7].ivalue = CODE_KUTEN2; code_val[7].ivalue = CODE_KUTEN2;
} }
int init_messages(void)
int init_messages() { {
#define LOCALELEN 20 #define LOCALELEN 20
char cur_loc[LOCALELEN]; char cur_loc[LOCALELEN];
char* loc; char* loc;

24
fuzoku.c
View file

@ -34,11 +34,7 @@
CLREC* argclrec(); CLREC* argclrec();
int terminate(); int terminate();
static int fzkstrcmp(unsigned char * yptr, unsigned char * fzkp, int * saml)
static int fzkstrcmp(yptr, fzkp, saml)
unsigned char* yptr;
unsigned char* fzkp;
int* saml;
{ {
int asklen, nkrlen; int asklen, nkrlen;
@ -71,11 +67,7 @@ int* saml;
return MATCH; return MATCH;
} }
void setclrec(JREC * jrec, unsigned char * yptr, TypeCnct right)
void setclrec(jrec, yptr, right)
JREC* jrec;
unsigned char* yptr;
TypeCnct right;
{ {
CLREC* new; CLREC* new;
TypeGram hinshi; TypeGram hinshi;
@ -151,10 +143,7 @@ TypeCnct right;
} else } else
new->kubun = K_TAIGEN; new->kubun = K_TAIGEN;
} }
static int fzkcnct(TypeCnct right, TypeCnct left)
static int fzkcnct(right, left)
TypeCnct right;
TypeCnct left;
{ {
unsigned char* cncttbl; unsigned char* cncttbl;
@ -167,12 +156,7 @@ TypeCnct left;
return FALSE; return FALSE;
} }
void srchfzk(JREC * jrec, unsigned char * yptr, TypeCnct right, int level)
void srchfzk(jrec, yptr, right, level)
JREC* jrec;
unsigned char* yptr;
TypeCnct right;
int level;
{ {
unsigned char* fzk; unsigned char* fzk;
int len = 0; int len = 0;

75
henkan.c
View file

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

8
hinshi.c
View file

@ -221,9 +221,7 @@ static struct hlist {
{TANKANJI, "\303\261\264\301"}, {TANKANJI, "\303\261\264\301"},
{IKKATU, "\260\354\263\347"}, {IKKATU, "\260\354\263\347"},
{0, 0}}; {0, 0}};
char* hns2str(int code)
char* hns2str(code)
int code;
{ {
struct hlist* p; struct hlist* p;
@ -234,9 +232,7 @@ int code;
return "ERROR"; return "ERROR";
} }
int str2hns(char * str)
int str2hns(str)
char* str;
{ {
struct hlist* p; struct hlist* p;

12
init.c
View file

@ -28,9 +28,7 @@
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
void seg_count(DICT * dict)
void seg_count(dict)
DICT* dict;
{ {
unsigned char* p; unsigned char* p;
unsigned char* q; unsigned char* q;
@ -49,9 +47,7 @@ void seg_count(dict)
dict->segunit = (segcnt == 0) ? 1 : segcnt; dict->segunit = (segcnt == 0) ? 1 : segcnt;
} }
void mkidxtbl(DICT * dict)
void mkidxtbl(dict)
DICT* dict;
{ {
unsigned char* p; unsigned char* p;
TypeDicSeg seg; TypeDicSeg seg;
@ -69,8 +65,8 @@ void mkidxtbl(dict)
while(*p++); while(*p++);
} }
} }
void initwork(void)
void initwork() { {
jrt1st = jrt2nd = maxjptr = (JREC*)0; jrt1st = jrt2nd = maxjptr = (JREC*)0;
clt1st = clt2nd = maxclptr = (CLREC*)0; clt1st = clt2nd = maxclptr = (CLREC*)0;
} }

20
kigou.c
View file

@ -40,8 +40,8 @@ static int lastcode = BEGIN_CODE;
static unsigned short row, col; static unsigned short row, col;
void input_kigou(); void input_kigou();
int kigou(void)
kigou() { {
extern int keyvalue; extern int keyvalue;
int increse, code, basecode; int increse, code, basecode;
int inc, ki, low; int inc, ki, low;
@ -177,16 +177,14 @@ kigou() {
disp_mode(); disp_mode();
return (rval); return (rval);
} }
int IsRedraw(int c)
IsRedraw(c) int c;
{ {
if(c == 0x0c) if(c == 0x0c)
return (1); return (1);
else else
return (0); return (0);
} }
int IsCKey(int inc)
IsCKey(inc) int inc;
{ {
switch(inc) { switch(inc) {
case 'l': case 'l':
@ -201,8 +199,7 @@ IsCKey(inc) int inc;
return (KEY_NORMAL); return (KEY_NORMAL);
} }
} }
int guide_kigou(int bcode, int code, int increse)
guide_kigou(bcode, code, increse) int bcode, code, increse;
{ {
int i; int i;
extern wchar16_t Mguide[]; extern wchar16_t Mguide[];
@ -232,8 +229,7 @@ guide_kigou(bcode, code, increse) int bcode, code, increse;
backspace(8 + (bcode + increse - code) * 2); backspace(8 + (bcode + increse - code) * 2);
Flush(); Flush();
} }
int pkigou(int code)
pkigou(code) int code;
{ {
wchar16_t tmp[3]; wchar16_t tmp[3];
unsigned short ccode; unsigned short ccode;
@ -254,9 +250,7 @@ pkigou(code) int code;
SJ_print(tmp); SJ_print(tmp);
} }
void void input_kigou(int basecode, int code, int increse)
input_kigou(basecode, code, increse) int basecode,
code, increse;
{ {
wchar16_t s[2]; wchar16_t s[2];
unsigned short ccode, svlen; unsigned short ccode, svlen;

61
libif.c
View file

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

21
memory2.c
View file

@ -30,9 +30,7 @@
#include "sj_kcnv.h" #include "sj_kcnv.h"
void free_jrec(), free_clrec(); void free_jrec(), free_clrec();
JREC* free_jlst(JREC * p)
JREC* free_jlst(p)
JREC* p;
{ {
JREC* jpk; JREC* jpk;
JREC* jp; JREC* jp;
@ -61,10 +59,7 @@ JREC* p;
return jpk; return jpk;
} }
CLREC* free_clst(CLREC * p, int l)
CLREC* free_clst(p, l)
CLREC* p;
int l;
{ {
CLREC* cpk; CLREC* cpk;
CLREC* cp; CLREC* cp;
@ -104,9 +99,7 @@ int l;
return cpk; return cpk;
} }
void free_clall(CLREC * p)
void free_clall(p)
CLREC* p;
{ {
CLREC* next; CLREC* next;
@ -117,9 +110,7 @@ void free_clall(p)
p = next; p = next;
} }
} }
void free_jall(JREC * p)
void free_jall(p)
JREC* p;
{ {
JREC* next; JREC* next;
@ -129,8 +120,8 @@ void free_jall(p)
p = next; p = next;
} }
} }
void freework(void)
void freework() { {
free_clall(maxclptr); free_clall(maxclptr);
clt1st = maxclptr = NULL; clt1st = maxclptr = NULL;

8
mk2claus.c
View file

@ -33,9 +33,7 @@
int terminate(), priority(); int terminate(), priority();
void mkjiritsu(), mkbunsetsu(), wakachi(), pritiny(); void mkjiritsu(), mkbunsetsu(), wakachi(), pritiny();
void free_clall(), free_jall(); void free_clall(), free_jall();
static int set2nd(CLREC * clrec)
static int set2nd(clrec)
CLREC* clrec;
{ {
CLREC* rec2; CLREC* rec2;
@ -56,8 +54,8 @@ CLREC* clrec;
return rec2 ? (clrec->cllen + rec2->cllen) : (clrec->cllen); return rec2 ? (clrec->cllen + rec2->cllen) : (clrec->cllen);
} }
void mk2claus(void)
void mk2claus() { {
unsigned char* keepptr; unsigned char* keepptr;
int keeplen; int keeplen;
CLREC* clrec; CLREC* clrec;

5
mvmemd.c
View file

@ -29,10 +29,7 @@
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
void mvmemd(unsigned char * src, unsigned char * dest, int len)
void mvmemd(src, dest, len) unsigned char* src;
unsigned char* dest;
int len;
{ {
while(len-- > 0) *(--dest) = *(--src); while(len-- > 0) *(--dest) = *(--src);
} }

5
mvmemi.c
View file

@ -29,10 +29,7 @@
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
void mvmemi(unsigned char * src, unsigned char * dest, int len)
void mvmemi(src, dest, len) unsigned char* src;
unsigned char* dest;
int len;
{ {
while(len-- > 0) *dest++ = *src++; while(len-- > 0) *dest++ = *src++;
} }

7
nmttyslot.c
View file

@ -37,8 +37,7 @@ static char* getttys();
static char* ttys = "/etc/ttys"; static char* ttys = "/etc/ttys";
#define NULL 0 #define NULL 0
int nmttyslot(char * name)
nmttyslot(name) char* name;
{ {
char *tp, *p; char *tp, *p;
int s, tf; int s, tf;
@ -63,9 +62,7 @@ nmttyslot(name) char* name;
return (0); return (0);
} }
static char* static char* getttys(int f)
getttys(f)
int f;
{ {
static char line[LINESIZE]; static char line[LINESIZE];
char* lp; char* lp;

26
priority.c
View file

@ -31,9 +31,7 @@
#include "sj_hinshi.h" #include "sj_hinshi.h"
#include "sj_right.h" #include "sj_right.h"
#include "sj_prty.h" #include "sj_prty.h"
static int isfukusi(TypeGram hinshi)
static int isfukusi(hinshi)
TypeGram hinshi;
{ {
if(FUKUSHI_1 <= hinshi && hinshi <= FUKUSHI_7) if(FUKUSHI_1 <= hinshi && hinshi <= FUKUSHI_7)
return TRUE; return TRUE;
@ -41,9 +39,7 @@ TypeGram hinshi;
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
static int istaigen(TypeCnct right)
static int istaigen(right)
TypeCnct right;
{ {
if(right == R_MEISHI || right == R_DMEISHI || right == R_SMEISHI1) if(right == R_MEISHI || right == R_DMEISHI || right == R_SMEISHI1)
return TRUE; return TRUE;
@ -53,10 +49,7 @@ TypeCnct right;
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
static int taicnt(TypeGram hinshi1, TypeGram hinshi2)
static int taicnt(hinshi1, hinshi2)
TypeGram hinshi1;
TypeGram hinshi2;
{ {
if(hinshi2 == TANKANJI) return 0; if(hinshi2 == TANKANJI) return 0;
@ -80,10 +73,7 @@ TypeGram hinshi2;
return 4; return 4;
} }
} }
static int sttcnt(TypeGram hinshi1, TypeGram hinshi2)
static int sttcnt(hinshi1, hinshi2)
TypeGram hinshi1;
TypeGram hinshi2;
{ {
if(SETTOU_1 <= hinshi1 && hinshi1 <= SETTOU_5) { if(SETTOU_1 <= hinshi1 && hinshi1 <= SETTOU_5) {
if(MEISHI_1 <= hinshi2 && hinshi2 <= SUUSHI) if(MEISHI_1 <= hinshi2 && hinshi2 <= SUUSHI)
@ -91,9 +81,7 @@ TypeGram hinshi2;
} }
return 4; return 4;
} }
int priority(CLREC * clrec)
int priority(clrec)
CLREC* clrec;
{ {
int prty; int prty;
CLREC* cl2rec; CLREC* cl2rec;
@ -233,8 +221,8 @@ finish:
prty += 20 - clrec->cllen + clrec->jnode->jlen + clrec->gobiln; prty += 20 - clrec->cllen + clrec->jnode->jlen + clrec->gobiln;
return (prty + prev); return (prty + prev);
} }
void pritiny(void)
void pritiny() { {
CLREC* clrec; CLREC* clrec;
int keeplen; int keeplen;
int i, prty = 0; int i, prty = 0;

115
rk_conv.c
View file

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

37
romaji.c
View file

@ -32,9 +32,7 @@
#include "key.h" #include "key.h"
extern int rkerrbell; extern int rkerrbell;
int exec_romaji(wchar16_t c)
exec_romaji(c)
wchar16_t c;
{ {
Conversion* cv; Conversion* cv;
wchar16_t* p; wchar16_t* p;
@ -196,8 +194,7 @@ exec_romaji(c)
cv->out_point = op; cv->out_point = op;
return (i); return (i);
} }
int move_cur(int kval)
move_cur(kval) int kval;
{ {
Conversion* cv; Conversion* cv;
int i; int i;
@ -238,8 +235,7 @@ move_cur(kval) int kval;
} }
} }
} }
int addten(unsigned short pos, unsigned short c)
addten(pos, c) unsigned short pos, c;
{ {
unsigned short prefix; unsigned short prefix;
Conversion* cv; Conversion* cv;
@ -248,17 +244,14 @@ addten(pos, c) unsigned short pos, c;
prefix = cv->out_buf[pos]; prefix = cv->out_buf[pos];
return (sj_addten(prefix, c)); return (sj_addten(prefix, c));
} }
int getipos(unsigned short pos)
getipos(pos) unsigned short pos;
{ {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
return (getipos2(cv->out_mode, pos)); return (getipos2(cv->out_mode, pos));
} }
int getipos2(unsigned short * omode, unsigned short pos)
getipos2(omode, pos) unsigned short* omode;
unsigned short pos;
{ {
unsigned short ipos; unsigned short ipos;
int i; int i;
@ -269,11 +262,7 @@ unsigned short pos;
} }
return (ipos); return (ipos);
} }
int sj_rkconv(wchar16_t * s1, wchar16_t * s2, int len)
sj_rkconv(s1, s2, len)
wchar16_t* s1,
*s2;
int len;
{ {
int i, rlen; int i, rlen;
unsigned int* kp; unsigned int* kp;
@ -326,12 +315,7 @@ int len;
sj3_rkebell(rkerrbell); sj3_rkebell(rkerrbell);
return (klen); return (klen);
} }
int sj_rkconv2(wchar16_t * s1, wchar16_t * s2, unsigned short * omode, int len)
sj_rkconv2(s1, s2, omode, len)
wchar16_t* s1,
*s2;
unsigned short* omode;
int len;
{ {
int i, rlen; int i, rlen;
unsigned int* kp; unsigned int* kp;
@ -442,12 +426,7 @@ int len;
sj3_rkebell(rkerrbell); sj3_rkebell(rkerrbell);
return (klen); return (klen);
} }
int exec_romaji2(wchar16_t c, wchar16_t * hbuf, wchar16_t * kbuf, unsigned short * omode, int cur, int hcur)
exec_romaji2(c, hbuf, kbuf, omode, cur, hcur)
wchar16_t c,
*hbuf, *kbuf;
unsigned short* omode;
int cur, hcur;
{ {
unsigned short c1, cc; unsigned short c1, cc;
unsigned int c2; unsigned int c2;

110
screen.c
View file

@ -36,8 +36,7 @@ static wchar16_t* Guide;
static wchar16_t Nguide[LINE_LENGTH + 1]; static wchar16_t Nguide[LINE_LENGTH + 1];
static wchar16_t Cguide[LINE_LENGTH + 1]; static wchar16_t Cguide[LINE_LENGTH + 1];
wchar16_t Mguide[LINE_LENGTH + 1]; wchar16_t Mguide[LINE_LENGTH + 1];
int vbackchar(int n)
vbackchar(n) int n;
{ {
int i; int i;
@ -49,24 +48,24 @@ vbackchar(n) int n;
VBackspace(); VBackspace();
Flush(); Flush();
} }
int wrap_off(void)
wrap_off() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
cv->wrap = 0; cv->wrap = 0;
cv->PushCurrentVcol = cv->CurrentVcol; cv->PushCurrentVcol = cv->CurrentVcol;
} }
int wrap_on(void)
wrap_on() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
cv->wrap = 1; cv->wrap = 1;
cv->CurrentVcol = cv->PushCurrentVcol; cv->CurrentVcol = cv->PushCurrentVcol;
} }
int Vput_space(void)
Vput_space() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
@ -77,8 +76,8 @@ Vput_space() {
Backspace(); Backspace();
} }
} }
int VBackspace(void)
VBackspace() { {
Conversion* cv; Conversion* cv;
int i; int i;
@ -103,25 +102,16 @@ VBackspace() {
cv->CurrentVcol = cv->Vindex[cv->Vlen]; cv->CurrentVcol = cv->Vindex[cv->Vlen];
} }
} }
int master_out(wchar16_t * s, int n)
master_out(s, n)
wchar16_t* s;
int n;
{ {
master_write(s, n); master_write(s, n);
master_flush(); master_flush();
} }
int master_write(wchar16_t * s, int n)
master_write(s, n)
wchar16_t* s;
int n;
{ {
SJ_write(s, n); SJ_write(s, n);
} }
int vprintU(wchar16_t * s, char mod)
vprintU(s, mod)
wchar16_t* s;
char mod;
{ {
Conversion* cv; Conversion* cv;
int i, col, oldcol, len; int i, col, oldcol, len;
@ -152,10 +142,7 @@ char mod;
cv->MaxVcol = cv->CurrentVcol; cv->MaxVcol = cv->CurrentVcol;
Flush(); Flush();
} }
int vprintR(wchar16_t * s, char mod)
vprintR(s, mod)
wchar16_t* s;
char mod;
{ {
Conversion* cv; Conversion* cv;
int i, col, oldcol, len; int i, col, oldcol, len;
@ -186,42 +173,32 @@ char mod;
cv->MaxVcol = cv->CurrentVcol; cv->MaxVcol = cv->CurrentVcol;
Flush(); Flush();
} }
int IprintU(wchar16_t * s, int index)
IprintU(s, index)
wchar16_t* s;
int index;
{ {
Cgoto(index); Cgoto(index);
printU(s); printU(s);
Flush(); Flush();
} }
int IprintR(wchar16_t * s, int index)
IprintR(s, index)
wchar16_t* s;
int index;
{ {
Cgoto(index); Cgoto(index);
printR(s); printR(s);
Flush(); Flush();
} }
int printU(wchar16_t * s)
printU(s)
wchar16_t* s;
{ {
under_in(); under_in();
SJ_print(s); SJ_print(s);
under_out(); under_out();
} }
int printR(wchar16_t * s)
printR(s)
wchar16_t* s;
{ {
reverse_in(); reverse_in();
SJ_print(s); SJ_print(s);
reverse_out(); reverse_out();
} }
int Csave(void)
Csave() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
@ -230,8 +207,7 @@ Csave() {
cv->Vlen = 0; cv->Vlen = 0;
cv->Vindex[cv->Vlen] = cv->MaxVcol = cv->CurrentVcol; cv->Vindex[cv->Vlen] = cv->MaxVcol = cv->CurrentVcol;
} }
int SetVcol(int index)
SetVcol(index) int index;
{ {
Conversion* cv; Conversion* cv;
@ -239,15 +215,14 @@ SetVcol(index) int index;
cv->Vlen = index; cv->Vlen = index;
cv->CurrentVcol = cv->Vindex[cv->Vlen]; cv->CurrentVcol = cv->Vindex[cv->Vlen];
} }
int Cload(void)
Cload() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
CursorSet(cv->SavedRow, cv->SavedCol); CursorSet(cv->SavedRow, cv->SavedCol);
} }
int Cclear(int redraw)
Cclear(redraw) int redraw;
{ {
Conversion* cv; Conversion* cv;
int spaces; int spaces;
@ -263,8 +238,7 @@ Cclear(redraw) int redraw;
Cload(); Cload();
Flush(); Flush();
} }
int Cgoto(int index)
Cgoto(index) int index;
{ {
Conversion* cv; Conversion* cv;
int row, col; int row, col;
@ -275,8 +249,8 @@ Cgoto(index) int index;
col = cv->CurrentVcol % cv->column; col = cv->CurrentVcol % cv->column;
CursorSet(row, col); CursorSet(row, col);
} }
int ClearToMax(void)
ClearToMax() { {
Conversion* cv; Conversion* cv;
int space; int space;
@ -284,8 +258,8 @@ ClearToMax() {
space = cv->MaxVcol - cv->CurrentVcol; space = cv->MaxVcol - cv->CurrentVcol;
put_space(space); put_space(space);
} }
int Ccheck(void)
Ccheck() { {
Conversion* cv; Conversion* cv;
int row, tmp, diff; int row, tmp, diff;
@ -300,9 +274,7 @@ Ccheck() {
cv->SavedRow -= (row - cv->line); cv->SavedRow -= (row - cv->line);
} }
} }
int spaceR(wchar16_t * s)
spaceR(s)
wchar16_t* s;
{ {
wchar16_t* t; wchar16_t* t;
wchar16_t tmp[40]; wchar16_t tmp[40];
@ -321,8 +293,8 @@ spaceR(s)
printR(tmp); printR(tmp);
Flush(); Flush();
} }
int clear_guide_line(void)
clear_guide_line() { {
unsigned short row, col; unsigned short row, col;
StartGuide(&row, &col); StartGuide(&row, &col);
@ -330,8 +302,8 @@ clear_guide_line() {
EndGuide(row, col); EndGuide(row, col);
Flush(); Flush();
} }
int print_guide_line(void)
print_guide_line() { {
unsigned short row, col; unsigned short row, col;
StartGuide(&row, &col); StartGuide(&row, &col);
@ -340,8 +312,7 @@ print_guide_line() {
EndGuide(row, col); EndGuide(row, col);
Flush(); Flush();
} }
int set_guide_line(int mode)
set_guide_line(mode) int mode;
{ {
switch(mode) { switch(mode) {
@ -356,8 +327,8 @@ set_guide_line(mode) int mode;
break; break;
} }
} }
int disp_mode(void)
disp_mode() { {
Conversion* cv; Conversion* cv;
int c_code; int c_code;
wchar16_t * Pmode, *Bmode; wchar16_t * Pmode, *Bmode;
@ -424,16 +395,13 @@ disp_mode() {
wscat(Cguide, WCGmode); wscat(Cguide, WCGmode);
print_guide_line(); print_guide_line();
} }
int TopGuide(void)
TopGuide() { {
unsigned short row, col; unsigned short row, col;
StartGuide(&row, &col); StartGuide(&row, &col);
} }
int guide_print(wchar16_t * s1, wchar16_t * s2)
guide_print(s1, s2)
wchar16_t* s1,
*s2;
{ {
unsigned short row, col; unsigned short row, col;

4
selclrec.c
View file

@ -31,8 +31,8 @@
void free_clall(), free_jall(), mkjiritsu(), mkbunsetsu(); void free_clall(), free_jall(), mkjiritsu(), mkbunsetsu();
void wakachi(); void wakachi();
void selclrec(void)
void selclrec() { {
int len; int len;
CLREC* rec; CLREC* rec;

25
setup.c
View file

@ -118,10 +118,7 @@ cmpstr(unsigned char* src, unsigned char* dst) {
if(*dst) return -1; if(*dst) return -1;
return 0; return 0;
} }
static unsigned char* get_str(unsigned char * p, void * pv_dst)
static unsigned char* get_str(p, pv_dst)
unsigned char* p;
void* pv_dst;
{ {
char** dst; char** dst;
@ -134,9 +131,7 @@ void* pv_dst;
while(*p++); while(*p++);
return p; return p;
} }
static unsigned char* get_int(p, pv_dst) static unsigned char* get_int(unsigned char * p, void * pv_dst)
unsigned char* p;
void* pv_dst;
{ {
char* fmt; char* fmt;
int* dst; int* dst;
@ -147,9 +142,7 @@ void* pv_dst;
while(*p++); while(*p++);
return p; return p;
} }
static unsigned char* get_flag(p, pv_dst) static unsigned char* get_flag(unsigned char * p, void * pv_dst)
unsigned char* p;
void* pv_dst;
{ {
int* dst; int* dst;
@ -252,9 +245,7 @@ struct optlist {
{"AllowUser", get_list, &allow_user}, {"AllowUser", get_list, &allow_user},
{"allowuser", get_list, &allow_user}, {"allowuser", get_list, &allow_user},
{0, 0, 0}}; {0, 0, 0}};
static int skip_blank(FILE * fp)
static int skip_blank(fp)
FILE* fp;
{ {
int c; int c;
@ -262,8 +253,7 @@ FILE* fp;
while(c == ' ' || c == '\t') c = getc(fp); while(c == ' ' || c == '\t') c = getc(fp);
return c; return c;
} }
static int skip_line(fp) static int skip_line(FILE * fp)
FILE* fp;
{ {
int c; int c;
@ -271,10 +261,7 @@ FILE* fp;
while(c != '\n' && c != EOF) c = getc(fp); while(c != '\n' && c != EOF) c = getc(fp);
return c; return c;
} }
static readln(fp, p, len) static readln(FILE * fp, char * p, int len)
FILE* fp;
char* p;
int len;
{ {
int c; int c;
int quote = EOF; int quote = EOF;

11
sj2code.c
View file

@ -30,10 +30,7 @@
#include "sj_euc.h" #include "sj_euc.h"
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_yomi.h" #include "sj_yomi.h"
int sj2cd_chr(unsigned char * euc, unsigned char * yomi)
int sj2cd_chr(euc, yomi)
unsigned char* euc;
unsigned char* yomi;
{ {
unsigned char chr; unsigned char chr;
@ -104,11 +101,7 @@ unsigned char* yomi;
return 2; return 2;
} }
int sj2cd_str(unsigned char * euc, unsigned char * yomi, int len)
int sj2cd_str(euc, yomi, len)
unsigned char* euc;
unsigned char* yomi;
int len;
{ {
if(!len--) return FALSE; if(!len--) return FALSE;

73
sj3_rkcv.c
View file

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

5
sj3err.c
View file

@ -30,10 +30,7 @@
#include <stdio.h> #include <stdio.h>
#include "sj3err.h" #include "sj3err.h"
void void sj3error(FILE * fp, int code)
sj3error(fp, code)
FILE* fp;
int code;
{ {
unsigned char tmp[BUFSIZ]; unsigned char tmp[BUFSIZ];

4
sj3ver.c
View file

@ -28,8 +28,8 @@
*/ */
#include "sj2.h" #include "sj2.h"
int print_version(void)
print_version() { {
extern int vflag; extern int vflag;
extern char* version; extern char* version;
extern char* Date; extern char* Date;

43
sjgetchar.c
View file

@ -62,8 +62,8 @@ static wchar16_t backup = (wchar16_t)0;
static int eucmode = 0; static int eucmode = 0;
extern int master; extern int master;
wchar16_t SJ_getchar(void)
wchar16_t SJ_getchar() { {
SELECT_FD ifds; SELECT_FD ifds;
wchar16_t c; wchar16_t c;
@ -108,8 +108,8 @@ static char startc = CTRL('q');
static char outbuf[BUFSIZ]; static char outbuf[BUFSIZ];
extern int slave; extern int slave;
extern char *slave_name, *ptsname(int); extern char *slave_name, *ptsname(int);
int output_master(void)
output_master() { {
struct strbuf ctlbuf; struct strbuf ctlbuf;
struct strbuf databuf; struct strbuf databuf;
int flags = 0; int flags = 0;
@ -240,8 +240,8 @@ output_master() {
#if defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) #if defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2)
#include <termios.h> #include <termios.h>
#endif #endif
int output_master(void)
output_master() { {
int n, m; int n, m;
char outbuf[BUFSIZ]; char outbuf[BUFSIZ];
int f; int f;
@ -303,14 +303,11 @@ output_master() {
} }
} }
#endif #endif
int set_eucmode(void)
set_eucmode() { {
eucmode = 1; eucmode = 1;
} }
int SJ_write(wchar16_t * s, int n)
SJ_write(s, n)
wchar16_t* s;
int n;
{ {
int val; int val;
wchar16_t wb[BUFFLENGTH]; wchar16_t wb[BUFFLENGTH];
@ -329,9 +326,7 @@ int n;
val = write(master, buff, val); val = write(master, buff, val);
return (val); return (val);
} }
int write_stdout(unsigned char * s, int n)
write_stdout(s, n) unsigned char* s;
int n;
{ {
static unsigned char knj1st = 0, knj2nd = 0; static unsigned char knj1st = 0, knj2nd = 0;
@ -358,10 +353,7 @@ int n;
putchar(*s++); putchar(*s++);
} }
} }
int SJ_read(wchar16_t * s, int n)
SJ_read(s, n)
wchar16_t* s;
int n;
{ {
unsigned char buff[BUFFLENGTH]; unsigned char buff[BUFFLENGTH];
wchar16_t wcbuff[BUFFLENGTH]; wchar16_t wcbuff[BUFFLENGTH];
@ -439,15 +431,11 @@ int n;
memcpy((void*)s, (void*)wcbuff, wnum * sizeof(wchar16_t)); memcpy((void*)s, (void*)wcbuff, wnum * sizeof(wchar16_t));
return (wnum); return (wnum);
} }
int SJ_warnning(wchar16_t * s)
SJ_warnning(s)
wchar16_t* s;
{ {
SJ_print(s); SJ_print(s);
} }
int SJ_print(wchar16_t * s)
SJ_print(s)
wchar16_t* s;
{ {
unsigned char buff[BUFFLENGTH * 3]; unsigned char buff[BUFFLENGTH * 3];
size_t num; size_t num;
@ -456,10 +444,7 @@ SJ_print(s)
if((int)num > 0) if((int)num > 0)
printf("%s", buff); printf("%s", buff);
} }
int SJ_through(wchar16_t * s, int n)
SJ_through(s, n)
wchar16_t* s;
int n;
{ {
SJ_write(s, n); SJ_write(s, n);
} }

45
sjrc.c
View file

@ -62,8 +62,8 @@ struct functbl {
{NULL, NULL}}; {NULL, NULL}};
#define TOLOWER(c) (isupper(c) ? tolower(c) : (c)) #define TOLOWER(c) (isupper(c) ? tolower(c) : (c))
int sjset_code(void)
int sjset_code() { {
char* loc; char* loc;
#ifdef LACKOF_SETLOCALE #ifdef LACKOF_SETLOCALE
@ -93,8 +93,8 @@ int sjset_code() {
#endif #endif
return 1; return 1;
} }
int getsjrc(void)
int getsjrc() { {
FILE* fd; FILE* fd;
char* p; char* p;
@ -126,9 +126,7 @@ int getsjrc() {
return FALSE; return FALSE;
} }
void void setrc(char * file, FILE * fd)
setrc(file, fd) char* file;
FILE* fd;
{ {
char line[MAXLINE]; char line[MAXLINE];
int w; int w;
@ -151,9 +149,7 @@ FILE* fd;
} }
} }
} }
int much(char * s1, char * s2)
int much(s1, s2)
char *s1, *s2;
{ {
char c1, c2; char c1, c2;
@ -167,10 +163,7 @@ char *s1, *s2;
} }
return 1; return 1;
} }
int getword(char * s, struct wordent word[])
int getword(s, word)
char* s;
struct wordent word[];
{ {
unsigned char c, cc; unsigned char c, cc;
char* p; char* p;
@ -256,39 +249,27 @@ struct wordent word[];
word[++wcount].word_str[0] = '\0'; word[++wcount].word_str[0] = '\0';
return wcount; return wcount;
} }
int IsTerminator(unsigned char c)
int IsTerminator(c)
unsigned char c;
{ {
return (c == '\n') ? 1 : 0; return (c == '\n') ? 1 : 0;
} }
int isTerminator(unsigned char c)
int isTerminator(c)
unsigned char c;
{ {
return (c == '#') ? 1 : 0; return (c == '#') ? 1 : 0;
} }
int IsEscape(unsigned char c)
int IsEscape(c)
unsigned char c;
{ {
return (c == '\\') ? 1 : 0; return (c == '\\') ? 1 : 0;
} }
int IsDelimitor(unsigned char c)
int IsDelimitor(c)
unsigned char c;
{ {
return (c == ' ' || c == '\t' || c == '.') ? 1 : 0; return (c == ' ' || c == '\t' || c == '.') ? 1 : 0;
} }
int set_dict(struct wordent word[])
int set_dict(word)
struct wordent word[];
{ {
setdicname(word[1].word_str); setdicname(word[1].word_str);
} }
int set_server(struct wordent word[])
int set_server(word)
struct wordent word[];
{ {
setsjserv(word[1].word_str); setsjserv(word[1].word_str);
} }

114
sjrc2.c
View file

@ -110,8 +110,8 @@ extern struct functbl funcs[];
extern struct valtbl mode_val[], code_val[]; extern struct valtbl mode_val[], code_val[];
#define TOLOWER(c) (isupper(c) ? tolower(c) : (c)) #define TOLOWER(c) (isupper(c) ? tolower(c) : (c))
int sjset_code(void)
sjset_code() { {
char* loc; char* loc;
if(current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
@ -121,8 +121,8 @@ sjset_code() {
} else } else
user_euc = 0; user_euc = 0;
} }
int sjrc_init(void)
sjrc_init() { {
clear_del(); clear_del();
clear_key(); clear_key();
intr_code = 0x03; intr_code = 0x03;
@ -140,8 +140,8 @@ sjrc_init() {
} }
dict_num = 0; dict_num = 0;
} }
int getsjrc(void)
getsjrc() { {
char* p; char* p;
char* getenv(); char* getenv();
@ -170,8 +170,7 @@ getsjrc() {
RCfile[0] = '\0'; RCfile[0] = '\0';
} }
int setrc(char * file)
setrc(file) char* file;
{ {
wchar16_t* p; wchar16_t* p;
char line[MAXLINE]; char line[MAXLINE];
@ -202,8 +201,7 @@ setrc(file) char* file;
fclose(fd); fclose(fd);
return (TRUE); return (TRUE);
} }
int getsjrk(int erase)
getsjrk(erase) int erase;
{ {
char* p; char* p;
int i; int i;
@ -250,10 +248,7 @@ getsjrk(erase) int erase;
if(!oasys) if(!oasys)
mkkigou(); mkkigou();
} }
int match(wchar16_t * s1, wchar16_t * s2)
match(s1, s2)
wchar16_t* s1,
*s2;
{ {
wchar16_t c1, c2; wchar16_t c1, c2;
@ -267,9 +262,7 @@ match(s1, s2)
} }
return (1); return (1);
} }
int getword(unsigned char * s, struct wordent word[])
getword(s, word) unsigned char* s;
struct wordent word[];
{ {
unsigned char c; unsigned char c;
wchar16_t* w; wchar16_t* w;
@ -377,40 +370,35 @@ struct wordent word[];
word[++wcount].word_str[0] = '\0'; word[++wcount].word_str[0] = '\0';
return (wcount); return (wcount);
} }
int IsTerminator(unsigned char c)
IsTerminator(c) unsigned char c;
{ {
if(c == '\n') if(c == '\n')
return (1); return (1);
else else
return (0); return (0);
} }
int isTerminator(unsigned char c)
isTerminator(c) unsigned char c;
{ {
if(c == '#') if(c == '#')
return (1); return (1);
else else
return (0); return (0);
} }
int IsEscape(unsigned char c)
IsEscape(c) unsigned char c;
{ {
if(c == '\\') if(c == '\\')
return (1); return (1);
else else
return (0); return (0);
} }
int IsDelimitor(unsigned char c)
IsDelimitor(c) unsigned char c;
{ {
if(c == ' ' || c == '\t' || c == '.') if(c == ' ' || c == '\t' || c == '.')
return (1); return (1);
else else
return (0); return (0);
} }
int set_forkshell(struct wordent word[])
set_forkshell(word) struct wordent word[];
{ {
if(word[1].word_str[0] != '\0' && shellprog[0] == '\0') { if(word[1].word_str[0] != '\0' && shellprog[0] == '\0') {
/* /*
@ -421,8 +409,7 @@ set_forkshell(word) struct wordent word[];
shell_flag++; shell_flag++;
} }
} }
int set_intr(struct wordent word[])
set_intr(word) struct wordent word[];
{ {
int c; int c;
@ -430,8 +417,7 @@ set_intr(word) struct wordent word[];
if((c = eval_key(word[1].word_str)) != -1) if((c = eval_key(word[1].word_str)) != -1)
intr_code = c; intr_code = c;
} }
int set_delkey(struct wordent word[])
set_delkey(word) struct wordent word[];
{ {
int c; int c;
@ -439,16 +425,14 @@ set_delkey(word) struct wordent word[];
if((c = eval_key(word[1].word_str)) != -1) if((c = eval_key(word[1].word_str)) != -1)
set_del(c); set_del(c);
} }
int isintr(unsigned char c)
isintr(c) unsigned char c;
{ {
if(c == intr_code) if(c == intr_code)
return (1); return (1);
else else
return (0); return (0);
} }
int set_goto(struct wordent word[])
set_goto(word) struct wordent word[];
{ {
int c; int c;
@ -456,8 +440,7 @@ set_goto(word) struct wordent word[];
if((c = eval_key(word[1].word_str)) != -1) if((c = eval_key(word[1].word_str)) != -1)
goto_code[goto_num++] = c; goto_code[goto_num++] = c;
} }
int IsGoto(unsigned char c)
IsGoto(c) unsigned char c;
{ {
int i; int i;
@ -467,8 +450,7 @@ IsGoto(c) unsigned char c;
} }
return (0); return (0);
} }
int set_trap(struct wordent word[])
set_trap(word) struct wordent word[];
{ {
int c; int c;
@ -476,8 +458,7 @@ set_trap(word) struct wordent word[];
if((c = eval_key(word[1].word_str)) != -1) if((c = eval_key(word[1].word_str)) != -1)
trap_code[trap_num++] = c; trap_code[trap_num++] = c;
} }
int IsTrap(unsigned char c)
IsTrap(c) unsigned char c;
{ {
int i; int i;
@ -487,8 +468,7 @@ IsTrap(c) unsigned char c;
} }
return (0); return (0);
} }
int mode_key(int mode)
mode_key(mode) int mode;
{ {
switch(mode) { switch(mode) {
case MODE_HALPHA: case MODE_HALPHA:
@ -511,8 +491,7 @@ mode_key(mode) int mode;
} }
int Direct = 0; int Direct = 0;
int set_init_mode(struct wordent word[])
set_init_mode(word) struct wordent word[];
{ {
Conversion* cv; Conversion* cv;
int i, j; int i, j;
@ -539,16 +518,14 @@ set_init_mode(word) struct wordent word[];
p = word[++j].word_str; p = word[++j].word_str;
} }
} }
int set_helpmenu(struct wordent word[])
set_helpmenu(word) struct wordent word[];
{ {
if(match(word[1].word_str, WCOff)) if(match(word[1].word_str, WCOff))
HHlevel = Hlevel = 1; HHlevel = Hlevel = 1;
else if(match(word[1].word_str, WCOn)) else if(match(word[1].word_str, WCOn))
HHlevel = Hlevel = 2; HHlevel = Hlevel = 2;
} }
int set_defcode(struct wordent word[])
set_defcode(word) struct wordent word[];
{ {
wchar16_t* p; wchar16_t* p;
int i; int i;
@ -561,8 +538,7 @@ set_defcode(word) struct wordent word[];
} }
} }
} }
int set_muhenkan(struct wordent word[])
set_muhenkan(word) struct wordent word[];
{ {
int i; int i;
wchar16_t* p; wchar16_t* p;
@ -575,8 +551,7 @@ set_muhenkan(word) struct wordent word[];
} }
} }
} }
int set_muedit(struct wordent word[])
set_muedit(word) struct wordent word[];
{ {
int i; int i;
wchar16_t* p; wchar16_t* p;
@ -589,33 +564,30 @@ set_muedit(word) struct wordent word[];
} }
} }
} }
int set_m_toggle(struct wordent word[])
set_m_toggle(word) struct wordent word[];
{ {
if(match(word[1].word_str, WCOn)) if(match(word[1].word_str, WCOn))
muhenkan_toggle = 1; muhenkan_toggle = 1;
if(match(word[1].word_str, WCOff)) if(match(word[1].word_str, WCOff))
muhenkan_toggle = 0; muhenkan_toggle = 0;
} }
int set_silent(struct wordent word[])
set_silent(word) struct wordent word[];
{ {
vflag = 0; vflag = 0;
} }
int set_bstudy(struct wordent word[])
set_bstudy(word) struct wordent word[];
{ {
if(match(word[1].word_str, WCOn)) if(match(word[1].word_str, WCOn))
bstudy = 1; bstudy = 1;
if(match(word[1].word_str, WCOff)) if(match(word[1].word_str, WCOff))
bstudy = 0; bstudy = 0;
} }
int is_bstudy(void)
is_bstudy() { {
return (bstudy); return (bstudy);
} }
int eval_muhenkan(void)
eval_muhenkan() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
@ -624,12 +596,11 @@ eval_muhenkan() {
else else
return (def_muhenkan); return (def_muhenkan);
} }
int value_muhenkan(void)
value_muhenkan() { {
return (def_muedit); return (def_muedit);
} }
int set_guide(struct wordent word[])
set_guide(word) struct wordent word[];
{ {
int i; int i;
@ -709,16 +680,14 @@ set_guide(word) struct wordent word[];
WCGmode = guide_function; WCGmode = guide_function;
} }
} }
int set_flush_conversion(struct wordent word[])
set_flush_conversion(word) struct wordent word[];
{ {
if(match(word[1].word_str, WCOn)) if(match(word[1].word_str, WCOn))
flush_conversion = 1; flush_conversion = 1;
if(match(word[1].word_str, WCOff)) if(match(word[1].word_str, WCOff))
flush_conversion = 0; flush_conversion = 0;
} }
int set_server(struct wordent word[])
set_server(word) struct wordent word[];
{ {
int i, j, size; int i, j, size;
char* p; char* p;
@ -752,8 +721,7 @@ set_server(word) struct wordent word[];
} }
#define DICT_SUFFIX ".dic" #define DICT_SUFFIX ".dic"
int set_dict(struct wordent word[])
set_dict(word) struct wordent word[];
{ {
int i, j, size, suffix_len; int i, j, size, suffix_len;
char* p; char* p;

4
skiphblk.c
View file

@ -32,9 +32,7 @@
#include "sj_dict.h" #include "sj_dict.h"
unsigned char* skipkstr(); unsigned char* skipkstr();
unsigned char* skiphblk(unsigned char * ptr)
unsigned char* skiphblk(ptr)
unsigned char* ptr;
{ {
ptr++; ptr++;

4
srchhead.c
View file

@ -29,8 +29,8 @@
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_yomi.h" #include "sj_yomi.h"
int srchhead(void)
int srchhead() { {
if(*cnvstart == _O) { if(*cnvstart == _O) {
headcode = SETTOU_O; headcode = SETTOU_O;
headlen = 1; headlen = 1;

163
stat_conv.c
View file

@ -39,8 +39,7 @@ static int bskey;
#define SPAN_FLUSH 0 #define SPAN_FLUSH 0
#define SPAN_END 1 #define SPAN_END 1
int save_span(int mode)
save_span(mode) int mode;
{ {
Conversion* cv; Conversion* cv;
@ -63,16 +62,16 @@ save_span(mode) int mode;
break; break;
} }
} }
int save_span_p(void)
save_span_p() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
cv->span_p[cv->span_point] = &(cv->out_buf[cv->out_point]); cv->span_p[cv->span_point] = &(cv->out_buf[cv->out_point]);
cv->span_l[cv->span_point] = 0; cv->span_l[cv->span_point] = 0;
} }
int isspaned(void)
isspaned() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
@ -81,8 +80,8 @@ isspaned() {
else else
return (0); return (0);
} }
int buffers_clear(void)
buffers_clear() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
@ -92,8 +91,8 @@ buffers_clear() {
else else
cv->CurBun = 0; cv->CurBun = 0;
} }
int pointer_clear(void)
pointer_clear() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
@ -117,8 +116,8 @@ typedef struct _SaveSet {
} SaveSet; } SaveSet;
static SaveSet save_set0; static SaveSet save_set0;
int StoreSaveSet(void)
StoreSaveSet() { {
Conversion* cv; Conversion* cv;
SaveSet* sv; SaveSet* sv;
@ -135,8 +134,8 @@ StoreSaveSet() {
wscpy(sv->out_buf, cv->out_buf); wscpy(sv->out_buf, cv->out_buf);
} }
} }
int RestoreSaveSet(void)
RestoreSaveSet() { {
Conversion* cv; Conversion* cv;
SaveSet* sv; SaveSet* sv;
@ -153,8 +152,8 @@ RestoreSaveSet() {
wscpy(cv->out_buf, sv->out_buf); wscpy(cv->out_buf, sv->out_buf);
} }
} }
int history_empty(void)
history_empty() { {
SaveSet* sv; SaveSet* sv;
sv = &save_set0; sv = &save_set0;
@ -163,8 +162,8 @@ history_empty() {
else else
return (1); return (1);
} }
int History(void)
History() { {
Conversion* cv; Conversion* cv;
SaveSet* sv; SaveSet* sv;
@ -178,36 +177,36 @@ History() {
cv->CurBun = 0; cv->CurBun = 0;
} }
} }
int ClearBuffer(void)
ClearBuffer() { {
Clear_EOL(); Clear_EOL();
Ccheck(); Ccheck();
Cclear(1); Cclear(1);
all_set_up(); all_set_up();
} }
int SetCflag(void)
SetCflag() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
cv->Cflag = 1; cv->Cflag = 1;
} }
int ClearCflag(void)
ClearCflag() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
cv->Cflag = 0; cv->Cflag = 0;
} }
int IsCflag(void)
IsCflag() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
return (cv->Cflag); return (cv->Cflag);
} }
int exec_kettei(void)
exec_kettei() { {
Conversion* cv; Conversion* cv;
int len; int len;
wchar16_t kanji[BUFFLENGTH * 2]; wchar16_t kanji[BUFFLENGTH * 2];
@ -244,16 +243,15 @@ exec_kettei() {
ResetHenkan(); ResetHenkan();
SetCflag(); SetCflag();
} }
int set_rkebell(struct wordent word[])
set_rkebell(word) struct wordent word[];
{ {
if(match(word[1].word_str, WCOn)) if(match(word[1].word_str, WCOn))
rkerrbell = 1; rkerrbell = 1;
if(match(word[1].word_str, WCOff)) if(match(word[1].word_str, WCOff))
rkerrbell = 0; rkerrbell = 0;
} }
int ChangeBuffMode(void)
ChangeBuffMode() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
@ -265,8 +263,8 @@ ChangeBuffMode() {
cv->BuffMode = BUFF; cv->BuffMode = BUFF;
} }
} }
int BuffYes(void)
BuffYes() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
@ -278,43 +276,43 @@ BuffYes() {
#define STAT_HENKAN 1 #define STAT_HENKAN 1
#define STAT_MUHENKAN 2 #define STAT_MUHENKAN 2
int IsHenkan(void)
IsHenkan() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
return (cv->henkanflag); return (cv->henkanflag);
} }
int IsMuhenkan(void)
IsMuhenkan() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
return (cv->henkanflag & STAT_MUHENKAN); return (cv->henkanflag & STAT_MUHENKAN);
} }
int SetMuhenkan(void)
SetMuhenkan() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
cv->henkanflag |= STAT_MUHENKAN; cv->henkanflag |= STAT_MUHENKAN;
} }
int SetHenkan(void)
SetHenkan() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
cv->henkanflag = STAT_HENKAN; cv->henkanflag = STAT_HENKAN;
} }
int ResetHenkan(void)
ResetHenkan() { {
Conversion* cv; Conversion* cv;
cv = GetConversion(); cv = GetConversion();
cv->henkanflag = 0; cv->henkanflag = 0;
} }
int all_set_up(void)
all_set_up() { {
buffers_clear(); buffers_clear();
SetCflag(); SetCflag();
ResetHenkan(); ResetHenkan();
@ -322,23 +320,23 @@ all_set_up() {
static int convertflag; static int convertflag;
static int small; static int small;
int stat_conv_on(void)
stat_conv_on() { {
convertflag = 1; convertflag = 1;
} }
int stat_init(void)
stat_init() { {
stat_conv_on(); stat_conv_on();
all_set_up(); all_set_up();
disp_mode(); disp_mode();
small = 0; small = 0;
} }
int get_pseq(void)
get_pseq() { {
return (write_pseq(1)); return (write_pseq(1));
} }
int stat_conv(void)
stat_conv() { {
Conversion* cv; Conversion* cv;
extern int allways_buff; extern int allways_buff;
int inc; int inc;
@ -653,8 +651,8 @@ stat_conv() {
} }
} }
} }
int save_obuf(void)
save_obuf() { {
Conversion* cv; Conversion* cv;
int i, cur; int i, cur;
@ -683,8 +681,8 @@ save_obuf() {
osave_buf[os_point] = '\0'; osave_buf[os_point] = '\0';
} }
} }
int restore_obuf(void)
restore_obuf() { {
Conversion* cv; Conversion* cv;
int i; int i;
@ -706,8 +704,7 @@ restore_obuf() {
cv->Halpha[cv->ha_epoint] = '\0'; cv->Halpha[cv->ha_epoint] = '\0';
} }
} }
int exec_ctrl(int c)
exec_ctrl(c) int c;
{ {
Conversion* cv; Conversion* cv;
wchar16_t s[3]; wchar16_t s[3];
@ -739,8 +736,7 @@ exec_ctrl(c) int c;
master_write(s, 1); master_write(s, 1);
} }
} }
int exec_mode(int key)
exec_mode(key) int key;
{ {
Conversion* cv; Conversion* cv;
@ -755,8 +751,7 @@ exec_mode(key) int key;
} else } else
cv->Imode = eval_mode(key); cv->Imode = eval_mode(key);
} }
int toggle_mode(int mod)
toggle_mode(mod) int mod;
{ {
int value; int value;
@ -779,8 +774,7 @@ toggle_mode(mod) int mod;
} }
return (value); return (value);
} }
int eval_mode(int key)
eval_mode(key) int key;
{ {
int mod; int mod;
@ -803,56 +797,45 @@ eval_mode(key) int key;
} }
return (mod); return (mod);
} }
int IsESC(wchar16_t c)
IsESC(c)
wchar16_t c;
{ {
if(c == ESC) if(c == ESC)
return (1); return (1);
else else
return (0); return (0);
} }
int Strncpy(wchar16_t * d, wchar16_t * s, int len)
Strncpy(d, s, len)
wchar16_t* d,
*s;
int len;
{ {
if((len > 0) && (s != (wchar16_t*)NULL)) if((len > 0) && (s != (wchar16_t*)NULL))
(void)wsncpy(d, s, len); (void)wsncpy(d, s, len);
} }
int is_bsdel(int c)
is_bsdel(c) int c;
{ {
if(is_bs(c) || is_del(c)) if(is_bs(c) || is_del(c))
return (1); return (1);
else else
return (0); return (0);
} }
int clear_del(void)
clear_del() { {
delkey = -1; delkey = -1;
} }
int set_bs(int c)
set_bs(c) int c;
{ {
bskey = c; bskey = c;
} }
int set_del(int c)
set_del(c) int c;
{ {
delkey = c; delkey = c;
} }
int is_bs(int c)
is_bs(c) int c;
{ {
if(c == bskey) if(c == bskey)
return (1); return (1);
else else
return (0); return (0);
} }
int is_del(int c)
is_del(c) int c;
{ {
if(c == delkey) if(c == delkey)
return (1); return (1);
@ -861,12 +844,12 @@ is_del(c) int c;
} }
static Conversion* saved_conversion; static Conversion* saved_conversion;
int SaveConversion(void)
SaveConversion() { {
saved_conversion = GetConversion(); saved_conversion = GetConversion();
} }
int AnotherConversion(void)
AnotherConversion() { {
if(saved_conversion == GetConversion()) if(saved_conversion == GetConversion())
return (0); return (0);
else else

4
term.c
View file

@ -34,8 +34,8 @@ char* n_key_set = "\033P%d|%02x;%02x;%02xp";
char* s_key_set = "\033P%d|%02x;%02x;%02xP"; char* s_key_set = "\033P%d|%02x;%02x;%02xP";
#define ESCAPE '\033' #define ESCAPE '\033'
int set_news(void)
set_news() { {
aprintf(s_key_set, 24, ESCAPE, 'O', 'H'); aprintf(s_key_set, 24, ESCAPE, 'O', 'H');
aprintf(n_key_set, 24, ESCAPE, 'O', 'P'); aprintf(n_key_set, 24, ESCAPE, 'O', 'P');

5
terminat.c
View file

@ -29,10 +29,7 @@
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_right.h" #include "sj_right.h"
int terminate(TypeCnct right, unsigned char * yomi)
int terminate(right, yomi)
TypeCnct right;
unsigned char* yomi;
{ {
unsigned char ch; unsigned char ch;

34
toroku.c
View file

@ -36,8 +36,8 @@
extern struct valtbl hin_val[]; extern struct valtbl hin_val[];
extern int keyvalue; extern int keyvalue;
int exec_toroku(void)
exec_toroku() { {
Conversion* cv; Conversion* cv;
wchar16_t yomi[YOMILEN + 1], kanji[KLEN + 1]; wchar16_t yomi[YOMILEN + 1], kanji[KLEN + 1];
wchar16_t* hinshi; wchar16_t* hinshi;
@ -106,11 +106,7 @@ exec_toroku() {
} }
return (val); return (val);
} }
int getyomi(wchar16_t * yomi, int lim, wchar16_t * prompt, wchar16_t * kanji)
getyomi(yomi, lim, prompt, kanji)
wchar16_t* yomi,
*prompt, *kanji;
int lim;
{ {
int inc, c; int inc, c;
Conversion* cv; Conversion* cv;
@ -176,8 +172,8 @@ int lim;
wrap_on(); wrap_on();
return (0); return (0);
} }
int gethinshi(void)
gethinshi() { {
int inc, hcode; int inc, hcode;
TopGuide(); TopGuide();
@ -194,10 +190,7 @@ gethinshi() {
hcode = 1; hcode = 1;
return (hcode); return (hcode);
} }
int getcheck(wchar16_t * yomi, wchar16_t * kanji, wchar16_t * hinshi, wchar16_t * prompt)
getcheck(yomi, kanji, hinshi, prompt)
wchar16_t* yomi,
*kanji, *hinshi, *prompt;
{ {
int c; int c;
unsigned char tmp[BUFFLENGTH + KLEN]; unsigned char tmp[BUFFLENGTH + KLEN];
@ -250,11 +243,7 @@ getcheck(yomi, kanji, hinshi, prompt)
} }
return (0); return (0);
} }
int getkstr(wchar16_t * s, int lim, wchar16_t * guide)
getkstr(s, lim, guide)
wchar16_t* s,
*guide;
int lim;
{ {
Conversion* cv; Conversion* cv;
int i; int i;
@ -282,10 +271,7 @@ int lim;
*s = '\0'; *s = '\0';
return (chbun); return (chbun);
} }
int getbunsetsu(wchar16_t * kanji, wchar16_t * guide)
getbunsetsu(kanji, guide)
wchar16_t* kanji,
*guide;
{ {
Conversion* cv; Conversion* cv;
int c; int c;
@ -372,8 +358,8 @@ getbunsetsu(kanji, guide)
} }
return (len); return (len);
} }
int exec_shoukyo(void)
exec_shoukyo() { {
int i; int i;
wchar16_t yomi[YOMILEN + 1], kanji[KLEN + 1]; wchar16_t yomi[YOMILEN + 1], kanji[KLEN + 1];
wchar16_t tmp[BUFFLENGTH], tmp2[BUFFLENGTH * 2]; wchar16_t tmp[BUFFLENGTH], tmp2[BUFFLENGTH * 2];

94
wc16_str.c
View file

@ -54,35 +54,27 @@
#endif #endif
extern int current_locale; extern int current_locale;
int sj3_iswcntrl16(wchar16_t wc)
int sj3_iswcntrl16(wc)
wchar16_t wc;
{ {
if((wc < 0x20) || (wc == 0x7f)) return TRUE; if((wc < 0x20) || (wc == 0x7f)) return TRUE;
return FALSE; return FALSE;
} }
int sj3_iswupper16(wchar16_t wc)
int sj3_iswupper16(wc)
wchar16_t wc;
{ {
if(((0x40 < wc) && (wc < 0x5b)) || if(((0x40 < wc) && (wc < 0x5b)) ||
((0xa3c0 < wc) && (wc < 0xa3db))) return TRUE; ((0xa3c0 < wc) && (wc < 0xa3db))) return TRUE;
return FALSE; return FALSE;
} }
int sj3_iswdigit16(wchar16_t wc)
int sj3_iswdigit16(wc)
wchar16_t wc;
{ {
if(((0x29 < wc) && (wc < 0x3a)) || if(((0x29 < wc) && (wc < 0x3a)) ||
((0xa3af < wc) && (wc < 0xa3ba))) return TRUE; ((0xa3af < wc) && (wc < 0xa3ba))) return TRUE;
return FALSE; return FALSE;
} }
int sj3_iswxdigit16(wchar16_t wc)
int sj3_iswxdigit16(wc)
wchar16_t wc;
{ {
if(((0x29 < wc) && (wc < 0x3a)) || if(((0x29 < wc) && (wc < 0x3a)) ||
((0xa3af < wc) && (wc < 0xa3ba))) return TRUE; ((0xa3af < wc) && (wc < 0xa3ba))) return TRUE;
@ -95,9 +87,7 @@ wchar16_t wc;
return FALSE; return FALSE;
} }
int sj3_wslen16(wchar16_t * ws)
int sj3_wslen16(ws)
wchar16_t* ws;
{ {
int i = 0; int i = 0;
@ -106,9 +96,7 @@ wchar16_t* ws;
while(*ws++) i++; while(*ws++) i++;
return i; return i;
} }
int sj3_wscmp16(wchar16_t * ws1, wchar16_t * ws2)
int sj3_wscmp16(ws1, ws2)
wchar16_t *ws1, *ws2;
{ {
while((*ws1 && *ws2) && (*ws1 == *ws2)) { while((*ws1 && *ws2) && (*ws1 == *ws2)) {
ws1++; ws1++;
@ -120,10 +108,7 @@ wchar16_t *ws1, *ws2;
if(*ws1 < *ws2) return -1; if(*ws1 < *ws2) return -1;
return 1; return 1;
} }
int sj3_wsncmp16(wchar16_t * ws1, wchar16_t * ws2, int n)
int sj3_wsncmp16(ws1, ws2, n)
wchar16_t *ws1, *ws2;
int n;
{ {
int i = 0; int i = 0;
@ -140,9 +125,7 @@ int n;
return 1; return 1;
} }
wchar16_t* wchar16_t* sj3_wscpy16(wchar16_t * ws1, wchar16_t * ws2)
sj3_wscpy16(ws1, ws2)
wchar16_t *ws1, *ws2;
{ {
wchar16_t* ws; wchar16_t* ws;
@ -156,10 +139,7 @@ wchar16_t *ws1, *ws2;
return ws1; return ws1;
} }
wchar16_t* wchar16_t* sj3_wsncpy16(wchar16_t * ws1, wchar16_t * ws2, int n)
sj3_wsncpy16(ws1, ws2, n)
wchar16_t *ws1, *ws2;
int n;
{ {
wchar16_t* ws; wchar16_t* ws;
int i = 0; int i = 0;
@ -175,9 +155,7 @@ int n;
return ws1; return ws1;
} }
wchar16_t* wchar16_t* sj3_wscat16(wchar16_t * ws1, wchar16_t * ws2)
sj3_wscat16(ws1, ws2)
wchar16_t *ws1, *ws2;
{ {
wchar16_t* ws; wchar16_t* ws;
@ -195,9 +173,7 @@ wchar16_t *ws1, *ws2;
return ws1; return ws1;
} }
wchar16_t wchar16_t sj3_euc2wc16(unsigned int code)
sj3_euc2wc16(code)
unsigned int code;
{ {
wchar16_t wc = 0; wchar16_t wc = 0;
@ -212,9 +188,7 @@ unsigned int code;
return wc; return wc;
} }
wchar16_t wchar16_t sj3_sjis2wc16(unsigned int code)
sj3_sjis2wc16(code)
unsigned int code;
{ {
unsigned short ch; unsigned short ch;
@ -228,9 +202,7 @@ unsigned int code;
return (sj3_euc2wc16(ch)); return (sj3_euc2wc16(ch));
} }
unsigned int unsigned int sj3_wc2euc16(wchar16_t wc)
sj3_wc2euc16(wc)
wchar16_t wc;
{ {
unsigned int code = 0; unsigned int code = 0;
unsigned char tmp; unsigned char tmp;
@ -253,9 +225,7 @@ wchar16_t wc;
return code; return code;
} }
unsigned int unsigned int sj3_wc2sjis16(wchar16_t wc)
sj3_wc2sjis16(wc)
wchar16_t wc;
{ {
unsigned int ch; unsigned int ch;
@ -270,11 +240,7 @@ wchar16_t wc;
return wc; return wc;
} }
} }
int sj3_wcs2eucs16(unsigned char * mb, wchar16_t * ws, int n)
int sj3_wcs2eucs16(mb, ws, n)
unsigned char* mb;
wchar16_t* ws;
int n;
{ {
int i = 0; int i = 0;
unsigned int code; unsigned int code;
@ -314,11 +280,7 @@ int n;
return i; return i;
} }
int sj3_wcs2sjiss16(unsigned char * mb, wchar16_t * ws, int n)
int sj3_wcs2sjiss16(mb, ws, n)
unsigned char* mb;
wchar16_t* ws;
int n;
{ {
int i = 0; int i = 0;
unsigned int code; unsigned int code;
@ -348,11 +310,7 @@ int n;
return i; return i;
} }
int sj3_eucs2wcs16(wchar16_t * ws, unsigned char * mb, int n)
int sj3_eucs2wcs16(ws, mb, n)
wchar16_t* ws;
unsigned char* mb;
int n;
{ {
int i = 0; int i = 0;
unsigned int code; unsigned int code;
@ -379,11 +337,7 @@ int n;
return i; return i;
} }
int sj3_sjiss2wcs16(wchar16_t * ws, unsigned char * mb, int n)
int sj3_sjiss2wcs16(ws, mb, n)
wchar16_t* ws;
unsigned char* mb;
int n;
{ {
int i = 0; int i = 0;
unsigned int code; unsigned int code;
@ -406,22 +360,14 @@ int n;
return i; return i;
} }
int sj3_mbstowcs16(wchar16_t * ws, unsigned char * mb, int n)
int sj3_mbstowcs16(ws, mb, n)
wchar16_t* ws;
unsigned char* mb;
int n;
{ {
if(current_locale == LC_CTYPE_EUC) if(current_locale == LC_CTYPE_EUC)
return sj3_eucs2wcs16(ws, mb, n); return sj3_eucs2wcs16(ws, mb, n);
else else
return sj3_sjiss2wcs16(ws, mb, n); return sj3_sjiss2wcs16(ws, mb, n);
} }
int sj3_wcstombs16(unsigned char * mb, wchar16_t * ws, int n)
int sj3_wcstombs16(mb, ws, n)
unsigned char* mb;
wchar16_t* ws;
int n;
{ {
if(current_locale == LC_CTYPE_EUC) if(current_locale == LC_CTYPE_EUC)
return sj3_wcs2eucs16(mb, ws, n); return sj3_wcs2eucs16(mb, ws, n);