nishiTV/sj3
1
0
Fork 0
Code Pull requests Activity

replace u_xxxx style, defined <sys/types.h>

Browse source 
replace:
	u_char -> unsigned char
	u_short -> unsigned short
	u_int -> unsigned int
	u_long (not used)

include <sys/types.h> is kept.

dicttool.h:
	fix include guard DICTTOLL -> DICTTOOL

addelcmn.c:unsigned int addel_arg()
deldic.c:unsigned int deldic()
	change u_short err -> unsigned int err (used for return value)

Signed-off-by: SASANO Takayoshi <uaa@uaa.org.uk>
This commit is contained in:
SASANO Takayoshi 2023-12-10 16:28:22 +09:00 • committed by Masanori Ogino
commit a9a6c86f12
99 changed files with 1711 additions and 1709 deletions
Download patch file Download diff file Expand all files Collapse all files

46
getkanji.c
View file

@ -41,18 +41,18 @@
#include "kanakan.h"
static u_char*
code2kanji(u_char* s, u_char* d, u_char* ym, int yl, int flg);
static unsigned char*
code2kanji(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg);
u_char*
getkan_none(u_char* s, u_char* d, u_char* ym, int yl, int flg)
unsigned char*
getkan_none(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg)
{
return d;
}
u_char*
getkan_hira(u_char* s, u_char* d, u_char* ym, int yl, int flg)
unsigned char*
getkan_hira(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg)
{
int cnt, csize;
@ -71,11 +71,11 @@ getkan_hira(u_char* s, u_char* d, u_char* ym, int yl, int flg)
}
u_char*
getkan_kata(u_char* s, u_char* d, u_char* ym, int yl, int flg)
unsigned char*
getkan_kata(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg)
{
int cnt, csize;
u_char ch;
unsigned char ch;
csize = codesize(*s);
@ -108,16 +108,16 @@ getkan_kata(u_char* s, u_char* d, u_char* ym, int yl, int flg)
}
u_char*
getkan_knj(u_char* s, u_char* d, u_char* ym, int yl, int flg)
unsigned char*
getkan_knj(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg)
{
return code2kanji(askknj[*s & KnjAssyukuMask], d, ym, yl, flg);
}
u_char*
getkan_ofs(u_char* s, u_char* d, u_char* ym, int yl, int flg)
unsigned char*
getkan_ofs(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg)
{
return code2kanji(dicbuf + ((*s & KanjiCodeMask) << 8) + *(s + 1),
@ -125,10 +125,10 @@ getkan_ofs(u_char* s, u_char* d, u_char* ym, int yl, int flg)
}
u_char*
getkan_norm(u_char* s, u_char* d, u_char* ym, int yl, int flg)
unsigned char*
getkan_norm(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg)
{
u_char c;
unsigned char c;
if (*s != 0) {
c = s[1];
@ -143,10 +143,10 @@ getkan_norm(u_char* s, u_char* d, u_char* ym, int yl, int flg)
}
u_char*
getkan_ascii(u_char* s, u_char* d, u_char* ym, int yl, int flg)
unsigned char*
getkan_ascii(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg)
{
u_char c;
unsigned char c;
c = s[1];
if (c & 0x80)
@ -157,8 +157,8 @@ getkan_ascii(u_char* s, u_char* d, u_char* ym, int yl, int flg)
}
static u_char*
code2kanji(u_char* s, u_char* d, u_char* ym, int yl, int flg)
static unsigned char*
code2kanji(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg)
{
int csize;
@ -221,9 +221,9 @@ code2kanji(u_char* s, u_char* d, u_char* ym, int yl, int flg)
int
getkanji(u_char* ym, int yl, u_char* ptr, u_char* buf)
getkanji(unsigned char* ym, int yl, unsigned char* ptr, unsigned char* buf)
{
u_char *q;
unsigned char *q;
q = code2kanji(ptr, buf, ym, yl, TRUE);