pyrite-dev/sj4
12
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix several bugs

Browse source
This commit is contained in:
Nishi 2026-06-20 21:16:45 +09:00
commit ef900e7358
9 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/sj4core/adddic.c
View file

@ -71,7 +71,7 @@ u_int adddic(SJ4_CONTEXT u_char* yomi, u_char* kanji, TypeGram hinsi) {
int nlen, plen;
int size;
STDYIN* stdy;
STDYOUT stdydat;
STDYOUT stdydat = {0};
if((err = addel_arg(SJ4_CONTEXT_PASS yomi, kanji, hinsi, yptr, sizeof(yptr))))
return err;

2
lib/sj4core/cvtkanji.c
View file

@ -132,7 +132,7 @@ void setstyrec(SJ4_CONTEXT KHREC* krec) {
KHREC* kptr;
int ii;
u_char* fptr;
STDYOUT stdy;
STDYOUT stdy = {0};
jrec = krec->clrec->jnode;

2
lib/sj4core/init.c
View file

@ -95,7 +95,7 @@ Sj4Context* alloccontext(const char* dic) {
dict = opendict(ctx, (char*)dic, "");
if(dict == NULL){
if(dict == NULL) {
free_context(ctx);
return NULL;
}

19
lib/sj4core/sdepend.c
View file

@ -60,8 +60,13 @@
#define ftruncate chsize
#endif
#ifdef SJ3_GLOBAL
DictFile* dictlink = NULL;
StdyFile* stdylink = NULL;
#else
#define dictlink ctx->dictlink
#define stdylink ctx->stdylink
#endif
static long
get4byte(u_char* p) {
@ -150,7 +155,7 @@ check_dictfile(u_char* buf) {
}
static DictFile*
search_same_dict(ino_t ino) {
search_same_dict(SJ4_CONTEXT ino_t ino) {
DictFile* p;
for(p = dictlink; p != NULL; p = p->link)
@ -251,7 +256,7 @@ opendict(SJ4_CONTEXT char* name, char* passwd) {
return NULL;
}
if((dfp = search_same_dict(sbuf.st_ino)) != NULL) {
if((dfp = search_same_dict(SJ4_CONTEXT_PASS sbuf.st_ino)) != NULL) {
dfp->refcnt++;
return dfp;
}
@ -386,7 +391,7 @@ check_stdyfile(u_char* buf) {
}
static StdyFile*
search_same_stdy(ino_t ino) {
search_same_stdy(SJ4_CONTEXT ino_t ino) {
StdyFile* p;
for(p = stdylink; p != NULL; p = p->link)
@ -396,7 +401,7 @@ search_same_stdy(ino_t ino) {
}
StdyFile*
openstdy(char* name, char* passwd) {
openstdy(SJ4_CONTEXT char* name, char* passwd) {
FILE* fp;
struct stat sbuf;
StdyFile* sfp;
@ -417,7 +422,7 @@ openstdy(char* name, char* passwd) {
return NULL;
}
if((sfp = search_same_stdy(sbuf.st_ino)) != NULL) {
if((sfp = search_same_stdy(SJ4_CONTEXT_PASS sbuf.st_ino)) != NULL) {
sfp->refcnt++;
return sfp;
}
@ -512,7 +517,7 @@ error0:
return NULL;
}
int closestdy(StdyFile* sfp) {
int closestdy(SJ4_CONTEXT StdyFile* sfp) {
StdyFile* sf;
if(--sfp->refcnt > 0) return 0;
@ -714,7 +719,7 @@ error:
void sj_closeall(SJ4_CONTEXT2) {
while(dictlink) closedict(SJ4_CONTEXT_PASS dictlink);
while(stdylink) closestdy(stdylink);
while(stdylink) closestdy(SJ4_CONTEXT_PASS stdylink);
}
int set_dictpass(DictFile* dp, char* pass) {