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

Fix warnings in clang

Browse source
This commit is contained in:
Nishi 2026-06-19 02:57:26 +09:00
commit ceceab8d8b
21 changed files with 49 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/sj3mkdic/cnvhinsi.c
View file

@ -72,7 +72,7 @@ int cnvhinsi(u_char* buf) {
mid = (min + max) / 2;
i = u_strcmp(buf, gramtbl[mid].name);
i = u_strcmp(buf, (u_char*)gramtbl[mid].name);
if(i < 0) {
max = mid - 1;

4
src/sj3mkdic/makedict.c
View file

@ -88,7 +88,7 @@ char* get_idxlist(char* name) {
i = 0;
for(q = p; *q;) {
if(fp = fopen(q, "r"))
if((fp = fopen(q, "r")))
fclose(fp);
else {
fprintf(stderr, "Can't open %s mode \"r\"\n", q);
@ -106,7 +106,7 @@ void parse(int argc, char** argv) {
char* progname = NULL;
char* p;
if(progname = strrchr(argv[0], '/'))
if((progname = strrchr(argv[0], '/')))
progname++;
else
progname = argv[0];

12
src/sj3mkdic/makelist.c
View file

@ -112,19 +112,19 @@ makekanji(int* yomi, int* kanji, int* atr, int* len) {
#endif
}
if(i = top_strcmp(yomi, kanji)) {
if((i = top_strcmp(yomi, kanji))) {
kanji += i;
ktmp[pos++] = (ZENHIRAASSYUKU | (i - 1));
} else if(i = top_strcmp(kana, kanji)) {
} else if((i = top_strcmp(kana, kanji))) {
kanji += i;
ktmp[pos++] = (ZENKATAASSYUKU | (i - 1));
}
while(*kanji) {
if(i = last_strcmp(yomi, kanji)) {
if((i = last_strcmp(yomi, kanji))) {
kanji += i;
ktmp[pos++] = (ZENHIRAASSYUKU | (i - 1));
} else if(i = last_strcmp(kana, kanji)) {
} else if((i = last_strcmp(kana, kanji))) {
kanji += i;
ktmp[pos++] = (ZENKATAASSYUKU | (i - 1));
} else if(((*kanji >> 8) & 0xff) == SS2 || *kanji < 0x100) {
@ -293,7 +293,7 @@ douon_knj(DouonRec* drec) {
int i;
int len = 0;
u_char* p;
u_char* knjofscvt();
u_char* knjofscvt(u_char*, int, int*);
HinsiRec* hrec;
KanjiRec* krec;
@ -442,7 +442,7 @@ void makelist(int* yomi, int* kanji, int hinsi, int* atr) {
kcode = makekanji(yomi, kanji, atr, &klen);
if(drectmp && strcmp(ycode, drectmp->yptr)) {
if(drectmp && strcmp((char*)ycode, (char*)drectmp->yptr)) {
make_d_list(drectmp);
drectmp = NULL;

13
src/sj3mkdic/makeseg.c
View file

@ -225,7 +225,7 @@ void makeseg() {
dst += DOUONBLKSIZENUMBER;
p = drec->yptr;
slen = strlen(p) - drec->dlen;
slen = strlen((char*)p) - drec->dlen;
p += slen;
for(i = drec->dlen; i > 0; i--) {
datset(*p);
@ -291,7 +291,7 @@ void makeseg() {
fprintf(stderr, "\275\320\316\317\245\325\245\241\245\244\245\353\244\307\245\267\241\274\245\257\245\250\245\351\241\274\n");
exit(1);
}
if(Fwrite(buf, sizeof(buf), 1, outfp) != 1) {
if(Fwrite((char*)buf, sizeof(buf), 1, outfp) != 1) {
fprintf(stderr, "\275\320\316\317\245\325\245\241\245\244\245\353\244\307\245\351\245\244\245\310\245\250\245\351\241\274\n");
exit(1);
}
@ -328,10 +328,7 @@ err:
#undef datset
}
static void put4byte(p, n)
u_char* p;
long n;
{
static void put4byte(u_char* p, long n) {
p += 3;
*p-- = n;
n >>= 8;
@ -379,9 +376,9 @@ void makehead(u_char* dict_name) {
put4byte(header + DICTASEGLEN, 0);
Fseek(outfp, (long)HEADERPOS, 0);
Fwrite(header, sizeof(header), 1, outfp);
Fwrite((char*)header, sizeof(header), 1, outfp);
Fseek(outfp, (long)INDEXPOS, 0);
Fwrite(mindex, MAININDEXLENGTH, 1, outfp);
Fwrite((char*)mindex, MAININDEXLENGTH, 1, outfp);
#undef INDEXPOS
}

2
src/sj3mkdic/readline.c
View file

@ -233,7 +233,7 @@ int* readline() {
error(NOKANJISTRING);
i = j = 0;
while(c = readhinsi()) {
while((c = readhinsi())) {
if(c < 0) {
if(i >= MAXATRNUMBER)
error(TOOMANYATR);

2
src/sj3mkdic/sj3_dict_const.h
View file

@ -90,7 +90,7 @@
#define NODATAINMAIN "\245\341\245\244\245\363\274\255\275\361\244\313\302\270\272\337\244\267\244\336\244\273\244\363"
#define TOOMANYTARGET "\311\312\273\354\244\362\243\261\244\304\273\330\304\352\244\267\244\306\244\257\244\300\244\265\244\244"
#define HINSITANKAN cnvhinsi("\303\261\264\301")
#define HINSITANKAN cnvhinsi((u_char*)"\303\261\264\301")
#define FALSE 0
#define TRUE (!FALSE)