Add explicit function prototypes

This commit is contained in:
Nishi 2026-06-18 14:11:47 +09:00
commit b82d393de3
40 changed files with 162 additions and 103 deletions

View file

@ -34,8 +34,10 @@
#include "sj_yomi.h"
#include "kanakan.h"
int sj2cd_str();
void mvmemi(), mvmemd(), mkidxtbl();
int sj2cd_str(unsigned char * euc, unsigned char * yomi, int len);
void mvmemi(unsigned char * src, unsigned char * dest, int len);
void mvmemd(unsigned char * src, unsigned char * dest, int len);
void mkidxtbl(DICT * dict);
void set_size(unsigned char* p, int size, int plen, int nlen) {
*p = (unsigned char)(size >> 8);

View file

@ -31,8 +31,9 @@
#include "sj_kcnv.h"
#include "kanakan.h"
int sj2cd_chr();
void cvtclknj(), freework();
int sj2cd_chr(unsigned char * euc, unsigned char * yomi);
void cvtclknj(void);
void freework(void);
static CLREC* nextrecblk(void);
static CLREC* prevrecblk(void);

View file

@ -32,8 +32,9 @@
#include "sj_kcnv.h"
#include "kanakan.h"
int sj2cd_str();
void mvmemd(), mvmemi();
int sj2cd_str(unsigned char * euc, unsigned char * yomi, int len);
void mvmemd(unsigned char * src, unsigned char * dest, int len);
void mvmemi(unsigned char * src, unsigned char * dest, int len);
static unsigned char* delcldata(unsigned char* ycode);
static int delclold(void);

2
code.c
View file

@ -44,7 +44,7 @@ static int ccnt = 0;
int codeconv(wchar16_t c, unsigned int * rkstr)
{
unsigned short ccode, i;
unsigned short CheckCcode();
unsigned short CheckCcode(wchar16_t c);
extern int erase_char;
if(c == erase_char) {

View file

@ -39,8 +39,8 @@ extern int Hlevel;
extern int oasys;
extern int flush_conversion;
Conversion* AllocConversion();
Conversion* GetConversion();
Conversion* AllocConversion(void);
Conversion* GetConversion(void);
#ifdef DEBUG
FILE* dbfp;

View file

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

View file

@ -31,9 +31,10 @@
#include "sj_kcnv.h"
#include "kanakan.h"
void mkknjmax();
void mvmemi(), free_clall();
void free_jall();
void mkknjmax(void);
void mvmemi(unsigned char * src, unsigned char * dest, int len);
void free_clall(CLREC * p);
void free_jall(JREC * p);
void cvtphknj(void) {
int i, j;

View file

@ -32,8 +32,8 @@
#include "sj_kcnv.h"
#include "kanakan.h"
void mvmemi();
void mkidxtbl();
void mvmemi(unsigned char * src, unsigned char * dest, int len);
void mkidxtbl(DICT * dict);
static int del_douon(TypeDicSeg seg, unsigned char* ptr, TypeDicOfs ofs);
static int del_segment(TypeDicSeg seg);

2
edit.c
View file

@ -30,7 +30,7 @@
#include "common.h"
#include "key.h"
void Chain();
void Chain(int n, int len);
static wchar16_t* jpoint;
static int iedit, jedit;

2
etc.c
View file

@ -35,7 +35,7 @@ static char rehname[SHORTLENGTH * 2];
extern char* cur_serv;
static int dcflag = 0;
void disp_version();
void disp_version(int c);
int exec_etc(int key)
{
unsigned short row, col;

View file

@ -342,12 +342,26 @@ int init_hin_val(void)
hin_val[4].ivalue = SJ3_H_SILVERB;
}
extern int set_func(), set_etckeys(), set_intr(),
set_delkey(), set_goto(), set_trap(), set_init_mode(),
set_helpmenu(), set_defcode(), set_muhenkan(), set_muedit(),
set_m_toggle(), set_guide(), set_forkshell(), set_bstudy(),
set_silent(), set_flush_conversion(), set_rkebell(), set_server(),
set_dict();
extern int set_func(struct wordent word[]);
extern int set_etckeys(struct wordent word[]);
extern int set_intr(struct wordent word[]);
extern int set_delkey(struct wordent word[]);
extern int set_goto(struct wordent word[]);
extern int set_trap(struct wordent word[]);
extern int set_init_mode(struct wordent word[]);
extern int set_helpmenu(struct wordent word[]);
extern int set_defcode(struct wordent word[]);
extern int set_muhenkan(struct wordent word[]);
extern int set_muedit(struct wordent word[]);
extern int set_m_toggle(struct wordent word[]);
extern int set_guide(struct wordent word[]);
extern int set_forkshell(struct wordent word[]);
extern int set_bstudy(struct wordent word[]);
extern int set_silent(struct wordent word[]);
extern int set_flush_conversion(struct wordent word[]);
extern int set_rkebell(struct wordent word[]);
extern int set_server(struct wordent word[]);
extern int set_dict(struct wordent word[]);
#define CURFUNCS 29
struct functbl funcs[CURFUNCS];
int init_funcs(void)

View file

@ -71,12 +71,13 @@ static Client* cur_cli;
static unsigned char defaultchar[2] = {(unsigned char)0x81, (unsigned char)0x40};
static int defuse = 0, defuse2 = 0;
DictFile* opendict();
int closedict();
StdyFile* openstdy();
int closestdy();
DictFile* opendict(char* name, char* passwd);
int closedict(DictFile* dfp);
StdyFile* openstdy(char* name, char* passwd);
int closestdy(StdyFile* sfp);
unsigned char *put_ndata(), *put_string();
unsigned char* put_ndata(unsigned char* p, int n);
unsigned char* put_string(unsigned char* p);
int make_full_path(char* path) {
char tmp[PathNameLen];

View file

@ -169,13 +169,13 @@ void clear_ukeys(void) {
Unumber = 0;
}
void set_func(struct wordent word[]) {
int set_func(struct wordent word[]) {
int i, num;
wchar16_t * p, *s;
struct wcvtkey* ckeyp;
if(Unumber >= UKEYNUM)
return;
return 0;
for(i = 0; i < KEY_OTHER && *comstr[i] != '\0'; i++) {
if(match(word[1].word_str, comstr[i])) {
p = word[2].word_str;
@ -185,7 +185,7 @@ void set_func(struct wordent word[]) {
if(wscmp(p, ckeyp->key_word) == 0) {
p = ckeyp->key_seq;
if(*p == '\0')
return;
return 0;
break;
}
ckeyp++;
@ -201,9 +201,10 @@ void set_func(struct wordent word[]) {
comvalue[comnumber++] = comstrvalue[i];
}
}
return;
return 0;
}
}
return 0;
}
wchar16_t

View file

@ -32,8 +32,8 @@
#include "sj_right.h"
#include "sj_yomi.h"
CLREC* argclrec();
int terminate();
CLREC* argclrec(int len);
int terminate(TypeCnct right, unsigned char * yomi);
static int fzkstrcmp(unsigned char * yptr, unsigned char * fzkp, int * saml)
{
int asklen, nkrlen;

View file

@ -32,7 +32,7 @@
#include "wchar16.h"
#include "kctype.h"
void Rdisp();
void Rdisp(void);
int i_point;
int exec_henkan(void)

View file

@ -39,13 +39,15 @@ static int lastcode = BEGIN_CODE;
static unsigned short row, col;
void input_kigou();
void input_kigou(int basecode, int code, int increse);
int kigou(void)
{
extern int keyvalue;
int increse, code, basecode;
int inc, ki, low;
unsigned short num, CheckCcode(), strtocode();
unsigned short num;
unsigned short CheckCcode(wchar16_t c);
unsigned short strtocode(void);
int rval;
increse = INCRESE;

View file

@ -136,12 +136,12 @@ put_ndata(void* p, int n) {
static int
put_over(int buflen, int n,
unsigned char* (*func1)(), void* str1, int len1,
unsigned char* (*func2)(), void* str2, int len2,
unsigned char* (*func3)(), void* str3, int len3,
unsigned char* (*func4)(), void* str4, int len4) {
unsigned char* (*func1)(void*, int), void* str1, int len1,
unsigned char* (*func2)(void*, int), void* str2, int len2,
unsigned char* (*func3)(void*, int), void* str3, int len3,
unsigned char* (*func4)(void*, int), void* str4, int len4) {
#define ARGNUM 4
unsigned char* (*func[ARGNUM])();
unsigned char* (*func[ARGNUM])(void*, int);
unsigned char* data[ARGNUM];
int len[ARGNUM];
int i;

View file

@ -33,6 +33,7 @@
#endif
#include "wchar16.h"
#include <locale.h>
#include <string.h>
#include "kctype.h"
#include "common.h"
@ -40,12 +41,13 @@ extern char user_name[];
extern char * cur_serv, **serv_list;
extern char** dict_list;
extern int dict_num;
char* chmyhname();
char* chmyhname(char* hname);
extern int current_locale;
int sjislen(), euclen();
int sjislen(unsigned char * str, int max);
int euclen(unsigned char * str, int max);
int (*len_func[3])() = {0, sjislen, euclen};
int (*len_func[3])(unsigned char*, int) = {0, sjislen, euclen};
#define YOMILEN 32
#define KLEN 64

View file

@ -316,7 +316,7 @@ douon_knj(DouonRec* drec) {
int i;
int len = 0;
unsigned char* p;
unsigned char* knjofscvt();
unsigned char* knjofscvt(unsigned char* ptr, int len, int* ret);
HinsiRec* hrec;
KanjiRec* krec;

View file

@ -29,7 +29,8 @@
#include "sj_kcnv.h"
void free_jrec(), free_clrec();
void free_jrec(JREC* p);
void free_clrec(CLREC* p);
JREC* free_jlst(JREC * p)
{
JREC* jpk;

View file

@ -30,9 +30,14 @@
#include "sj_kcnv.h"
#include "sj_right.h"
int terminate(), priority();
void mkjiritu(), mkbunsetu(), wakachi(), pritiny();
void free_clall(), free_jall();
int terminate(TypeCnct right, unsigned char * yomi);
int priority(CLREC * clrec);
void mkjiritu(int mode);
void mkbunsetu(void);
void wakachi(void);
void pritiny(void);
void free_clall(CLREC * p);
void free_jall(JREC * p);
static int set2nd(CLREC * clrec)
{

View file

@ -33,8 +33,9 @@
#include "sj_hinsi.h"
#include "kanakan.h"
int terminate();
void setclrec(), srchfzk();
int terminate(TypeCnct right, unsigned char * yomi);
void setclrec(JREC * jrec, unsigned char * yptr, TypeCnct right);
void srchfzk(JREC * jrec, unsigned char * yptr, TypeCnct right, int level);
void mkbunsetu(void) {
JREC* jrec;

View file

@ -32,7 +32,7 @@
#include "sj_kcnv.h"
#include "kanakan.h"
int srchhead();
int srchhead(void);
static void dic_mu(int mode);
static void dic_cl(void);

View file

@ -33,7 +33,7 @@
#include <string.h>
#include <unistd.h>
static char* getttys();
static char* getttys(int f);
static char* ttys = "/etc/ttys";
#define NULL 0

View file

@ -31,7 +31,7 @@
#include "sj_yomi.h"
#include "kanakan.h"
unsigned char* skiphblk();
unsigned char* skiphblk(unsigned char * ptr);
static void add_yomi(void);
static void cd2sjh_chr(unsigned char ch, unsigned char* dst);

View file

@ -32,12 +32,12 @@
#include "sj_yomi.h"
#include "kanakan.h"
int sj2cd_chr();
void mk2claus();
void freework();
void selclrec();
CLREC* free_clst();
JREC* free_jlst();
int sj2cd_chr(unsigned char * euc, unsigned char * yomi);
void mk2claus(void);
void freework(void);
void selclrec(void);
CLREC* free_clst(CLREC * p, int l);
JREC* free_jlst(JREC * p);
int ph2knj(unsigned char* zyomi, unsigned char* kanji, int knjlen) {
unsigned char* ptr;

View file

@ -35,9 +35,8 @@ static char rcsid[] = "$Header: /export/work/contrib/sj3/sj3rkcv/RCS/rk_conv.c,v
#include "wchar16.h"
#include <stdio.h>
#include <ctype.h>
#ifdef SVR4
#include <string.h>
#else
#ifndef SVR4
#include <strings.h>
#endif
#ifdef __sony_news
@ -454,16 +453,18 @@ int sj3_rkinit_mb(char * rkfile)
return sj3_rkinit_sub(rkfile, rcode_sjis_init);
}
int sj3_rkinit_sub(char* rkfile, int (*mbfunc)())
int sj3_rkinit_sub(char* rkfile, int (*mbfunc)(void))
{
char* p;
int len, klen, rlen, retv;
FILE * fp, *fopen();
FILE* fp;
char line[MAXLEN + 1];
wchar16_t rkey[MAXWLEN + 1], rstr[MAXWLEN + 1];
unsigned short kstr[MAXWLEN + 1];
char * strcpy(), *getkey(), *rkgetyomi();
RkTablW16 * rktp, *mktable();
char* getkey(char * istr, wchar16_t * ostr, int * len);
char* rkgetyomi(char * istr, wchar16_t * ostr, int * len);
RkTablW16 * rktp;
RkTablW16* mktable(wchar16_t * key, int len);
if(rkfile == NULL || *rkfile == NSTR)
fp = stdin;

View file

@ -29,8 +29,11 @@
#include "sj_kcnv.h"
void free_clall(), free_jall(), mkjiritu(), mkbunsetu();
void wakachi();
void mkjiritu(int mode);
void mkbunsetu(void);
void free_clall(CLREC * p);
void free_jall(JREC * p);
void wakachi(void);
void selclrec(void)
{
int len;

View file

@ -66,10 +66,10 @@ void warning_out(char *s, int p1, int p2, int p3, int p4, int p5);
void logging_out(char *s, int p1, int p2, int p3, int p4, int p5);
void debug_out(int lvl, char *s, int p1, int p2, int p3, int p4, int p5);
#else /* correct solution is to make the functions take arbitrary parameters... */
void error_out();
void warning_out();
void logging_out();
void debug_out();
void error_out(char * fmt, int p1, int p2, int p3, int p4, int p5);
void warning_out(char* s, int p1, int p2, int p3, int p4, int p5);
void logging_out(char* s, int p1, int p2, int p3, int p4, int p5);
void debug_out(int lvl, char* s, int p1, int p2, int p3, int p4, int p5);
#endif
/* execute.c */

View file

@ -193,7 +193,7 @@ get_list(unsigned char* p, StrList** dst) {
struct optlist {
char* optname;
unsigned char* (*optfunc)();
unsigned char* (*optfunc)(unsigned char* p, void* pv_dst);
void* optarg;
} option[] = {
/*

14
sj3.c
View file

@ -31,6 +31,8 @@
#include "wchar16.h"
#include <signal.h>
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
#define USE_OLD_TTY
#if defined(__NetBSD__)
@ -128,9 +130,9 @@ struct jtchars jtc;
int erase_char;
wchar16_t erase_str[2];
#ifdef SIGTYPE_VOID
void (*sigpipe)();
void (*sigpipe)(int);
#else
int (*sigpipe)();
int (*sigpipe)(int);
#endif
int Pid_shell;
@ -192,8 +194,7 @@ void init(char** argv) {
void init_env(void) {
char * uname, *hp, *tname;
int i;
struct passwd *pwd, *getpwnam(), *getpwuid();
char * getlogin(), *getenv();
struct passwd* pwd;
user_name[0] = '\0';
home[0] = '\0';
@ -880,7 +881,6 @@ void getslave(void) {
void execcmd(char* cmd, char** ap) {
int c;
char* getenv();
char *path, *cp, fullcmd[BUFSIZ];
path = getenv("PATH");
@ -980,9 +980,9 @@ void exitprocess(void) {
void suspend(void) {
#ifdef SIGTYPE_VOID
void (*old_sigtstp)();
void (*old_sigtstp)(int);
#else
int (*old_sigtstp)();
int (*old_sigtstp)(int);
#endif
SELECT_FD ifds;
int nc;

2
sj3.h
View file

@ -38,7 +38,7 @@
void mk_cvtkey(char* term);
char* getkey2(char* istr, char* ostr);
void clear_ukeys(void);
void set_func(struct wordent word[]);
int set_func(struct wordent word[]);
wchar16_t eval_keys(wchar16_t* s, wchar16_t* p);
void clear_key(void);
void clear_commkeys(void);

View file

@ -154,13 +154,15 @@ static unsigned short HZtbl[95] = {
0xa3f0, 0xa3f1, 0xa3f2, 0xa3f3, 0xa3f4, 0xa3f5, 0xa3f6, 0xa3f7,
0xa3f8, 0xa3f9, 0xa3fa, 0xa1d0, 0xa1c3, 0xa1d1, 0xa1b1};
#ifdef ADDHK setl_hktozh(void)
#ifdef ADDHK
int setl_hktozh(void)
{
int i;
unsigned short c, zen1;
wchar16_t rstr[2];
wchar16_t kstr[2];
RkTablW16 * rktp, *mktable();
RkTablW16 * rktp;
RkTablW16* mktable(wchar16_t * key, int len);
zen1 = (ZHIRA1 << 8);
rstr[1] = '\0';
@ -195,7 +197,8 @@ int mkkigou(void)
int i;
wchar16_t rstr[2];
wchar16_t kstr[2];
RkTablW16 *rktp, *mktable();
RkTablW16 *rktp;
RkTablW16* mktable(wchar16_t * key, int len);
rstr[1] = '\0';
kstr[1] = 0;

7
sjrc.c
View file

@ -49,12 +49,13 @@ static char* rcfile = ".sjrc";
static int user_euc = 0;
static int file_code = SYS_SJIS;
void setrc();
int set_dict(), set_server();
int setrc(char * file);
int set_dict(struct wordent word[]);
int set_server(struct wordent word[]);
struct functbl {
char* keyword;
int (*func)();
int (*func)(struct wordent word[]);
} funcs[] = {
{"dictionary", set_dict},
{"userdic", set_dict},

32
sjrc2.c
View file

@ -35,6 +35,8 @@
#include "common.h"
#include "key.h"
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include "Paths.h"
int vflag = 1;
@ -99,12 +101,26 @@ extern wchar16_t *Key, *Escape, *Sjxkey, *Etckey, *Intr, *Bskey, *Delkey,
extern wchar16_t *Halpha, *Zalpha, *Hkata, *Zkata, *Hira;
extern wchar16_t *Shiftjis, *Sjis, *Euc, *Euc2, *Jis, *Jis2, *Kuten, *Kuten2;
int set_func(), set_etckeys(), set_intr(),
set_delkey(), set_goto(), set_trap(), set_init_mode(),
set_helpmenu(), set_defcode(), set_muhenkan(), set_muedit(),
set_m_toggle(), set_guide(), set_forkshell(), set_bstudy(),
set_silent(), set_flush_conversion(), set_rkebell(), set_server(),
set_dicts();
int set_func(struct wordent word[]);
int set_etckeys(struct wordent word[]);
int set_intr(struct wordent word[]);
int set_delkey(struct wordent word[]);
int set_goto(struct wordent word[]);
int set_trap(struct wordent word[]);
int set_init_mode(struct wordent word[]);
int set_helpmenu(struct wordent word[]);
int set_defcode(struct wordent word[]);
int set_muhenkan(struct wordent word[]);
int set_muedit(struct wordent word[]);
int set_m_toggle(struct wordent word[]);
int set_guide(struct wordent word[]);
int set_forkshell(struct wordent word[]);
int set_bstudy(struct wordent word[]);
int set_silent(struct wordent word[]);
int set_flush_conversion(struct wordent word[]);
int set_rkebell(struct wordent word[]);
int set_server(struct wordent word[]);
int set_dicts(void);
extern struct functbl funcs[];
extern struct valtbl mode_val[], code_val[];
@ -143,7 +159,6 @@ int sjrc_init(void)
int getsjrc(void)
{
char* p;
char* getenv();
sjset_code();
mk_cvtkey(term_name);
@ -176,7 +191,7 @@ int setrc(char * file)
char line[MAXLINE];
struct wordent word[WORDN];
struct functbl* functp;
FILE * fd, *fopen();
FILE* fd;
if(vflag > 1)
aprintf("sjrc file is %s\n", file);
@ -205,7 +220,6 @@ int getsjrk(int erase)
{
char* p;
int i;
char* getenv();
char RKfile[LONGLENGTH];
RKfile[0] = '\0';

View file

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

View file

@ -32,7 +32,7 @@
#include "sj_kcnv.h"
#include "kanakan.h"
int istrcmp();
int istrcmp(unsigned char* yomip, unsigned char* idxp, int ylen, int ilen);
TypeDicSeg
srchidx(TypeDicSeg low, int len) {

View file

@ -31,7 +31,8 @@
#include "sj_kcnv.h"
#include "kanakan.h"
void mvmemi(), mvmemd();
void mvmemi(unsigned char * src, unsigned char * dest, int len);
void mvmemd(unsigned char * src, unsigned char * dest, int len);
int study(STDYOUT* stdy) {
STDYOUT outp;

View file

@ -32,8 +32,9 @@
#include "sj_hinsi.h"
#include "kanakan.h"
int terminate();
void setclrec(), srchfzk();
int terminate(TypeCnct right, unsigned char * yomi);
void setclrec(JREC * jrec, unsigned char * yptr, TypeCnct right);
void srchfzk(JREC * jrec, unsigned char * yptr, TypeCnct right, int level);
void wakachi(void) {
JREC* jrec;

View file

@ -344,6 +344,8 @@ typedef unsigned short wchar16_t;
extern wchar16_t* WcMessages[];
struct wordent;
struct wcvtkey {
wchar16_t* key_word;
wchar16_t key_seq[SEQLEN];
@ -351,7 +353,7 @@ struct wcvtkey {
struct functbl {
wchar16_t* keyword;
int (*func)();
int (*func)(struct wordent* word);
};
#endif