diff --git a/Struct.h b/Struct.h index 2b27ec1..850e52d 100644 --- a/Struct.h +++ b/Struct.h @@ -53,34 +53,34 @@ typedef struct global { short Jtrank; short Jnrank; - u_char *Jinputyomi; - u_char *Jcnvstart; + unsigned char *Jinputyomi; + unsigned char *Jcnvstart; short Jcnvlen; - u_char *Jystart; - u_char Jhyomi[MaxPhInputLen + 1]; - u_char Jorgyomi[MaxClInputLen*2 + 1]; + unsigned char *Jystart; + unsigned char Jhyomi[MaxPhInputLen + 1]; + unsigned char Jorgyomi[MaxClInputLen*2 + 1]; - u_char Jkanjibuf[MinPhOutputLen]; - u_char *Jkanjipos; - u_char *Jkanjitmp; + unsigned char Jkanjibuf[MinPhOutputLen]; + unsigned char *Jkanjipos; + unsigned char *Jkanjitmp; short Jkanjilen; - u_char Jdicinl; - u_char Jdicsaml; + unsigned char Jdicinl; + unsigned char Jdicsaml; TypeDicSeg Jprevseg; - u_char Jfzkcount; - u_char Jfzk_ka_flg; + unsigned char Jfzkcount; + unsigned char Jfzk_ka_flg; FREC Jfzktbl[MAXFREC]; - u_char Jheadcode; - u_char Jheadlen; + unsigned char Jheadcode; + unsigned char Jheadlen; - u_char Jgobilen; + unsigned char Jgobilen; TypeGram Jprevclgrm; TypeCnct Jprevclrow; - u_char Jnextcllen; + unsigned char Jnextcllen; short Jkhcount; short Jnkhcount; @@ -89,31 +89,31 @@ typedef struct global { DICT *Jcurdict; DICTL *Jdictlist; - u_char *Jdicbuf; - u_char *Jidxbuf; + unsigned char *Jdicbuf; + unsigned char *Jidxbuf; TypeIdxOfs *Jidxofs; - u_char *Jaskknj[MaxKnjAskNumber]; - u_char *Jaskknj_k[MaxKnjAskNumber]; + unsigned char *Jaskknj[MaxKnjAskNumber]; + unsigned char *Jaskknj_k[MaxKnjAskNumber]; STDY *Jcurstdy; - u_short Jsuuji_wbuf[NumWordBuf]; - u_char Jsuuji_ubuf[NumKetaLength]; + unsigned short Jsuuji_wbuf[NumWordBuf]; + unsigned char Jsuuji_ubuf[NumKetaLength]; TypeClass Jsuuji_class; - u_char Jsuuji_comma; - u_char Jsuuji_keta; - u_char *Jsuuji_yptr; - u_char Jsuuji_len; - u_char Jsuuji_exit; - u_short *Jsuuji_wkeep; - u_char *Jsuuji_ukeep; + unsigned char Jsuuji_comma; + unsigned char Jsuuji_keta; + unsigned char *Jsuuji_yptr; + unsigned char Jsuuji_len; + unsigned char Jsuuji_exit; + unsigned short *Jsuuji_wkeep; + unsigned char *Jsuuji_ukeep; - u_char Jpeepyomi[MaxWdYomiLen * 2 + 1]; - u_char Jpeepknj[MaxWdKanjiLen + 1]; + unsigned char Jpeepyomi[MaxWdYomiLen * 2 + 1]; + unsigned char Jpeepknj[MaxWdKanjiLen + 1]; TypeGram Jpeepgrm; - u_char *Jpeepdptr; - u_char *Jpeephptr; - u_char *Jpeepkptr; + unsigned char *Jpeepdptr; + unsigned char *Jpeephptr; + unsigned char *Jpeepkptr; TypeDicSeg Jpeepidx; } Global; @@ -124,7 +124,7 @@ typedef struct dictfile { FILE *fp; int fd; - u_char *buffer; + unsigned char *buffer; long bufsiz; long idxstrt; @@ -142,7 +142,7 @@ typedef struct stdyfile { FILE *fp; int fd; - u_char *header; + unsigned char *header; struct stdyfile *link; } StdyFile; @@ -165,7 +165,7 @@ typedef struct client { WorkArea *work; StdyFile *stdy; short version; - u_char def_char[2]; + unsigned char def_char[2]; uid_t uid; struct client *next; } Client; diff --git a/adddic.c b/adddic.c index 0dd16a5..c4f7e34 100644 --- a/adddic.c +++ b/adddic.c @@ -43,19 +43,19 @@ #include "kanakan.h" -static u_int checkdict(u_char* kanji, TypeGram grm); -static int cal_nextym(u_char* ptr); +static unsigned int checkdict(unsigned char* kanji, TypeGram grm); +static int cal_nextym(unsigned char* ptr); static int usr_freelen(void); static void sprt_seg(TypeDicSeg seg, TypeDicOfs ofs); -static void apnd_uidx(TypeDicSeg seg, u_char* yomi, int len); +static void apnd_uidx(TypeDicSeg seg, unsigned char* yomi, int len); -u_int -adddic(u_char* yomi, u_char* kanji, TypeGram hinsi) +unsigned int +adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) { - u_int err; - u_char yptr[MaxWdYomiLen+1]; - u_char kptr[MaxWdKanjiLen+1]; + unsigned int err; + unsigned char yptr[MaxWdYomiLen+1]; + unsigned char kptr[MaxWdKanjiLen+1]; int klen; TypeDicSeg segnum; int saml; @@ -68,10 +68,10 @@ adddic(u_char* yomi, u_char* kanji, TypeGram hinsi) TypeDicOfs oldsiz; TypeDicOfs fresiz; TypeIdxOfs freidx; - u_char *douptr; - u_char *dstptr; + unsigned char *douptr; + unsigned char *dstptr; TypeDicOfs pos; - u_char *p1; + unsigned char *p1; int i; int nlen, plen; int size; @@ -197,7 +197,7 @@ adddic(u_char* yomi, u_char* kanji, TypeGram hinsi) douptr = dicbuf + douofs; if (nxtask) { - u_char *tp; + unsigned char *tp; size = getsize(douptr) - nxtask; plen = getplen(douptr) + nxtask; @@ -263,7 +263,7 @@ adddic(u_char* yomi, u_char* kanji, TypeGram hinsi) } for (p1 = ClStudyDict ; !iseocl(p1) ; p1 = ClNextTag(p1)) { - err = strncmp(yptr, (u_char*)ClYomiPos(p1), + err = strncmp(yptr, (unsigned char*)ClYomiPos(p1), (int)ClYomiLen(p1)); if (err == MATCH) { delclsub(p1); @@ -294,14 +294,14 @@ adddic(u_char* yomi, u_char* kanji, TypeGram hinsi) static int -checksub(u_char* kanji, TypeGram grm) +checksub(unsigned char* kanji, TypeGram grm) { - u_char *tagp; - u_char *ptr; - u_char *endp; + unsigned char *tagp; + unsigned char *ptr; + unsigned char *endp; int flg, nlen; int dounum; - u_char buf[MaxWdKanjiLen + 1]; + unsigned char buf[MaxWdKanjiLen + 1]; dicinl = cnvlen; dicsaml = 0; @@ -336,8 +336,8 @@ checksub(u_char* kanji, TypeGram grm) } -static u_int -checkdict(u_char* kanji, TypeGram grm) +static unsigned int +checkdict(unsigned char* kanji, TypeGram grm) { DICTL *dp; int dounum = 0; @@ -363,10 +363,10 @@ checkdict(u_char* kanji, TypeGram grm) static int -cal_nextym(u_char* ptr) +cal_nextym(unsigned char* ptr) { int count = 0; - u_char *src; + unsigned char *src; int len; if (!segend(ptr)) { @@ -389,7 +389,7 @@ cal_nextym(u_char* ptr) static int usr_freelen(void) { - u_char* ptr; + unsigned char* ptr; ptr = segtop(); while (!segend(ptr)) ptr += getsize(ptr); @@ -402,14 +402,14 @@ static void sprt_seg(TypeDicSeg seg, TypeDicOfs ofs) { TypeDicSeg s; - u_char *pos; - u_char *p; - u_char *q; + unsigned char *pos; + unsigned char *p; + unsigned char *q; int i; int j; int ylen, nlen; TypeDicID dicid; - u_char yomi[MaxWdYomiLen]; + unsigned char yomi[MaxWdYomiLen]; STDYIN *stdy; for (s = curdict->segunit - 1 ; s >= seg ; s--) { @@ -474,10 +474,10 @@ sprt_seg(TypeDicSeg seg, TypeDicOfs ofs) static void -apnd_uidx(TypeDicSeg seg, u_char* yomi, int len) +apnd_uidx(TypeDicSeg seg, unsigned char* yomi, int len) { - u_char *p; - u_char *q; + unsigned char *p; + unsigned char *q; p = get_idxptr(seg); while (*p++) ; diff --git a/addelcmn.c b/addelcmn.c index 1e3b01b..d7ff35b 100644 --- a/addelcmn.c +++ b/addelcmn.c @@ -50,19 +50,19 @@ void mvmemi(), mvmemd(), mkidxtbl(); void -set_size (u_char *p, int size, int plen, int nlen) +set_size (unsigned char *p, int size, int plen, int nlen) { - *p = (u_char)(size >> 8); + *p = (unsigned char)(size >> 8); if (nlen & 0x10) *p |= NokoriYomiTop; if (plen & 0x10) *p |= AssyukuYomiTop; - *(p + 1) = (u_char)size; - *(p + 2) = (u_char)((nlen & 0x0f) | ((plen & 0x0f) << 4)); + *(p + 1) = (unsigned char)size; + *(p + 2) = (unsigned char)((nlen & 0x0f) | ((plen & 0x0f) << 4)); } static int -isvyomi (u_char *yp) +isvyomi (unsigned char *yp) { int len; @@ -81,7 +81,7 @@ isvyomi (u_char *yp) static int -isvknj(u_char *kanji) +isvknj(unsigned char *kanji) { int len; @@ -132,10 +132,10 @@ isgrm (TypeGram gram) -u_int -addel_arg (u_char *yp, u_char *kp, TypeGram grm, u_char *nyp, int len) +unsigned int +addel_arg (unsigned char *yp, unsigned char *kp, TypeGram grm, unsigned char *nyp, int len) { - u_short err = 0; + unsigned int err = 0; if (!sj2cd_str(yp, nyp, len)) err |= AD_BadYomi; if (!isvyomi(nyp)) err |= AD_BadYomi; @@ -147,7 +147,7 @@ addel_arg (u_char *yp, u_char *kp, TypeGram grm, u_char *nyp, int len) static void -yomi2kata (u_char *src, u_char *dst) +yomi2kata (unsigned char *src, unsigned char *dst) { int first; int second; @@ -171,7 +171,7 @@ yomi2kata (u_char *src, u_char *dst) static int -top_strcmp (u_char *src, u_char *dst) +top_strcmp (unsigned char *src, unsigned char *dst) { int i; for (i = 0 ; *src && (*src == *dst) ; src++, dst++) i++; @@ -182,7 +182,7 @@ top_strcmp (u_char *src, u_char *dst) static int -last_strcmp (u_char *src, u_char *dst) +last_strcmp (unsigned char *src, unsigned char *dst) { int slen; int dlen; @@ -200,20 +200,20 @@ last_strcmp (u_char *src, u_char *dst) int -cvtknj (u_char *yomi, u_char *knj, u_char *dst) +cvtknj (unsigned char *yomi, unsigned char *knj, unsigned char *dst) { - u_char kana[MaxWdYomiLen * 2 + 1]; + unsigned char kana[MaxWdYomiLen * 2 + 1]; int len; - u_char *keep; + unsigned char *keep; keep = dst; yomi2kata(yomi, kana); if ((len = top_strcmp(yomi, knj)) != 0) { - *dst = (u_char)(ZenHiraAssyuku | (len - 1)); + *dst = (unsigned char)(ZenHiraAssyuku | (len - 1)); } else if ((len = top_strcmp(kana, knj)) != 0) { - *dst = (u_char)(ZenKataAssyuku | (len - 1)); + *dst = (unsigned char)(ZenKataAssyuku | (len - 1)); } if (len) { @@ -224,16 +224,16 @@ cvtknj (u_char *yomi, u_char *knj, u_char *dst) if (*knj) { for ( ; ; ) { if ((len = last_strcmp(yomi, knj)) != 0) { - *dst++ = (u_char)(ZenHiraAssyuku | (len - 1)); + *dst++ = (unsigned char)(ZenHiraAssyuku | (len - 1)); break; } else if ((len = last_strcmp(kana, knj)) != 0) { - *dst++ = (u_char)(ZenKataAssyuku | (len - 1)); + *dst++ = (unsigned char)(ZenKataAssyuku | (len - 1)); break; } else if (*knj == SS2) { knj++; - *dst++ = (u_char)LeadingHankaku; + *dst++ = (unsigned char)LeadingHankaku; *dst++ = *knj++; } else if (*knj == SS3) { knj++; @@ -244,7 +244,7 @@ cvtknj (u_char *yomi, u_char *knj, u_char *dst) *dst++ = (*knj & NormalKanjiMask); knj++; } else { - *dst++ = (u_char)LeadingHankaku; + *dst++ = (unsigned char)LeadingHankaku; *dst++ = *knj++; } @@ -262,12 +262,12 @@ cvtknj (u_char *yomi, u_char *knj, u_char *dst) int -srchkana (u_char **ptr, int *saml) +srchkana (unsigned char **ptr, int *saml) { - u_char *p; + unsigned char *p; int cmp; int cnt = 0; - u_char same; + unsigned char same; int flg = 0; same = 0; @@ -302,9 +302,9 @@ srchkana (u_char **ptr, int *saml) int -srchgram (u_char *ptr, u_char **dst, TypeGram hinsi) +srchgram (unsigned char *ptr, unsigned char **dst, TypeGram hinsi) { - u_char *endp; + unsigned char *endp; int cnt = 0, nlen; int flg = FALSE; @@ -334,10 +334,10 @@ srchgram (u_char *ptr, u_char **dst, TypeGram hinsi) int -srchkanji (u_char **dst, u_char *knj, int klen) +srchkanji (unsigned char **dst, unsigned char *knj, int klen) { - u_char *ptr; - u_char *p, *q; + unsigned char *ptr; + unsigned char *p, *q; int len; int flg = FALSE; int cnt = 0; @@ -370,7 +370,7 @@ srchkanji (u_char **dst, u_char *knj, int klen) TypeIdxOfs count_uidx (void) { - u_char *p; + unsigned char *p; p = get_idxptr(curdict->segunit - 1); while (*p++) ; @@ -381,9 +381,9 @@ count_uidx (void) void -chg_uidx (TypeDicSeg seg, u_char *yomi, int len) +chg_uidx (TypeDicSeg seg, unsigned char *yomi, int len) { - u_char *p, *q; + unsigned char *p, *q; int olen; p = get_idxptr(seg); diff --git a/char.c b/char.c index 804c754..c806d87 100644 --- a/char.c +++ b/char.c @@ -39,9 +39,9 @@ int cnvyomi(int code) { - u_short hh; - u_char high; - u_char low; + unsigned short hh; + unsigned char high; + unsigned char low; hh = ((code >> 16) & 0xffff); high = ((code >> 8) & 0xff); @@ -96,9 +96,9 @@ cnvyomi(int code) int h2kcode(int code) { - u_short hh; - u_char high; - u_char low; + unsigned short hh; + unsigned char high; + unsigned char low; hh = ((code >> 16) & 0xffff); high = ((code >> 8) & 0xff); @@ -118,7 +118,7 @@ h2kcode(int code) int -codesize(u_char code) +codesize(unsigned char code) { switch (code&KanjiModeMask) { case ZenHiraAssyuku: @@ -137,7 +137,7 @@ codesize(u_char code) void -output_knj(FILE* fp, u_char* p, int l) +output_knj(FILE* fp, unsigned char* p, int l) { while (l > 0) { switch (*p & KanjiModeMask) { @@ -258,7 +258,7 @@ yomi2zen(int code) void -output_yomi(FILE* fp, u_char* p) +output_yomi(FILE* fp, unsigned char* p) { int i; diff --git a/charsize.c b/charsize.c index 94dbd10..e37bc6b 100644 --- a/charsize.c +++ b/charsize.c @@ -43,7 +43,7 @@ #include "kanakan.h" int -codesize(u_char code) +codesize(unsigned char code) { switch (code & KanjiModeMask) { case ZenHiraAssyuku: diff --git a/chrtbl.c b/chrtbl.c index 97fb82b..c3f4684 100644 --- a/chrtbl.c +++ b/chrtbl.c @@ -42,7 +42,7 @@ -u_char chrtbl[256] = +unsigned char chrtbl[256] = { 0, FZKTOP, diff --git a/cl2knj.c b/cl2knj.c index d5bfe76..d9449b3 100644 --- a/cl2knj.c +++ b/cl2knj.c @@ -47,14 +47,14 @@ void cvtclknj(), freework(); static CLREC* nextrecblk(void); static CLREC* prevrecblk(void); -static void initkbuf(u_char* kouho); +static void initkbuf(unsigned char* kouho); int -cl2knj(u_char* yomi, int len, u_char* kouho) +cl2knj(unsigned char* yomi, int len, unsigned char* kouho) { - u_char *ptr1; - u_char *ptr2; + unsigned char *ptr1; + unsigned char *ptr2; int i; khcount = nkhcount = 0; @@ -102,7 +102,7 @@ cl2knj(u_char* yomi, int len, u_char* kouho) int -nextcl(u_char* kouho, int mode) +nextcl(unsigned char* kouho, int mode) { CLREC *clptr; @@ -147,7 +147,7 @@ nextrecblk(void) int -prevcl(u_char* kouho, int mode) +prevcl(unsigned char* kouho, int mode) { CLREC *clptr; @@ -201,7 +201,7 @@ prevrecblk(void) static void -initkbuf(u_char* kouho) +initkbuf(unsigned char* kouho) { kanjitmp = kouho; memset(kanjitmp, 0, sizeof(STDYOUT) + 1); diff --git a/clstudy.c b/clstudy.c index a2c98ba..fb3d30d 100644 --- a/clstudy.c +++ b/clstudy.c @@ -45,16 +45,16 @@ int sj2cd_str(); void mvmemd(), mvmemi(); -static u_char* delcldata(u_char* ycode); +static unsigned char* delcldata(unsigned char* ycode); static int delclold(void); -static u_char* srchclpos(u_char* ycode); +static unsigned char* srchclpos(unsigned char* ycode); int -clstudy(u_char* yomi1, u_char* yomi2, STDYOUT *stdy) +clstudy(unsigned char* yomi1, unsigned char* yomi2, STDYOUT *stdy) { - u_char ytmp[CLSTDY_TMPLEN]; - u_char *dst, *ptr; + unsigned char ytmp[CLSTDY_TMPLEN]; + unsigned char *dst, *ptr; int ret; int len1, len2; int alen, blen; @@ -101,9 +101,9 @@ clstudy(u_char* yomi1, u_char* yomi2, STDYOUT *stdy) ptr = ClStudyTail - alen; mvmemd(ptr, ClStudyTail, (ptr - dst)); - ClYomiLen(dst) = (u_char)len2; + ClYomiLen(dst) = (unsigned char)len2; ClGramCode(dst) = stdy -> hinshi; - ClYomi1Len(dst) = (u_char)len1; + ClYomi1Len(dst) = (unsigned char)len1; ClSetNum(dst, 1); memcpy(ytmp, ClYomiPos(dst), len2); @@ -121,12 +121,12 @@ clstudy(u_char* yomi1, u_char* yomi2, STDYOUT *stdy) } -static u_char* -delcldata(u_char* ycode) +static unsigned char* +delcldata(unsigned char* ycode) { - u_char *tagptr; - u_char *ptr1; - u_char *ptr2; + unsigned char *tagptr; + unsigned char *ptr1; + unsigned char *ptr2; int len1; tagptr = ClStudyDict; @@ -155,9 +155,9 @@ delcldata(u_char* ycode) void -delclsub(u_char* target) +delclsub(unsigned char* target) { - u_char *src; + unsigned char *src; int num; int tmp; int len; @@ -185,8 +185,8 @@ delclsub(u_char* target) static int delclold(void) { - u_char *tagptr; - u_char *target; + unsigned char *tagptr; + unsigned char *target; int num; int tmp; @@ -216,13 +216,13 @@ delclold(void) } -static u_char* -srchclpos(u_char* ycode) +static unsigned char* +srchclpos(unsigned char* ycode) { - u_char *tagptr; - u_char *target; - u_char *ptr1; - u_char *ptr2; + unsigned char *tagptr; + unsigned char *target; + unsigned char *ptr1; + unsigned char *ptr2; int len; int tmp; @@ -263,7 +263,7 @@ srchclpos(u_char* ycode) void mkclidx(void) { - u_char *ptr; + unsigned char *ptr; int num; int st, ed; @@ -281,6 +281,6 @@ mkclidx(void) if (ClYomiLen(ptr) && ((int)*ClYomiPos(ptr) < ed)) ClStudyIdx[num] = ptr - ClStudyDict; else - ClStudyIdx[num] = (u_short)-1; + ClStudyIdx[num] = (unsigned short)-1; } } diff --git a/cmpstr.c b/cmpstr.c index 2e75617..98b0460 100644 --- a/cmpstr.c +++ b/cmpstr.c @@ -42,8 +42,8 @@ #include "sj_typedef.h" int cmpstr(src, dst) -u_char *src; -u_char *dst; +unsigned char *src; +unsigned char *dst; { while (*src) { if (*src != *dst) return FALSE; diff --git a/cnvhinsi.c b/cnvhinsi.c index f8e2779..d49471d 100644 --- a/cnvhinsi.c +++ b/cnvhinsi.c @@ -51,7 +51,7 @@ struct gram_code { #define GramMax (sizeof(gramtbl)/sizeof(struct gram_code) - 1) int -u_strcmp(u_char* a, u_char* b) +u_strcmp(unsigned char* a, unsigned char* b) { if (!a || !b) return 0; @@ -68,7 +68,7 @@ u_strcmp(u_char* a, u_char* b) int -cnvhinsi(u_char *buf) +cnvhinsi(unsigned char *buf) { int min; int max; diff --git a/code.c b/code.c index 63cbf30..df3fbc8 100644 --- a/code.c +++ b/code.c @@ -45,17 +45,17 @@ #include "key.h" #include "rk.h" -static u_char cbuf[5]; +static unsigned char cbuf[5]; static int cur_code = CODE_EUC; extern int current_locale; static int ccnt = 0; codeconv(c, rkstr) wchar16_t c; -u_int *rkstr; +unsignedint *rkstr; { - u_short ccode, i; - u_short CheckCcode(); + unsigned short ccode, i; + unsigned short CheckCcode(); extern int erase_char; if (c == erase_char) { @@ -90,12 +90,12 @@ u_int *rkstr; *rkstr = RKEND; } -u_short +unsigned short CheckCcode (c) wchar16_t c; { - u_char c1; - u_short code; + unsigned char c1; + unsigned short code; if (!WcIsASCII(c) || !isxdigit(WcLowByte(c)) || (cur_code == CODE_KUTEN && !isdigit(WcLowByte(c)))) @@ -113,7 +113,7 @@ wchar16_t c; } else code = 1; } else { - code = (u_short)strtol((char *)cbuf, (char **)NULL, 16); + code = (unsigned short)strtol((char *)cbuf, (char **)NULL, 16); if (ccnt % 2) c1 = code & 0xff; else @@ -149,11 +149,11 @@ wchar16_t c; return(code); } -u_short +unsigned short strtocode() { int c; - u_short code; + unsigned short code; while (ccnt < 4) { c = inkey(); diff --git a/comuni.c b/comuni.c index eb3b257..8c76a97 100644 --- a/comuni.c +++ b/comuni.c @@ -242,7 +242,7 @@ open_af_inet(void) #else struct sockaddr_in sin; struct servent *sp; - u_short port; + unsigned short port; #endif int true = 1; @@ -804,8 +804,8 @@ put_int(int c) } -u_char* -put_string(u_char* p) +unsigned char* +put_string(unsigned char* p) { if (p) { do { @@ -818,8 +818,8 @@ put_string(u_char* p) } -u_char* -put_ndata(u_char* p, int n) +unsigned char* +put_ndata(unsigned char* p, int n) { while (n-- > 0) put_byte(p ? *p++ : 0); return p; @@ -877,7 +877,7 @@ get_int(void) int -get_nstring(u_char* p, int n) +get_nstring(unsigned char* p, int n) { int c; @@ -890,8 +890,8 @@ get_nstring(u_char* p, int n) } -u_char* -get_ndata(u_char* p, int n) +unsigned char* +get_ndata(unsigned char* p, int n) { while (n-- > 0) *p++ = get_byte(); return p; diff --git a/conjunc.c b/conjunc.c index 86717ea..680b067 100644 --- a/conjunc.c +++ b/conjunc.c @@ -39,7 +39,7 @@ #include "sj_yomi.h" #include "sj_right.h" -static u_char sahencnj[] = { +static unsigned char sahencnj[] = { 0x00, R_SGOKAN, 0x01, _SA, R_MIZEN1, 0x01, _SI, R_SI1, @@ -63,7 +63,7 @@ static u_char sahencnj[] = { 0xff }; -static u_char zahencnj[] = { +static unsigned char zahencnj[] = { 0x00, R_CUT, 0x01, _ZI, R_JI, 0x11, _YO, R_MEIREI2, @@ -77,7 +77,7 @@ static u_char zahencnj[] = { 0xff }; -static u_char ka5cnj1[] = { +static unsigned char ka5cnj1[] = { 0x01, _I, R_ONBIN2, 0x01, _KA, R_MIZEN5, 0x01, _KI, R_RENYOU5, @@ -87,7 +87,7 @@ static u_char ka5cnj1[] = { 0xff }; -static u_char ka5cnj3[] = { +static unsigned char ka5cnj3[] = { 0x01, _I, R_ONBIN2, 0x01, _KA, R_MIZEN5, 0x01, _KI, R_RENYOU7, @@ -97,7 +97,7 @@ static u_char ka5cnj3[] = { 0xff }; -static u_char ka5cnj5[] = { +static unsigned char ka5cnj5[] = { 0x01, _I, R_ONBIN2, 0x01, _KA, R_MIZEN5, 0x11, _SA, R_MIZEN5, @@ -113,7 +113,7 @@ static u_char ka5cnj5[] = { 0xff }; -static u_char ka5cnj7[] = { +static unsigned char ka5cnj7[] = { 0x01, _I, R_ONBIN2, 0x01, _KA, R_MIZEN5, 0x11, _SA, R_MIZEN5, @@ -129,7 +129,7 @@ static u_char ka5cnj7[] = { 0xff }; -static u_char ga5cnj1[] = { +static unsigned char ga5cnj1[] = { 0x01, _I, R_ONBIN3, 0x01, _GA, R_MIZEN5, 0x01, _GI, R_RENYOU5, @@ -139,7 +139,7 @@ static u_char ga5cnj1[] = { 0xff }; -static u_char ga5cnj3[] = { +static unsigned char ga5cnj3[] = { 0x01, _I, R_ONBIN3, 0x01, _GA, R_MIZEN5, 0x01, _GI, R_RENYOU7, @@ -149,7 +149,7 @@ static u_char ga5cnj3[] = { 0xff }; -static u_char ga5cnj5[] = { +static unsigned char ga5cnj5[] = { 0x01, _I, R_ONBIN3, 0x01, _GA, R_MIZEN5, 0x11, _SA, R_MIZEN5, @@ -165,7 +165,7 @@ static u_char ga5cnj5[] = { 0xff }; -static u_char ga5cnj7[] = { +static unsigned char ga5cnj7[] = { 0x01, _I, R_ONBIN3, 0x01, _GA, R_MIZEN5, 0x11, _SA, R_MIZEN5, @@ -181,7 +181,7 @@ static u_char ga5cnj7[] = { 0xff }; -static u_char sa5cnj1[] = { +static unsigned char sa5cnj1[] = { 0x01, _SA, R_MIZEN5, 0x01, _SI, R_SA5RENYOU1, 0x01, _SU, R_SHUUSI, @@ -190,7 +190,7 @@ static u_char sa5cnj1[] = { 0xff }; -static u_char sa5cnj3[] = { +static unsigned char sa5cnj3[] = { 0x01, _SA, R_MIZEN5, 0x01, _SI, R_SA5RENYOU3, 0x01, _SU, R_SHUUSI, @@ -199,7 +199,7 @@ static u_char sa5cnj3[] = { 0xff }; -static u_char sa5cnj5[] = { +static unsigned char sa5cnj5[] = { 0x01, _SA, R_MIZEN5, 0x01, _SI, R_SA5RENYOU1, 0x01, _SU, R_SHUUSI, @@ -210,7 +210,7 @@ static u_char sa5cnj5[] = { 0xff }; -static u_char sa5cnj7[] = { +static unsigned char sa5cnj7[] = { 0x01, _SA, R_MIZEN5, 0x01, _SI, R_SA5RENYOU3, 0x01, _SU, R_SHUUSI, @@ -221,7 +221,7 @@ static u_char sa5cnj7[] = { 0xff }; -static u_char ta5cnj1[] = { +static unsigned char ta5cnj1[] = { 0x01, _TA, R_MIZEN5, 0x01, _TI, R_RENYOU5, 0x01, _XTU, R_ONBIN2, @@ -231,7 +231,7 @@ static u_char ta5cnj1[] = { 0xff }; -static u_char ta5cnj3[] = { +static unsigned char ta5cnj3[] = { 0x01, _TA, R_MIZEN5, 0x01, _TI, R_RENYOU7, 0x01, _XTU, R_ONBIN2, @@ -241,7 +241,7 @@ static u_char ta5cnj3[] = { 0xff }; -static u_char ta5cnj5[] = { +static unsigned char ta5cnj5[] = { 0x01, _TA, R_MIZEN5, 0x11, _SA, R_MIZEN5, 0x11, _SI, R_SA5RENYOU3, @@ -257,7 +257,7 @@ static u_char ta5cnj5[] = { 0xff }; -static u_char ta5cnj7[] = { +static unsigned char ta5cnj7[] = { 0x01, _TA, R_MIZEN5, 0x11, _SA, R_MIZEN5, 0x11, _SI, R_SA5RENYOU3, @@ -274,7 +274,7 @@ static u_char ta5cnj7[] = { }; -static u_char na5cnj[] = { +static unsigned char na5cnj[] = { 0x01, _NA, R_MIZEN5, 0x01, _NI, R_RENYOU5, 0x01, _NU, R_SHUUSI, @@ -284,7 +284,7 @@ static u_char na5cnj[] = { 0xff }; -static u_char ba5cnj1[] = { +static unsigned char ba5cnj1[] = { 0x01, _BA, R_MIZEN5, 0x01, _BI, R_RENYOU5, 0x01, _BU, R_SHUUSI, @@ -294,7 +294,7 @@ static u_char ba5cnj1[] = { 0xff }; -static u_char ba5cnj3[] = { +static unsigned char ba5cnj3[] = { 0x01, _BA, R_MIZEN5, 0x01, _BI, R_RENYOU7, 0x01, _BU, R_SHUUSI, @@ -304,7 +304,7 @@ static u_char ba5cnj3[] = { 0xff }; -static u_char ba5cnj5[] = { +static unsigned char ba5cnj5[] = { 0x01, _BA, R_MIZEN5, 0x11, _SA, R_MIZEN5, 0x11, _SI, R_SA5RENYOU3, @@ -320,7 +320,7 @@ static u_char ba5cnj5[] = { 0xff }; -static u_char ba5cnj7[] = { +static unsigned char ba5cnj7[] = { 0x01, _BA, R_MIZEN5, 0x11, _SA, R_MIZEN5, 0x11, _SI, R_SA5RENYOU3, @@ -336,7 +336,7 @@ static u_char ba5cnj7[] = { 0xff }; -static u_char ma5cnj1[] = { +static unsigned char ma5cnj1[] = { 0x01, _MA, R_MIZEN5, 0x01, _MI, R_RENYOU5, 0x01, _MU, R_SHUUSI, @@ -346,7 +346,7 @@ static u_char ma5cnj1[] = { 0xff }; -static u_char ma5cnj3[] = { +static unsigned char ma5cnj3[] = { 0x01, _MA, R_MIZEN5, 0x01, _MI, R_RENYOU7, 0x01, _MU, R_SHUUSI, @@ -356,7 +356,7 @@ static u_char ma5cnj3[] = { 0xff }; -static u_char ma5cnj5[] = { +static unsigned char ma5cnj5[] = { 0x01, _MA, R_MIZEN5, 0x11, _SA, R_MIZEN5, 0x11, _SI, R_SA5RENYOU3, @@ -372,7 +372,7 @@ static u_char ma5cnj5[] = { 0xff }; -static u_char ma5cnj7[] = { +static unsigned char ma5cnj7[] = { 0x01, _MA, R_MIZEN5, 0x11, _SA, R_MIZEN5, 0x11, _SI, R_SA5RENYOU3, @@ -388,7 +388,7 @@ static u_char ma5cnj7[] = { 0xff }; -static u_char ra5cnj1[] = { +static unsigned char ra5cnj1[] = { 0x01, _XTU, R_ONBIN2, 0x01, _RA, R_MIZEN5, 0x01, _RI, R_RENYOU5, @@ -398,7 +398,7 @@ static u_char ra5cnj1[] = { 0xff }; -static u_char ra5cnj3[] = { +static unsigned char ra5cnj3[] = { 0x01, _XTU, R_ONBIN2, 0x01, _RA, R_MIZEN5, 0x01, _RI, R_RENYOU7, @@ -408,7 +408,7 @@ static u_char ra5cnj3[] = { 0xff }; -static u_char ra5cnj5[] = { +static unsigned char ra5cnj5[] = { 0x01, _XTU, R_ONBIN2, 0x01, _RA, R_MIZEN5, 0x11, _SA, R_MIZEN5, @@ -424,7 +424,7 @@ static u_char ra5cnj5[] = { 0xff }; -static u_char ra5cnj7[] = { +static unsigned char ra5cnj7[] = { 0x01, _XTU, R_ONBIN2, 0x01, _RA, R_MIZEN5, 0x11, _SA, R_MIZEN5, @@ -440,7 +440,7 @@ static u_char ra5cnj7[] = { 0xff }; -static u_char wa5cnj1[] = { +static unsigned char wa5cnj1[] = { 0x01, _I, R_RENYOU5, 0x01, _U, R_SHUUSI, 0x01, _E, R_KAMEI, @@ -450,7 +450,7 @@ static u_char wa5cnj1[] = { 0xff }; -static u_char wa5cnj3[] = { +static unsigned char wa5cnj3[] = { 0x01, _I, R_RENYOU7, 0x01, _U, R_SHUUSI, 0x01, _E, R_KAMEI, @@ -460,7 +460,7 @@ static u_char wa5cnj3[] = { 0xff }; -static u_char wa5cnj5[] = { +static unsigned char wa5cnj5[] = { 0x01, _I, R_RENYOU5, 0x01, _U, R_SHUUSI, 0x01, _E, R_EXP, @@ -476,7 +476,7 @@ static u_char wa5cnj5[] = { 0xff }; -static u_char wa5cnj7[] = { +static unsigned char wa5cnj7[] = { 0x01, _I, R_RENYOU7, 0x01, _U, R_SHUUSI, 0x01, _E, R_EXP, @@ -492,7 +492,7 @@ static u_char wa5cnj7[] = { 0xff }; -static u_char ichicnj1[] = { +static unsigned char ichicnj1[] = { 0x00, R_RENYOU1, 0x01, _YO, R_MEIREI2, 0x01, _RU, R_SHUUSI, @@ -501,7 +501,7 @@ static u_char ichicnj1[] = { 0xff }; -static u_char ichicnj3[] = { +static unsigned char ichicnj3[] = { 0x00, R_RENYOU3, 0x01, _YO, R_MEIREI2, 0x01, _RU, R_SHUUSI, @@ -510,7 +510,7 @@ static u_char ichicnj3[] = { 0xff }; -static u_char keiyou1[] = { +static unsigned char keiyou1[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -521,7 +521,7 @@ static u_char keiyou1[] = { 0xff }; -static u_char keiyou2[] = { +static unsigned char keiyou2[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -533,7 +533,7 @@ static u_char keiyou2[] = { 0xff }; -static u_char keiyou3[] = { +static unsigned char keiyou3[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -556,7 +556,7 @@ static u_char keiyou3[] = { 0xff }; -static u_char keiyou4[] = { +static unsigned char keiyou4[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -574,7 +574,7 @@ static u_char keiyou4[] = { 0xff }; -static u_char keiyou5[] = { +static unsigned char keiyou5[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -603,7 +603,7 @@ static u_char keiyou5[] = { 0xff }; -static u_char keiyou6[] = { +static unsigned char keiyou6[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -637,7 +637,7 @@ static u_char keiyou6[] = { 0xff }; -static u_char keiyou7[] = { +static unsigned char keiyou7[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -677,7 +677,7 @@ static u_char keiyou7[] = { 0xff }; -static u_char keiyou8[] = { +static unsigned char keiyou8[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -718,7 +718,7 @@ static u_char keiyou8[] = { 0xff }; -static u_char keiyou9[] = { +static unsigned char keiyou9[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -747,7 +747,7 @@ static u_char keiyou9[] = { 0xff }; -static u_char keiyou10[] = { +static unsigned char keiyou10[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -787,7 +787,7 @@ static u_char keiyou10[] = { 0xff }; -static u_char keiyou11[] = { +static unsigned char keiyou11[] = { 0x80, R_KGOKAN, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -811,7 +811,7 @@ static u_char keiyou11[] = { 0xff }; -static u_char keidou1[] = { +static unsigned char keidou1[] = { 0x80, R_DGOKAN, 0x01, _DA, R_DSHUUSI1, 0x11, _XTU, R_ONBIN1, @@ -826,7 +826,7 @@ static u_char keidou1[] = { 0xff }; -static u_char keidou2[] = { +static unsigned char keidou2[] = { 0x80, R_DGOKAN, 0x02, _TA, _RU, R_DRENTAI2, 0x11, _RE, R_KATEI2, @@ -834,7 +834,7 @@ static u_char keidou2[] = { 0xff }; -static u_char keidou4[] = { +static unsigned char keidou4[] = { 0x80, R_DGOKAN, 0x01, _SA, R_FZKMEISI, 0x01, _DA, R_DSHUUSI1, @@ -850,7 +850,7 @@ static u_char keidou4[] = { 0xff }; -static u_char keidou9[] = { +static unsigned char keidou9[] = { 0x80, R_DGOKAN, 0x01, _DA, R_DSHUUSI1, 0x11, _XTU, R_ONBIN1, @@ -867,7 +867,7 @@ static u_char keidou9[] = { 0xff }; -static u_char sahenmeisi1[] = { +static unsigned char sahenmeisi1[] = { 0x00, R_SMEISI1, 0x01, _SA, R_MIZEN1, 0x01, _SI, R_SI1, @@ -880,7 +880,7 @@ static u_char sahenmeisi1[] = { 0xff }; -static u_char sahenmeisi2[] = { +static unsigned char sahenmeisi2[] = { 0x00, R_SMEISI1, 0x01, _SA, R_MIZEN1, 0x01, _SI, R_SI1, @@ -893,7 +893,7 @@ static u_char sahenmeisi2[] = { 0xff }; -static u_char keidoumeisi[] = { +static unsigned char keidoumeisi[] = { 0x00, R_DMEISI, 0x01, _SA, R_FZKMEISI, 0x01, _DA, R_DSHUUSI1, @@ -909,7 +909,7 @@ static u_char keidoumeisi[] = { 0xff }; -static u_char keiyoustb[] = { +static unsigned char keiyoustb[] = { 0x00, R_KSTB, 0x01, _I, R_KSHUUSI, 0x02, _KA, _XTU, R_ONBIN1, @@ -920,7 +920,7 @@ static u_char keiyoustb[] = { 0xff }; -static u_char ichistb[] = { +static unsigned char ichistb[] = { 0x00, R_ICHISETUBI, 0x01, _YO, R_MEIREI2, 0x01, _RU, R_SHUUSI, @@ -929,7 +929,7 @@ static u_char ichistb[] = { 0xff }; -static u_char fukusi2[] = { +static unsigned char fukusi2[] = { 0x00, R_FUKUSI, 0x01, _TO, R_F_FUKUSI, 0x11, _SI, R_SI1, @@ -937,7 +937,7 @@ static u_char fukusi2[] = { 0xff }; -static u_char fukusi3[] = { +static unsigned char fukusi3[] = { 0x00, R_FUKUSI, 0x01, _SA, R_MIZEN1, 0x01, _SI, R_SI1, @@ -953,7 +953,7 @@ static u_char fukusi3[] = { 0xff }; -static u_char fukusi4[] = { +static unsigned char fukusi4[] = { 0x00, R_FUKUSI, 0x01, _SA, R_MIZEN1, 0x01, _SI, R_SI1, @@ -966,25 +966,25 @@ static u_char fukusi4[] = { 0xff }; -static u_char fukusi5[] = { +static unsigned char fukusi5[] = { 0x00, R_FUKUSI, 0x01, _NI, R_F_FUKUSI, 0xff }; -static u_char fukusi6[] = { +static unsigned char fukusi6[] = { 0x00, R_FUKUSI, 0x01, _MO, R_F_FUKUSI, 0xff }; -static u_char fukusi7[] = { +static unsigned char fukusi7[] = { 0x00, R_FUKUSI, 0x01, _NO, R_F_FUKUSI, 0xff }; -static u_char fukusi8[] = { +static unsigned char fukusi8[] = { 0x00, R_FUKUSI, 0x01, _DA, R_DSHUUSI1, 0x11, _XTU, R_ONBIN1, @@ -998,7 +998,7 @@ static u_char fukusi8[] = { 0xff }; -static u_char fukusi9[] = { +static unsigned char fukusi9[] = { 0x00, R_FUKUSI, 0x01, _SA, R_MIZEN1, 0x01, _SI, R_SI1, @@ -1021,7 +1021,7 @@ static u_char fukusi9[] = { 0xff }; -u_char *conjadr[] = { +unsigned char *conjadr[] = { 0, 0, 0, diff --git a/connect.c b/connect.c index 9c9dfff..9451153 100644 --- a/connect.c +++ b/connect.c @@ -40,7 +40,7 @@ #include "sj_connect.h" #include "sj_right.h" -static u_char mizen1[] = { +static unsigned char mizen1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -72,7 +72,7 @@ static u_char mizen1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mizen2[] = { +static unsigned char mizen2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -104,7 +104,7 @@ static u_char mizen2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mizen3[] = { +static unsigned char mizen3[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -136,7 +136,7 @@ static u_char mizen3[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mizen4[] = { +static unsigned char mizen4[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -168,7 +168,7 @@ static u_char mizen4[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mizen5[] = { +static unsigned char mizen5[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -200,7 +200,7 @@ static u_char mizen5[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char arou[] = { +static unsigned char arou[] = { wo_x+ttatte_o +ttara_o +tte1_o +tte2_x +ppanasi_x +ppoi_x +ue_x, uti_x +oite_x +okeru_x +ori_x +ka1_x +ka2_o +kai_x +kasira_o, katagata_x+kadouka_x+kana_o+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -232,7 +232,7 @@ static u_char arou[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char you1[] = { +static unsigned char you1[] = { wo_x+ttatte_o +ttara_o +tte1_o +tte2_x +ppanasi_x +ppoi_x +ue_x, uti_x +oite_x +okeru_x +ori_x +ka1_x +ka2_o +kai_x +kasira_o, katagata_x+kadouka_x+kana_o+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -264,7 +264,7 @@ static u_char you1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char karou[] = { +static unsigned char karou[] = { wo_x+ttatte_o +ttara_x +tte1_o +tte2_x +ppanasi_x +ppoi_x +ue_x, uti_x +oite_x +okeru_x +ori_x +ka1_x +ka2_o +kai_x +kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -297,7 +297,7 @@ static u_char karou[] = { }; -static u_char darou[] = { +static unsigned char darou[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_o+kamo_x+kara1_x+kara2_o+ga1_x, @@ -329,7 +329,7 @@ static u_char darou[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char deshou[] = { +static unsigned char deshou[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -361,7 +361,7 @@ static u_char deshou[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ko[] = { +static unsigned char ko[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -393,7 +393,7 @@ static u_char ko[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char bekara[] = { +static unsigned char bekara[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -425,7 +425,7 @@ static u_char bekara[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tagara[] = { +static unsigned char tagara[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -457,7 +457,7 @@ static u_char tagara[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char si1[] = { +static unsigned char si1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_o+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -489,7 +489,7 @@ static u_char si1[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char ji[] = { +static unsigned char ji[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_o+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -521,7 +521,7 @@ static u_char ji[] = { yasui_o+yoi_o+yaru_x+ttarasii_x }; -static u_char age[] = { +static unsigned char age[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -553,7 +553,7 @@ static u_char age[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char i[] = { +static unsigned char i[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -585,7 +585,7 @@ static u_char i[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char e[] = { +static unsigned char e[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -617,7 +617,7 @@ static u_char e[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kake[] = { +static unsigned char kake[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -649,7 +649,7 @@ static u_char kake[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kane2[] = { +static unsigned char kane2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -681,7 +681,7 @@ static u_char kane2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char sugi[] = { +static unsigned char sugi[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -713,7 +713,7 @@ static u_char sugi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char deki[] = { +static unsigned char deki[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -745,7 +745,7 @@ static u_char deki[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mi[] = { +static unsigned char mi[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -777,7 +777,7 @@ static u_char mi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char sase[] = { +static unsigned char sase[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -809,7 +809,7 @@ static u_char sase[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char rare[] = { +static unsigned char rare[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -841,7 +841,7 @@ static u_char rare[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char itadake[] = { +static unsigned char itadake[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -873,7 +873,7 @@ static u_char itadake[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char exp[] = { +static unsigned char exp[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -905,7 +905,7 @@ static u_char exp[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char renyou1[] = { +static unsigned char renyou1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_o+ppoi_o+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -937,7 +937,7 @@ static u_char renyou1[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char renyou3[] = { +static unsigned char renyou3[] = { wo_x+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_o+ppoi_o+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -969,7 +969,7 @@ static u_char renyou3[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char renyou4[] = { +static unsigned char renyou4[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_o+ppoi_o+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -1001,7 +1001,7 @@ static u_char renyou4[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char renyou5[] = { +static unsigned char renyou5[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_o+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1033,7 +1033,7 @@ static u_char renyou5[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char renyou7[] = { +static unsigned char renyou7[] = { wo_x+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_o+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -1065,7 +1065,7 @@ static u_char renyou7[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char renyou8[] = { +static unsigned char renyou8[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_o+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -1097,7 +1097,7 @@ static u_char renyou8[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char sa5renyou1[] = { +static unsigned char sa5renyou1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_o+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1129,7 +1129,7 @@ static u_char sa5renyou1[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char sa5renyou3[] = { +static unsigned char sa5renyou3[] = { wo_x+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_o+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -1161,7 +1161,7 @@ static u_char sa5renyou3[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char sa5renyou4[] = { +static unsigned char sa5renyou4[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_o+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -1193,7 +1193,7 @@ static u_char sa5renyou4[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char krenyou[] = { +static unsigned char krenyou[] = { wo_x+ttatte_o+ttara_x+tte1_x+tte2_o+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1225,7 +1225,7 @@ static u_char krenyou[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char drenyou1[] = { +static unsigned char drenyou1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1257,7 +1257,7 @@ static u_char drenyou1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char drenyou2[] = { +static unsigned char drenyou2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_o+okeru_o+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1289,7 +1289,7 @@ static u_char drenyou2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char drenyou3[] = { +static unsigned char drenyou3[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1321,7 +1321,7 @@ static u_char drenyou3[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char onbin1[] = { +static unsigned char onbin1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1354,7 +1354,7 @@ static u_char onbin1[] = { }; -static u_char onbin2[] = { +static unsigned char onbin2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1386,7 +1386,7 @@ static u_char onbin2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char onbin3[] = { +static unsigned char onbin3[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1418,7 +1418,7 @@ static u_char onbin3[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char deshi[] = { +static unsigned char deshi[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1450,7 +1450,7 @@ static u_char deshi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char axtu[] = { +static unsigned char axtu[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1482,7 +1482,7 @@ static u_char axtu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char onbin6[] = { +static unsigned char onbin6[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1514,7 +1514,7 @@ static u_char onbin6[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char onbin8[] = { +static unsigned char onbin8[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1546,7 +1546,7 @@ static u_char onbin8[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ari1[] = { +static unsigned char ari1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1578,7 +1578,7 @@ static u_char ari1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ari2[] = { +static unsigned char ari2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1610,7 +1610,7 @@ static u_char ari2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ari3[] = { +static unsigned char ari3[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1642,7 +1642,7 @@ static u_char ari3[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char iki[] = { +static unsigned char iki[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1674,7 +1674,7 @@ static u_char iki[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char itasi[] = { +static unsigned char itasi[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1706,7 +1706,7 @@ static u_char itasi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char itadaki[] = { +static unsigned char itadaki[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1738,7 +1738,7 @@ static u_char itadaki[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ori2[] = { +static unsigned char ori2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1770,7 +1770,7 @@ static u_char ori2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char gataku[] = { +static unsigned char gataku[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_o+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1802,7 +1802,7 @@ static u_char gataku[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ki[] = { +static unsigned char ki[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1834,7 +1834,7 @@ static u_char ki[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char fzkki[] = { +static unsigned char fzkki[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1866,7 +1866,7 @@ static u_char fzkki[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char deha[] = { +static unsigned char deha[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1898,7 +1898,7 @@ static u_char deha[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kudasai[] = { +static unsigned char kudasai[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1930,7 +1930,7 @@ static u_char kudasai[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char gozai[] = { +static unsigned char gozai[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1962,7 +1962,7 @@ static u_char gozai[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char gotoku[] = { +static unsigned char gotoku[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -1994,7 +1994,7 @@ static u_char gotoku[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char beku[] = { +static unsigned char beku[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2026,7 +2026,7 @@ static u_char beku[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char soude[] = { +static unsigned char soude[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2058,7 +2058,7 @@ static u_char soude[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char souni[] = { +static unsigned char souni[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2090,7 +2090,7 @@ static u_char souni[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tagari[] = { +static unsigned char tagari[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2122,7 +2122,7 @@ static u_char tagari[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char taku[] = { +static unsigned char taku[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_o+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2154,7 +2154,7 @@ static u_char taku[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char de[] = { +static unsigned char de[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2186,7 +2186,7 @@ static u_char de[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char naide[] = { +static unsigned char naide[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2218,7 +2218,7 @@ static u_char naide[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char naku[] = { +static unsigned char naku[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_o+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2250,7 +2250,7 @@ static u_char naku[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nasai[] = { +static unsigned char nasai[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2282,7 +2282,7 @@ static u_char nasai[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char fuuni[] = { +static unsigned char fuuni[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_o+kane_o+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2314,7 +2314,7 @@ static u_char fuuni[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char yori2[] = { +static unsigned char yori2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2346,7 +2346,7 @@ static u_char yori2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char rashuu[] = { +static unsigned char rashuu[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2378,7 +2378,7 @@ static u_char rashuu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char dshuusi1[] = { +static unsigned char dshuusi1[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_x, katagata_x+kadouka_o+kana_x+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -2410,7 +2410,7 @@ static u_char dshuusi1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char dshuusi2[] = { +static unsigned char dshuusi2[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2442,7 +2442,7 @@ static u_char dshuusi2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char gotosi[] = { +static unsigned char gotosi[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2474,7 +2474,7 @@ static u_char gotosi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char besi[] = { +static unsigned char besi[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2506,7 +2506,7 @@ static u_char besi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char zu[] = { +static unsigned char zu[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2538,7 +2538,7 @@ static u_char zu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char souda[] = { +static unsigned char souda[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_x, katagata_x+kadouka_o+kana_x+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -2570,7 +2570,7 @@ static u_char souda[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mai[] = { +static unsigned char mai[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2602,7 +2602,7 @@ static u_char mai[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mitaida[] = { +static unsigned char mitaida[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -2634,7 +2634,7 @@ static u_char mitaida[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char shuusi[] = { +static unsigned char shuusi[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_o+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_o+ga1_x, @@ -2666,7 +2666,7 @@ static u_char shuusi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kshuusi[] = { +static unsigned char kshuusi[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_o+ga1_x, @@ -2698,7 +2698,7 @@ static u_char kshuusi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char zaru[] = { +static unsigned char zaru[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_o+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -2730,7 +2730,7 @@ static u_char zaru[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char soudesu[] = { +static unsigned char soudesu[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -2762,7 +2762,7 @@ static u_char soudesu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ta[] = { +static unsigned char ta[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_o+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_o+ga1_x, @@ -2794,7 +2794,7 @@ static u_char ta[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tai[] = { +static unsigned char tai[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_o+ga1_x, @@ -2826,7 +2826,7 @@ static u_char tai[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char desu[] = { +static unsigned char desu[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -2858,7 +2858,7 @@ static u_char desu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nai[] = { +static unsigned char nai[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_o+ga1_x, @@ -2890,7 +2890,7 @@ static u_char nai[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nu[] = { +static unsigned char nu[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_o+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -2922,7 +2922,7 @@ static u_char nu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char masu[] = { +static unsigned char masu[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_o+ka1_x+ka2_o+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_o+ga1_x, @@ -2954,7 +2954,7 @@ static u_char masu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nn2[] = { +static unsigned char nn2[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -2986,7 +2986,7 @@ static u_char nn2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char rasii[] = { +static unsigned char rasii[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_o+ga1_x, @@ -3018,7 +3018,7 @@ static u_char rasii[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char drentai1[] = { +static unsigned char drentai1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3050,7 +3050,7 @@ static u_char drentai1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char drentai2[] = { +static unsigned char drentai2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3082,7 +3082,7 @@ static u_char drentai2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char drentai3[] = { +static unsigned char drentai3[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3114,7 +3114,7 @@ static u_char drentai3[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char krentai[] = { +static unsigned char krentai[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3146,7 +3146,7 @@ static u_char krentai[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char gotoki[] = { +static unsigned char gotoki[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3178,7 +3178,7 @@ static u_char gotoki[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char beki[] = { +static unsigned char beki[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -3210,7 +3210,7 @@ static u_char beki[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char souna1[] = { +static unsigned char souna1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3242,7 +3242,7 @@ static u_char souna1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char souna2[] = { +static unsigned char souna2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3274,7 +3274,7 @@ static u_char souna2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char na2[] = { +static unsigned char na2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3306,7 +3306,7 @@ static u_char na2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char katei1[] = { +static unsigned char katei1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3338,7 +3338,7 @@ static u_char katei1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char katei2[] = { +static unsigned char katei2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3370,7 +3370,7 @@ static u_char katei2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char katei3[] = { +static unsigned char katei3[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3402,7 +3402,7 @@ static u_char katei3[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kamei[] = { +static unsigned char kamei[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3434,7 +3434,7 @@ static u_char kamei[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ike[] = { +static unsigned char ike[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3466,7 +3466,7 @@ static u_char ike[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kure[] = { +static unsigned char kure[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3498,7 +3498,7 @@ static u_char kure[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char meirei1[] = { +static unsigned char meirei1[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3530,7 +3530,7 @@ static u_char meirei1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char meirei2[] = { +static unsigned char meirei2[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3562,7 +3562,7 @@ static u_char meirei2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char dgokan[] = { +static unsigned char dgokan[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_o+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -3594,7 +3594,7 @@ static u_char dgokan[] = { yasui_x+yoi_x+yaru_x+ttarasii_o }; -static u_char kgokan[] = { +static unsigned char kgokan[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3626,7 +3626,7 @@ static u_char kgokan[] = { yasui_x+yoi_x+yaru_x+ttarasii_o }; -static u_char sgokan[] = { +static unsigned char sgokan[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3658,7 +3658,7 @@ static u_char sgokan[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char gati[] = { +static unsigned char gati[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_o, katagata_x+kadouka_x+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -3690,7 +3690,7 @@ static u_char gati[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char jya[] = { +static unsigned char jya[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3722,7 +3722,7 @@ static u_char jya[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char sou[] = { +static unsigned char sou[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3754,7 +3754,7 @@ static u_char sou[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mitai[] = { +static unsigned char mitai[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3786,7 +3786,7 @@ static u_char mitai[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char yotte[] = { +static unsigned char yotte[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3818,7 +3818,7 @@ static u_char yotte[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char you2[] = { +static unsigned char you2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3850,7 +3850,7 @@ static u_char you2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char sho[] = { +static unsigned char sho[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -3882,7 +3882,7 @@ static u_char sho[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char meisi[] = { +static unsigned char meisi[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_o+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -3914,7 +3914,7 @@ static u_char meisi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char wo_meisi[] = { +static unsigned char wo_meisi[] = { wo_x+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_o+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -3946,7 +3946,7 @@ static u_char wo_meisi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char dmeisi[] = { +static unsigned char dmeisi[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_o+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -3978,7 +3978,7 @@ static u_char dmeisi[] = { yasui_x+yoi_x+yaru_x+ttarasii_o }; -static u_char smeisi1[] = { +static unsigned char smeisi1[] = { wo_x+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_o+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_o+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -4010,7 +4010,7 @@ static u_char smeisi1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char smeisi2[] = { +static unsigned char smeisi2[] = { wo_x+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_o+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -4042,7 +4042,7 @@ static u_char smeisi2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kstb[] = { +static unsigned char kstb[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4074,7 +4074,7 @@ static u_char kstb[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ichisetubi[] = { +static unsigned char ichisetubi[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_o+ppoi_o+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -4106,7 +4106,7 @@ static u_char ichisetubi[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -static u_char josuusi[] = { +static unsigned char josuusi[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -4138,7 +4138,7 @@ static u_char josuusi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char rentaisi[] = { +static unsigned char rentaisi[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4170,7 +4170,7 @@ static u_char rentaisi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char cut[] = { +static unsigned char cut[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4202,7 +4202,7 @@ static u_char cut[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char shuujo[] = { +static unsigned char shuujo[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4234,7 +4234,7 @@ static u_char shuujo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char wo[] = { +static unsigned char wo[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_o+kane_o+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4266,7 +4266,7 @@ static u_char wo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char wo_s[] = { +static unsigned char wo_s[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_x, katagata_x+kadouka_x+kana_o+kane_o+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4298,7 +4298,7 @@ static u_char wo_s[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ttatte[] = { +static unsigned char ttatte[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4330,7 +4330,7 @@ static u_char ttatte[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ttara[] = { +static unsigned char ttara[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4362,7 +4362,7 @@ static u_char ttara[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tte1[] = { +static unsigned char tte1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4394,7 +4394,7 @@ static u_char tte1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tte2[] = { +static unsigned char tte2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4426,7 +4426,7 @@ static u_char tte2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ppanasi[] = { +static unsigned char ppanasi[] = { wo_o+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -4458,7 +4458,7 @@ static u_char ppanasi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ppoi[] = { +static unsigned char ppoi[] = { wo_x+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_o+ga1_x, @@ -4490,7 +4490,7 @@ static u_char ppoi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ue[] = { +static unsigned char ue[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4522,7 +4522,7 @@ static u_char ue[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char uti[] = { +static unsigned char uti[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -4554,7 +4554,7 @@ static u_char uti[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char oite[] = { +static unsigned char oite[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4586,7 +4586,7 @@ static u_char oite[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char okeru[] = { +static unsigned char okeru[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4618,7 +4618,7 @@ static u_char okeru[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ori[] = { +static unsigned char ori[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4650,7 +4650,7 @@ static u_char ori[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ka1[] = { +static unsigned char ka1[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_o, @@ -4683,7 +4683,7 @@ static u_char ka1[] = { }; -static u_char ka2[] = { +static unsigned char ka2[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4715,7 +4715,7 @@ static u_char ka2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char katagata[] = { +static unsigned char katagata[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4747,7 +4747,7 @@ static u_char katagata[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kadouka[] = { +static unsigned char kadouka[] = { wo_o+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_o, @@ -4779,7 +4779,7 @@ static u_char kadouka[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kamo[] = { +static unsigned char kamo[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4811,7 +4811,7 @@ static u_char kamo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kara1[] = { +static unsigned char kara1[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_o, @@ -4843,7 +4843,7 @@ static u_char kara1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kara2[] = { +static unsigned char kara2[] = { wo_x+ttatte_o+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -4875,7 +4875,7 @@ static u_char kara2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ga1[] = { +static unsigned char ga1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4907,7 +4907,7 @@ static u_char ga1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ga2[] = { +static unsigned char ga2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4939,7 +4939,7 @@ static u_char ga2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char gatera[] = { +static unsigned char gatera[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -4971,7 +4971,7 @@ static u_char gatera[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kiri[] = { +static unsigned char kiri[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5003,7 +5003,7 @@ static u_char kiri[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kuseni[] = { +static unsigned char kuseni[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5035,7 +5035,7 @@ static u_char kuseni[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kurai[] = { +static unsigned char kurai[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -5067,7 +5067,7 @@ static u_char kurai[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char gurumi[] = { +static unsigned char gurumi[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -5099,7 +5099,7 @@ static u_char gurumi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kedo[] = { +static unsigned char kedo[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5131,7 +5131,7 @@ static u_char kedo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char koso[] = { +static unsigned char koso[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_o, @@ -5163,7 +5163,7 @@ static u_char koso[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char koto[] = { +static unsigned char koto[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -5195,7 +5195,7 @@ static u_char koto[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char sae[] = { +static unsigned char sae[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5227,7 +5227,7 @@ static u_char sae[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char si2[] = { +static unsigned char si2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5259,7 +5259,7 @@ static u_char si2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char sika[] = { +static unsigned char sika[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5291,7 +5291,7 @@ static u_char sika[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char sura[] = { +static unsigned char sura[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_o, @@ -5323,7 +5323,7 @@ static u_char sura[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char zutu[] = { +static unsigned char zutu[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -5355,7 +5355,7 @@ static u_char zutu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tame[] = { +static unsigned char tame[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -5387,7 +5387,7 @@ static u_char tame[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tari[] = { +static unsigned char tari[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5419,7 +5419,7 @@ static u_char tari[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char dake[] = { +static unsigned char dake[] = { wo_o+ttatte_o+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -5451,7 +5451,7 @@ static u_char dake[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char dano[] = { +static unsigned char dano[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_o+kara2_x+ga1_o, @@ -5484,7 +5484,7 @@ static u_char dano[] = { }; -static u_char darake[] = { +static unsigned char darake[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -5516,7 +5516,7 @@ static u_char darake[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tuite[] = { +static unsigned char tuite[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_x+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -5548,7 +5548,7 @@ static u_char tuite[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tuki[] = { +static unsigned char tuki[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5580,7 +5580,7 @@ static u_char tuki[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tutu[] = { +static unsigned char tutu[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5612,7 +5612,7 @@ static u_char tutu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tumori[] = { +static unsigned char tumori[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_o, @@ -5644,7 +5644,7 @@ static u_char tumori[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char te1[] = { +static unsigned char te1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5676,7 +5676,7 @@ static u_char te1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char te2[] = { +static unsigned char te2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_o+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_o+kara2_x+ga1_x, @@ -5708,7 +5708,7 @@ static u_char te2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char teru[] = { +static unsigned char teru[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_o, uti_o+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_o+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_o+ga1_x, @@ -5740,7 +5740,7 @@ static u_char teru[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char to1[] = { +static unsigned char to1[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_o, @@ -5772,7 +5772,7 @@ static u_char to1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char to2[] = { +static unsigned char to2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_x+kana_o+kane_o+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5804,7 +5804,7 @@ static u_char to2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char totte[] = { +static unsigned char totte[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5836,7 +5836,7 @@ static u_char totte[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char toiu[] = { +static unsigned char toiu[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_x, katagata_x+kadouka_o+kana_x+kane_x+kamo_x+kara1_x+kara2_o+ga1_x, @@ -5868,7 +5868,7 @@ static u_char toiu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char toori[] = { +static unsigned char toori[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_o, @@ -5900,7 +5900,7 @@ static u_char toori[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char toki[] = { +static unsigned char toki[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -5932,7 +5932,7 @@ static u_char toki[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tokoro[] = { +static unsigned char tokoro[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -5964,7 +5964,7 @@ static u_char tokoro[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tote[] = { +static unsigned char tote[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -5996,7 +5996,7 @@ static u_char tote[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tohaie[] = { +static unsigned char tohaie[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6028,7 +6028,7 @@ static u_char tohaie[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char tomo[] = { +static unsigned char tomo[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6060,7 +6060,7 @@ static u_char tomo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char fdo[] = { +static unsigned char fdo[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6092,7 +6092,7 @@ static u_char fdo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char doori[] = { +static unsigned char doori[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -6124,7 +6124,7 @@ static u_char doori[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char dokoro[] = { +static unsigned char dokoro[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6156,7 +6156,7 @@ static u_char dokoro[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char dokoroka[] = { +static unsigned char dokoroka[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6188,7 +6188,7 @@ static u_char dokoroka[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char domo[] = { +static unsigned char domo[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6220,7 +6220,7 @@ static u_char domo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nagara[] = { +static unsigned char nagara[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -6252,7 +6252,7 @@ static u_char nagara[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nagara2[] = { +static unsigned char nagara2[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -6284,7 +6284,7 @@ static u_char nagara2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nazo[] = { +static unsigned char nazo[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_o+kara2_x+ga1_o, @@ -6316,7 +6316,7 @@ static u_char nazo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nado[] = { +static unsigned char nado[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -6348,7 +6348,7 @@ static u_char nado[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nari[] = { +static unsigned char nari[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_o+kara2_x+ga1_o, @@ -6380,7 +6380,7 @@ static u_char nari[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nanka[] = { +static unsigned char nanka[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_o+kara2_x+ga1_o, @@ -6412,7 +6412,7 @@ static u_char nanka[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nanzo[] = { +static unsigned char nanzo[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_o+kara2_x+ga1_o, @@ -6444,7 +6444,7 @@ static u_char nanzo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nante[] = { +static unsigned char nante[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6476,7 +6476,7 @@ static u_char nante[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ni1[] = { +static unsigned char ni1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_o+okeru_o+ori_x+ka1_x+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -6508,7 +6508,7 @@ static u_char ni1[] = { yasui_x+yoi_x+yaru_o }; -static u_char ni2[] = { +static unsigned char ni2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6540,7 +6540,7 @@ static u_char ni2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ni3[] = { +static unsigned char ni3[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6572,7 +6572,7 @@ static u_char ni3[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nite[] = { +static unsigned char nite[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6604,7 +6604,7 @@ static u_char nite[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nimo[] = { +static unsigned char nimo[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6636,7 +6636,7 @@ static u_char nimo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char no1[] = { +static unsigned char no1[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_o+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -6668,7 +6668,7 @@ static u_char no1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char no2[] = { +static unsigned char no2[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -6700,7 +6700,7 @@ static u_char no2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char node[] = { +static unsigned char node[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6732,7 +6732,7 @@ static u_char node[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char noni[] = { +static unsigned char noni[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6764,7 +6764,7 @@ static u_char noni[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nomi[] = { +static unsigned char nomi[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -6796,7 +6796,7 @@ static u_char nomi[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nominrz[] = { +static unsigned char nominrz[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6828,7 +6828,7 @@ static u_char nominrz[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ha[] = { +static unsigned char ha[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6860,7 +6860,7 @@ static u_char ha[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char hazu[] = { +static unsigned char hazu[] = { wo_x+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_o+kane_o+kamo_x+kara1_x+kara2_x+ga1_o, @@ -6892,7 +6892,7 @@ static u_char hazu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ba[] = { +static unsigned char ba[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6924,7 +6924,7 @@ static u_char ba[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char bakari[] = { +static unsigned char bakari[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -6956,7 +6956,7 @@ static u_char bakari[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char he[] = { +static unsigned char he[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_x+kara1_x+kara2_x+ga1_x, @@ -6988,7 +6988,7 @@ static u_char he[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char hou[] = { +static unsigned char hou[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -7020,7 +7020,7 @@ static u_char hou[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char hoka[] = { +static unsigned char hoka[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7052,7 +7052,7 @@ static u_char hoka[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char hodo[] = { +static unsigned char hodo[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_x, @@ -7084,7 +7084,7 @@ static u_char hodo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char made[] = { +static unsigned char made[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_x+kara2_x+ga1_o, @@ -7116,7 +7116,7 @@ static u_char made[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mama[] = { +static unsigned char mama[] = { wo_o+ttatte_x+ttara_o+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -7148,7 +7148,7 @@ static u_char mama[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mo1[] = { +static unsigned char mo1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7180,7 +7180,7 @@ static u_char mo1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mo2[] = { +static unsigned char mo2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_o, @@ -7212,7 +7212,7 @@ static u_char mo2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char motte[] = { +static unsigned char motte[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7244,7 +7244,7 @@ static u_char motte[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char mono[] = { +static unsigned char mono[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_o+kara1_o+kara2_x+ga1_o, @@ -7276,7 +7276,7 @@ static u_char mono[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ya1[] = { +static unsigned char ya1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7308,7 +7308,7 @@ static u_char ya1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char ya2[] = { +static unsigned char ya2[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7340,7 +7340,7 @@ static u_char ya2[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char yara[] = { +static unsigned char yara[] = { wo_o+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_o, @@ -7372,7 +7372,7 @@ static u_char yara[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char yue[] = { +static unsigned char yue[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7404,7 +7404,7 @@ static u_char yue[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char yori1[] = { +static unsigned char yori1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7436,7 +7436,7 @@ static u_char yori1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char wake[] = { +static unsigned char wake[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_o+kai_x+kasira_o, katagata_x+kadouka_o+kana_o+kane_o+kamo_x+kara1_x+kara2_x+ga1_o, @@ -7468,7 +7468,7 @@ static u_char wake[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char nn1[] = { +static unsigned char nn1[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7500,7 +7500,7 @@ static u_char nn1[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char aisatu[] = { +static unsigned char aisatu[] = { wo_o+ttatte_x+ttara_x+tte1_o+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7532,7 +7532,7 @@ static u_char aisatu[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char kosodo[] = { +static unsigned char kosodo[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_o+ka2_x+kai_x+kasira_o, katagata_x+kadouka_x+kana_o+kane_x+kamo_o+kara1_x+kara2_x+ga1_x, @@ -7564,7 +7564,7 @@ static u_char kosodo[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char site[] = { +static unsigned char site[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_x+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7596,7 +7596,7 @@ static u_char site[] = { yasui_x+yoi_x+yaru_x+ttarasii_x }; -static u_char n_si[] = { +static unsigned char n_si[] = { wo_x+ttatte_x+ttara_x+tte1_x+tte2_x+ppanasi_o+ppoi_x+ue_x, uti_x+oite_x+okeru_x+ori_x+ka1_x+ka2_x+kai_x+kasira_x, katagata_x+kadouka_x+kana_x+kane_x+kamo_x+kara1_x+kara2_x+ga1_x, @@ -7628,7 +7628,7 @@ static u_char n_si[] = { yasui_o+yoi_x+yaru_x+ttarasii_x }; -u_char connadr[] = { +unsigned char connadr[] = { 0, R_MEISI, R_MEISI, @@ -7854,7 +7854,7 @@ u_char connadr[] = { R_MEISI }; -u_char *rigtadr[] = { +unsigned char *rigtadr[] = { 0, de, wo, diff --git a/const.h b/const.h index 6da536a..604d1a5 100644 --- a/const.h +++ b/const.h @@ -138,25 +138,25 @@ #define K_RENTAISI 5 #define K_SONOTA 6 -#define EUC_a1 (u_char)0xa1 -#define EUC_a2 (u_char)0xa2 -#define EUC_a3 (u_char)0xa3 -#define EUC_a4 (u_char)0xa4 -#define EUC_a5 (u_char)0xa5 +#define EUC_a1 (unsigned char)0xa1 +#define EUC_a2 (unsigned char)0xa2 +#define EUC_a3 (unsigned char)0xa3 +#define EUC_a4 (unsigned char)0xa4 +#define EUC_a5 (unsigned char)0xa5 -#define EUC_START (u_char)0xa1 -#define EUC_END (u_char)0xfe -#define EUC_END_KIGOU (u_char)0xae -#define EUC_0 (u_char)0xb0 -#define EUC_END_0 (u_char)0xb9 -#define EUC_A (u_char)0xc1 -#define EUC_END_A (u_char)0xda -#define EUC_a (u_char)0xe1 -#define EUC_END_a (u_char)0xfa -#define EUC_END_HIRA (u_char)0xf3 -#define EUC_VU (u_char)0xf4 -#define EUC_XKA (u_char)0xf5 -#define EUC_XKE (u_char)0xf6 +#define EUC_START (unsigned char)0xa1 +#define EUC_END (unsigned char)0xfe +#define EUC_END_KIGOU (unsigned char)0xae +#define EUC_0 (unsigned char)0xb0 +#define EUC_END_0 (unsigned char)0xb9 +#define EUC_A (unsigned char)0xc1 +#define EUC_END_A (unsigned char)0xda +#define EUC_a (unsigned char)0xe1 +#define EUC_END_a (unsigned char)0xfa +#define EUC_END_HIRA (unsigned char)0xf3 +#define EUC_VU (unsigned char)0xf4 +#define EUC_XKA (unsigned char)0xf5 +#define EUC_XKE (unsigned char)0xf6 #define isknj1(c) (((c) == SS2) || (((c) & 0x80) && ((c) != SS3))) diff --git a/conv.c b/conv.c index 7e9da24..5fb0a18 100644 --- a/conv.c +++ b/conv.c @@ -291,7 +291,7 @@ int more; for (j = 0 ; j < *count ; j ++) { - if (s[j] != (u_char)funckey[i][j]) + if (s[j] != (unsigned char)funckey[i][j]) break; } diff --git a/conversion.h b/conversion.h index 7316b3c..ddb3c39 100644 --- a/conversion.h +++ b/conversion.h @@ -42,17 +42,17 @@ typedef struct bunsetu_sj3 Bunsetu; typedef struct _Conversion { - u_short out_mode[BUFFLENGTH*2]; + unsigned short out_mode[BUFFLENGTH*2]; - u_short Plen[BUFFLENGTH]; - u_short OrgPlen[BUFFLENGTH]; - u_short Bpoint[BUFFLENGTH]; - u_short Edit[BUFFLENGTH]; - u_short span_l[BUFFLENGTH]; - u_short Elen[BUFFLENGTH]; - u_short Displen[BUFFLENGTH]; + unsigned short Plen[BUFFLENGTH]; + unsigned short OrgPlen[BUFFLENGTH]; + unsigned short Bpoint[BUFFLENGTH]; + unsigned short Edit[BUFFLENGTH]; + unsigned short span_l[BUFFLENGTH]; + unsigned short Elen[BUFFLENGTH]; + unsigned short Displen[BUFFLENGTH]; - u_short Vindex[BUFFLENGTH * 2]; + unsigned short Vindex[BUFFLENGTH * 2]; short ha_point; short ha_epoint; @@ -63,15 +63,15 @@ typedef struct _Conversion { short Enum; short e_point; - u_short line; - u_short column; + unsigned short line; + unsigned short column; - u_short PushCurrentVcol; - u_short Vlen; - u_short SavedRow; - u_short SavedCol; - u_short CurrentVcol; - u_short MaxVcol; + unsigned short PushCurrentVcol; + unsigned short Vlen; + unsigned short SavedRow; + unsigned short SavedCol; + unsigned short CurrentVcol; + unsigned short MaxVcol; short CurBun; short PreBun; @@ -79,36 +79,36 @@ typedef struct _Conversion { Bunsetu Bun[BUFFLENGTH]; wchar16_t out_buf[BUFFLENGTH * 2]; - u_char in_mode[BUFFLENGTH * 2]; + unsigned char in_mode[BUFFLENGTH * 2]; wchar16_t *span_p[BUFFLENGTH]; wchar16_t *Ppoint[BUFFLENGTH]; wchar16_t *Epoint[BUFFLENGTH]; wchar16_t Halpha[BUFFLENGTH]; - u_char kettei[BUFFLENGTH]; - u_char Pkettei[BUFFLENGTH]; - u_char Pedited[BUFFLENGTH]; + unsigned char kettei[BUFFLENGTH]; + unsigned char Pkettei[BUFFLENGTH]; + unsigned char Pedited[BUFFLENGTH]; wchar16_t Ebuff[EDITLEN]; - u_char Bkettei[BUFFLENGTH]; - u_char Dispmod[BUFFLENGTH]; + unsigned char Bkettei[BUFFLENGTH]; + unsigned char Dispmod[BUFFLENGTH]; wchar16_t yomiout[BUFFLENGTH * 2]; wchar16_t kanjiout[BUFFLENGTH * 4]; - u_char Imode; - u_char BuffMode; - u_char Kanji; - u_char Dflag; - u_char word_regist; - u_char Cflag; - u_char henkanflag; + unsigned char Imode; + unsigned char BuffMode; + unsigned char Kanji; + unsigned char Dflag; + unsigned char word_regist; + unsigned char Cflag; + unsigned char henkanflag; - u_char wrap; + unsigned char wrap; } Conversion; wchar16_t osave_buf[BUFFLENGTH * 2]; -u_short osave_mode[BUFFLENGTH * 2]; -u_short isave_mode[BUFFLENGTH * 2]; -u_short os_point; +unsigned short osave_mode[BUFFLENGTH * 2]; +unsigned short isave_mode[BUFFLENGTH * 2]; +unsigned short os_point; wchar16_t hsave_buf[BUFFLENGTH]; -u_short hs_point; +unsigned short hs_point; diff --git a/cvtdict.c b/cvtdict.c index be16e9c..8edb459 100644 --- a/cvtdict.c +++ b/cvtdict.c @@ -46,11 +46,11 @@ void cvtdict(KHREC *krec, CLREC *clrec, int flg) { TypeDicOfs ofs; - u_char *yptr; + unsigned char *yptr; int jlen; int stblen; int sttlen; - u_char *fptr; + unsigned char *fptr; int cllen; JREC *jrec; int i, j; @@ -162,7 +162,7 @@ cvtdict(KHREC *krec, CLREC *clrec, int flg) void cvtminasi(int len) { - u_char *ptr; + unsigned char *ptr; ptr = inputyomi; @@ -190,9 +190,9 @@ void cvtwakachi(CLREC *clrec) { int jlen; - u_char *ym; + unsigned char *ym; int cnt; - u_char ch; + unsigned char ch; ym = inputyomi; diff --git a/cvtkanji.c b/cvtkanji.c index 51926db..f0040ff 100644 --- a/cvtkanji.c +++ b/cvtkanji.c @@ -94,7 +94,7 @@ cvtphknj (void) ystart += clt1st -> cllen; j = hzstrlen(inputyomi, (int)clt1st -> cllen); - kanjibuf[0] = (u_char)j; + kanjibuf[0] = (unsigned char)j; inputyomi += j; @@ -163,7 +163,7 @@ setstyrec (KHREC *krec) JREC *jrec; KHREC *kptr; int ii; - u_char *fptr; + unsigned char *fptr; STDYOUT stdy; jrec = krec -> clrec -> jnode; @@ -207,7 +207,7 @@ setstyrec (KHREC *krec) stdy.sttlen = 0; - memcpy((u_char *)&stdy, kanjitmp, sizeof(STDYOUT)); + memcpy((unsigned char *)&stdy, kanjitmp, sizeof(STDYOUT)); kanjitmp += sizeof(STDYOUT); } diff --git a/deldic.c b/deldic.c index 1c0eb49..3b84e2e 100644 --- a/deldic.c +++ b/deldic.c @@ -46,27 +46,27 @@ void mvmemi(); void mkidxtbl(); -static int del_douon(TypeDicSeg seg, u_char* ptr, TypeDicOfs ofs); +static int del_douon(TypeDicSeg seg, unsigned char* ptr, TypeDicOfs ofs); static int del_segment(TypeDicSeg seg); static void del_uidx(TypeDicSeg seg); static void del_stdy(TypeDicSeg seg, TypeDicOfs ofs, int size); -u_int -deldic(u_char* yomi, u_char* kanji, TypeGram hinsi) +unsigned int +deldic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) { - u_char yptr[MaxWdYomiLen + 1]; - u_char kptr[MaxWdKanjiLen + 1]; - u_short err; + unsigned char yptr[MaxWdYomiLen + 1]; + unsigned char kptr[MaxWdKanjiLen + 1]; + unsigned int err; int knjlen; TypeDicSeg useg; TypeDicOfs ofs; - u_char *p1, *p2, *p3; + unsigned char *p1, *p2, *p3; int dblknum; int hblknum; int kblknum; int samlen; - u_char *stp, *edp; + unsigned char *stp, *edp; int size, len; if ((err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr))) != 0) @@ -131,9 +131,9 @@ deldic(u_char* yomi, u_char* kanji, TypeGram hinsi) static int -del_douon(TypeDicSeg seg, u_char* ptr, TypeDicOfs ofs) +del_douon(TypeDicSeg seg, unsigned char* ptr, TypeDicOfs ofs) { - u_char *nxt, *p1, *p2; + unsigned char *nxt, *p1, *p2; int size; int nlen, plen, len; @@ -218,7 +218,8 @@ del_segment(TypeDicSeg seg) else { stdynum = styp -> styno; StudyCount--; - mvmemi((u_char*)(styp + 1), (u_char*)styp, + mvmemi((unsigned char*)(styp + 1), + (unsigned char*)styp, sizeof(*styp) * (StudyCount - i)); continue; } @@ -239,7 +240,7 @@ del_segment(TypeDicSeg seg) static void del_uidx(TypeDicSeg seg) { - u_char *p, *q; + unsigned char *p, *q; int len; p = get_idxptr(seg); @@ -280,7 +281,8 @@ del_stdy(TypeDicSeg seg, TypeDicOfs ofs, int size) else if (stdy -> offset == ofs) { stdynum = stdy -> styno; StudyCount--; - mvmemi((u_char*)(stdy + 1), (u_char*)stdy, + mvmemi((unsigned char*)(stdy + 1), + (unsigned char*)stdy, sizeof(*stdy) * (StudyCount - i)); continue; } diff --git a/depend.c b/depend.c index 99e7b5e..cbe1aa3 100644 --- a/depend.c +++ b/depend.c @@ -63,7 +63,7 @@ StdyFile *stdylink = NULL; static long -get4byte(u_char* p) +get4byte(unsigned char* p) { long i; @@ -74,7 +74,7 @@ get4byte(u_char* p) } static void -Put4byte(u_char* p, long n) +Put4byte(unsigned char* p, long n) { p += 3; *p-- = n; n >>= 8; @@ -99,7 +99,7 @@ fgetfile(FILE* fp, long pos, int len, void* p) } static int -fputfile(FILE* fp, long pos, int len, u_char* p) +fputfile(FILE* fp, long pos, int len, unsigned char* p) { if (fseek(fp, pos, 0) == ERROR) { serv_errno = SJ3_FileSeekError; return ERROR; @@ -136,21 +136,21 @@ putfile(int fd, off_t pos, int len, void* p) static int -check_passwd(u_char* buf, char* passwd) +check_passwd(unsigned char* buf, char* passwd) { buf += PasswdPos; return (*buf && strncmp(passwd, buf, PasswdLen)) ? FALSE : TRUE; } static void -set_passwd(u_char* buf, char* passwd) +set_passwd(unsigned char* buf, char* passwd) { strncpy(buf + PasswdPos, passwd, PasswdLen); } static int -check_dictfile(u_char* buf) +check_dictfile(unsigned char* buf) { return (DictVersion != get4byte(buf + VersionPos)) ? FALSE : TRUE; } @@ -199,13 +199,13 @@ putidx(DictFile* dp, TypeDicSeg seg) static int putdic(DictFile* dp, TypeDicSeg seg) { - u_char *p; + unsigned char *p; long i, j; if (seg >= dp->dict.maxunit) return -1; i = dp->segstrt + dp->dict.seglen * (seg + 1); if (i > dp->bufsiz) { - if (!(p = (u_char *)malloc(i))) return -1; + if (!(p = (unsigned char *)malloc(i))) return -1; memcpy(dp->buffer, p, dp->bufsiz); if (idxbuf - dp->buffer == dp->idxstrt) @@ -229,11 +229,11 @@ static int rszdic(DictFile* dp, TypeDicSeg seg) { long i; - u_char *p; + unsigned char *p; i = dp->segstrt + dp->dict.seglen * seg; if (dp->bufsiz != i) { - if (!(p = (u_char *)malloc(i))) return -1; + if (!(p = (unsigned char *)malloc(i))) return -1; memcpy(dp->buffer, p, ((i > dp->bufsiz) ? dp->bufsiz : i)); if (idxbuf - dp->buffer == dp->idxstrt) @@ -258,9 +258,9 @@ opendict(char* name, char* passwd) FILE *fp; struct stat sbuf; DictFile *dfp; - u_char tmp[HeaderLength]; + unsigned char tmp[HeaderLength]; int i; - u_char *dp; + unsigned char *dp; if (stat(name, &sbuf) == ERROR) { @@ -300,9 +300,9 @@ opendict(char* name, char* passwd) } #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__) - if ((dp = (u_char *)malloc((long)sbuf.st_size)) == NULL) { + if ((dp = (unsigned char *)malloc((long)sbuf.st_size)) == NULL) { #else - if ((dp = (u_char *)malloc(sbuf.st_size)) == NULL) { + if ((dp = (unsigned char *)malloc(sbuf.st_size)) == NULL) { #endif serv_errno = SJ3_NotEnoughMemory; goto error1; } @@ -411,7 +411,7 @@ is_dict_locked(DictFile* p) static int -check_stdyfile(u_char* buf) +check_stdyfile(unsigned char* buf) { return (StdyVersion != get4byte(buf + VersionPos)) ? FALSE : TRUE; } @@ -435,10 +435,10 @@ openstdy(char* name, char* passwd) FILE *fp; struct stat sbuf; StdyFile *sfp; - u_char *hd; + unsigned char *hd; STDYIN *sp; - u_short *cip; - u_char *clp; + unsigned short *cip; + unsigned char *clp; long stdycnt, stdypos, stdylen, stdymax; long clidxpos, clidxlen; long clstdypos, clstdylen, clstdystep; @@ -459,7 +459,7 @@ openstdy(char* name, char* passwd) } - if ((hd = (u_char *)malloc(HeaderLength+CommentLength)) == NULL) { + if ((hd = (unsigned char *)malloc(HeaderLength+CommentLength)) == NULL) { serv_errno = SJ3_NotEnoughMemory; return NULL; } @@ -502,10 +502,10 @@ openstdy(char* name, char* passwd) if ((sp = (STDYIN *)malloc(len)) == NULL) { serv_errno = SJ3_NotEnoughMemory; goto error2; } - if ((cip = (u_short *)malloc(clidxlen)) == NULL) { + if ((cip = (unsigned short *)malloc(clidxlen)) == NULL) { serv_errno = SJ3_NotEnoughMemory; goto error3; } - if ((clp = (u_char *)malloc(clstdylen)) == NULL) { + if ((clp = (unsigned char *)malloc(clstdylen)) == NULL) { serv_errno = SJ3_NotEnoughMemory; goto error4; } @@ -583,7 +583,7 @@ int putstydic(void) { int fd; - u_char *hd; + unsigned char *hd; StdyFile *sf; long len; @@ -609,7 +609,7 @@ int putcldic(void) { int fd; - u_char *hd; + unsigned char *hd; StdyFile *sf; sf = (StdyFile *)stdy_base; @@ -628,7 +628,7 @@ int makedict(char* path, int idxlen, int seglen, int segnum) { FILE *fp; - u_char tmp[HeaderLength + CommentLength]; + unsigned char tmp[HeaderLength + CommentLength]; long pos = HeaderLength + CommentLength; int ret = ERROR; int i; @@ -686,7 +686,7 @@ int makestdy(char* path, int stynum, int clstep, int cllen) { FILE *fp; - u_char tmp[HeaderLength + CommentLength]; + unsigned char tmp[HeaderLength + CommentLength]; long pos = HeaderLength + CommentLength; int ret = ERROR; int i, j; @@ -711,7 +711,7 @@ makestdy(char* path, int stynum, int clstep, int cllen) put4byte(tmp + VersionPos, StdyVersion); - j = 256 * sizeof(u_short); + j = 256 * sizeof(unsigned short); put4byte(tmp + StdyClIdxPos, pos); put4byte(tmp + StdyClIdxLen, j); put4byte(tmp + StdyClIdxStep, clstep); @@ -790,7 +790,7 @@ set_stdypass(char* pass) static void -set_comment(u_char* buf, char* comment) +set_comment(unsigned char* buf, char* comment) { strncpy(buf + HeaderLength, comment, CommentLength); } diff --git a/dict.c b/dict.c index 864100a..a452ff6 100644 --- a/dict.c +++ b/dict.c @@ -45,9 +45,9 @@ void get_askknj(void) { - u_char *p; - u_char *q; - u_char *r; + unsigned char *p; + unsigned char *q; + unsigned char *r; int i = 0, csize; int flg; @@ -89,7 +89,7 @@ seldict(TypeDicID id) } -u_char* +unsigned char* get_idxptr(TypeDicSeg seg) { (*curdict->getofs)(curdict); diff --git a/dicttool.h b/dicttool.h index 3e7e261..f7ec0b4 100644 --- a/dicttool.h +++ b/dicttool.h @@ -31,8 +31,8 @@ * $Id: dicttool.h,v 1.1 2004/07/01 17:11:27 hiroo Exp $ */ -#ifndef _DICTTOLL_H_ -#define _DICTTOLL_H_ 1 +#ifndef _DICTTOOL_H_ +#define _DICTTOOL_H_ 1 #include #include @@ -41,14 +41,14 @@ /* char.c */ int cnvyomi (int code); int h2kcode (int code); -int codesize (u_char code); -void output_knj (FILE* fp, u_char* p, int l); +int codesize (unsigned char code); +void output_knj (FILE* fp, unsigned char* p, int l); void output_str (FILE* fp, char* p); void output_int (FILE* fp, int* p); -void output_yomi (FILE* fp, u_char* p); +void output_yomi (FILE* fp, unsigned char* p); /* cnvhinsi.c */ -int cnvhinsi (u_char *buf); +int cnvhinsi (unsigned char *buf); /* file.c */ FILE* Fopen (char* filename, char* type); @@ -62,16 +62,16 @@ int Fgetc (FILE* fp); void Fflush (FILE* fp); /* hindo.c */ -int check_hindo (u_char* ptr, int len); -void knjhnd_set (u_char* p, int l); -void knjhnd_reset (u_char* p, int l); +int check_hindo (unsigned char* ptr, int len); +void knjhnd_set (unsigned char* p, int l); +void knjhnd_reset (unsigned char* p, int l); int decide_knjask (void); void clear_hindo (void); void clear_assyuku (void); /* knjcvt.c */ -u_char* knjofscvt (u_char* ptr, int len, int* ret); -u_char* knjcvt (u_char* ptr, int len, int* ret); +unsigned char* knjofscvt (unsigned char* ptr, int len, int* ret); +unsigned char* knjcvt (unsigned char* ptr, int len, int* ret); /* makedict.c */ void parse (int argc, char** argv); @@ -85,9 +85,9 @@ void flush_douon (void); void makelist (int* yomi, int* kanji, int hinsi, int* atr); /* makeseg.c */ -size_t make_knjstr (u_char* src, int len, u_char* dst); +size_t make_knjstr (unsigned char* src, int len, unsigned char* dst); void makeseg (void); -void makehead (u_char* dict_name); +void makehead (unsigned char* dict_name); /* memory.c */ void* Malloc (size_t size); @@ -95,21 +95,21 @@ void* Zalloc (size_t size); void Free (void *p); /* offset.c */ -void set_ofsrec (u_char* ptr, int len, int ofs); -int isknjexist (u_char* knj, int len); +void set_ofsrec (unsigned char* ptr, int len, int ofs); +int isknjexist (unsigned char* knj, int len); void clear_ofsrec (void); -OffsetRec* real_ofsrec (u_char* ptr); +OffsetRec* real_ofsrec (unsigned char* ptr); /* readline.c */ int* readline (void); void setline (void (*func)(int*, int*, int, int*)); /* string.c */ -int bubun_str (u_char* p1, int l1, u_char* p2, int l2); -int overlap_str (u_char *p1, int l1, u_char* p2, int l2); +int bubun_str (unsigned char* p1, int l1, unsigned char* p2, int l2); +int overlap_str (unsigned char *p1, int l1, unsigned char* p2, int l2); int top_strcmp (int* src, int* dst); int last_strcmp (int* src, int* dst); -int string_cmp (u_char* p1, int l1, u_char* p2, int l2); +int string_cmp (unsigned char* p1, int l1, unsigned char* p2, int l2); -#endif /* _DICTTOLL_H_ */ +#endif /* _DICTTOOL_H_ */ diff --git a/display.c b/display.c index e9dcbe4..0d3364c 100644 --- a/display.c +++ b/display.c @@ -272,7 +272,7 @@ beep () CursorSet (row, col) -u_short row, col; +unsigned short row, col; { tputs(tgoto(CM, col - 1, row - 1), 1, outc); Flush (); @@ -304,7 +304,7 @@ int row1, row2; int master_flush_flag = 1; CursorRead (row, col) -u_short *row, *col; +unsigned short *row, *col; { int count; @@ -454,7 +454,7 @@ Clear_EOL () } StartGuide (row, col) -u_short *row, *col; +unsigned short *row, *col; { Conversion *cv; @@ -471,7 +471,7 @@ u_short *row, *col; } EndGuide (row, col) -u_short row, col; +unsigned short row, col; { if (status_line) { tputs (FS, 1, outc); diff --git a/douon.c b/douon.c index b9a5070..d0eeea7 100644 --- a/douon.c +++ b/douon.c @@ -135,7 +135,7 @@ int gnum; wchar16_t wtmp[BUFFLENGTH], wtmp2[BUFFLENGTH * 2]; int gakusyuu; - u_short row, col; + unsigned short row, col; Conversion *cv; cv = current_conversion; diff --git a/edit.c b/edit.c index fff18a1..61fbd0f 100644 --- a/edit.c +++ b/edit.c @@ -296,7 +296,7 @@ int len; Conversion *cv; int i; wchar16_t *p; - u_short *pp; + unsigned short *pp; int mlen, plen, ipos, rlen, imlen; cv = GetConversion (); @@ -343,7 +343,7 @@ exec_edit () int edit, inc, i; wchar16_t *s; wchar16_t Htmp[BUFFLENGTH], Ztmp[BUFFLENGTH * 2]; - u_short Omode[BUFFLENGTH * 2]; + unsigned short Omode[BUFFLENGTH * 2]; int bun; int edited, editlen; int len, rlen, hlen, diff; @@ -616,14 +616,14 @@ int *numpoint; Replace(Hs, Zs, omode, cur, num) wchar16_t *Hs, *Zs; -u_short *omode; +unsigned short *omode; int cur, num; { int i, len, inc; int beep_on, icur1, icur2; wchar16_t roma[SHORTBUFFSIZE+1], kana[SHORTBUFFSIZE+1]; wchar16_t work[DLEN+1]; - u_short otmp[SHORTBUFFSIZE+1]; + unsigned short otmp[SHORTBUFFSIZE+1]; *roma = '\0'; *kana = '\0'; @@ -694,7 +694,7 @@ int cur, num; Substitute(Hs, Zs, omode, cur, num) wchar16_t *Hs, *Zs; -u_short *omode; +unsigned short *omode; int *cur, num; { wchar16_t work[DLEN + 1]; @@ -722,13 +722,13 @@ int *cur, num; Insert(Hs, Zs, omode, cur) wchar16_t *Hs, *Zs; -u_short *omode; +unsigned short *omode; int cur; { int inc, len, i; int limit, hlimit, ylen, res, icur, rlen; wchar16_t ztmp[DLEN + 1], htmp[DLEN + 1]; - u_short otmp[DLEN + 1]; + unsigned short otmp[DLEN + 1]; ylen = wslen(Zs); limit = Elimit - ylen; @@ -790,7 +790,7 @@ int cur; EditDel (Hs, Zs, omode, cur, num) wchar16_t *Hs, *Zs; -u_short *omode; +unsigned short *omode; int cur, num; { int i, j; @@ -824,7 +824,7 @@ int cur, num; chhstr(Hs, Zs, omode, cur) wchar16_t *Hs, *Zs; -u_short *omode; +unsigned short *omode; int cur; { int i, j, len; diff --git a/etc.c b/etc.c index 3d58429..d9ca117 100644 --- a/etc.c +++ b/etc.c @@ -48,7 +48,7 @@ void disp_version(); exec_etc (key) int key; { - u_short row, col; + unsigned short row, col; int inc; int chbun; int edited; @@ -220,8 +220,8 @@ int key; helplevel () { wchar16_t wtmp[BUFFLENGTH]; - u_char mtmp[BUFFLENGTH]; - u_char tmp[BUFFLENGTH]; + unsigned char mtmp[BUFFLENGTH]; + unsigned char tmp[BUFFLENGTH]; Conversion *cv; cv = GetConversion (); @@ -266,7 +266,7 @@ exec_sjrc () { extern char RCfile[]; char tmp[BUFFLENGTH]; - u_char SUCCorFAIL[BUFFLENGTH]; + unsigned char SUCCorFAIL[BUFFLENGTH]; wchar16_t wtmp[BUFFLENGTH]; @@ -305,7 +305,7 @@ change_weight () int c; char s[2]; char tmp[BUFFLENGTH]; - u_char mtmp[BUFFLENGTH]; + unsigned char mtmp[BUFFLENGTH]; wchar16_t wtmp[BUFFLENGTH]; (void) wcstombs((char *)mtmp, WCWeight_mes, BUFFLENGTH); @@ -337,7 +337,7 @@ int aflag; int err; char tmp[BUFFLENGTH]; wchar16_t wtmp[BUFFLENGTH]; - u_char dtmp[BUFFLENGTH]; + unsigned char dtmp[BUFFLENGTH]; if (!dcflag) { (void) wcstombs((char *)dtmp, WCDiscon, BUFFLENGTH); @@ -381,7 +381,7 @@ reconnect () char tmp[BUFFLENGTH], *hp; char newserv[SHORTLENGTH * 2], *nsp; wchar16_t wtmp[BUFFLENGTH]; - u_char rtmp[BUFFLENGTH]; + unsigned char rtmp[BUFFLENGTH]; strncpy(newserv, cur_serv, SHORTLENGTH * 2 - 1); newserv[SHORTLENGTH * 2 - 1] = '\0'; diff --git a/eucmessage.c b/eucmessage.c index c152df5..9cf9dbb 100644 --- a/eucmessage.c +++ b/eucmessage.c @@ -42,231 +42,231 @@ #include "sj2.h" unsigned char *EucMessages[] = { - (u_char *)"\243\323\243\312\243\263\241\241\241\241\241\241\241\241\241\241\241\241\241\241", + (unsigned char *)"\243\323\243\312\243\263\241\241\241\241\241\241\241\241\241\241\241\241\241\241", - (u_char *)"Buffer\241\241\241\241", - (u_char *)"Unbuffer\241\241", + (unsigned char *)"Buffer\241\241\241\241", + (unsigned char *)"Unbuffer\241\241", - (u_char *)"\301\264\244\322\244\351\244\254\244\312", - (u_char *)"\301\264\245\253\245\277\245\253\245\312", - (u_char *)"\310\276\245\253\245\277\245\253\245\312", - (u_char *)"\301\264\245\242\245\353\245\325\245\241", - (u_char *)"\310\276\245\242\245\353\245\325\245\241", + (unsigned char *)"\301\264\244\322\244\351\244\254\244\312", + (unsigned char *)"\301\264\245\253\245\277\245\253\245\312", + (unsigned char *)"\310\276\245\253\245\277\245\253\245\312", + (unsigned char *)"\301\264\245\242\245\353\245\325\245\241", + (unsigned char *)"\310\276\245\242\245\353\245\325\245\241", - (u_char *)" \312\321\264\271 \314\265\312\321 etc. \267\350\304\352 code \310\276\245\242 \301\264\245\242 \310\276\245\253 \301\264\245\253 \244\253\244\312", - (u_char *)"\244\275\244\316\302\276\241\241\241\241\241\241\241\241\241\241\241\241\241\241", + (unsigned char *)" \312\321\264\271 \314\265\312\321 etc. \267\350\304\352 code \310\276\245\242 \301\264\245\242 \310\276\245\253 \301\264\245\253 \244\253\244\312", + (unsigned char *)"\244\275\244\316\302\276\241\241\241\241\241\241\241\241\241\241\241\241\241\241", - (u_char *)" \305\320\317\277 \276\303\265\356 Help sjrc \312\324\275\270 \272\306\300\334 \241\241\241\241 \241\241\241\241 \241\241\241\241 \241\241\241\241", + (unsigned char *)" \305\320\317\277 \276\303\265\356 Help sjrc \312\324\275\270 \272\306\300\334 \241\241\241\241 \241\241\241\241 \241\241\241\241 \241\241\241\241", - (u_char *)"Help\241\241Mode", - (u_char *)" \245\254\245\244\245\311\241\246\245\351\245\244\245\363 %s \244\313\244\312\244\352\244\336\244\267\244\277 ", + (unsigned char *)"Help\241\241Mode", + (unsigned char *)" \245\254\245\244\245\311\241\246\245\351\245\244\245\363 %s \244\313\244\312\244\352\244\336\244\267\244\277 ", - (u_char *)"ShiftJIS\241\241", - (u_char *)"\241\241\243\305\243\325\243\303\241\241", - (u_char *)"\243\305\243\325\243\303\312\344\275\365", - (u_char *)"\241\241\243\312\243\311\243\323\241\241", - (u_char *)"\243\312\243\311\243\323\312\344\275\365", - (u_char *)"\241\241\241\241\266\350\305\300\241\241", - (u_char *)"\266\350\305\300\241\241\312\344\275\365", + (unsigned char *)"ShiftJIS\241\241", + (unsigned char *)"\241\241\243\305\243\325\243\303\241\241", + (unsigned char *)"\243\305\243\325\243\303\312\344\275\365", + (unsigned char *)"\241\241\243\312\243\311\243\323\241\241", + (unsigned char *)"\243\312\243\311\243\323\312\344\275\365", + (unsigned char *)"\241\241\241\241\266\350\305\300\241\241", + (unsigned char *)"\266\350\305\300\241\241\312\344\275\365", - (u_char *)"\305\320\317\277", - (u_char *)" \310\317\260\317\244\362\273\330\304\352\244\267\244\306\244\257\244\300\244\265\244\244 ", - (u_char *)" \264\301\273\372 [%s] : \306\311\244\337\306\376\316\317 ", - (u_char *)" \264\301\273\372 [%s] : \306\311\244\337 [%s] : \311\312\273\354 [%s] (y/n)? ", - (u_char *)" \264\301\273\372 [%s] : \306\311\244\337 [%s] (y/n)? ", - (u_char *)" \312\270\313\241\276\360\312\363 : 1.\314\276\273\354 2.\314\276\273\372 3.\314\276\301\260 4.\303\317\314\276 5.\245\265\312\321\306\260\273\354", - (u_char *)" \305\320\317\277\244\267\244\336\244\267\244\277 ", - (u_char *)" \306\311\244\337\306\376\316\317 ", - (u_char *)" 1", - (u_char *)"y", - (u_char *)" \306\261\260\354\244\316\303\261\270\354\244\254\244\271\244\307\244\313\302\270\272\337\244\267\244\306\244\244\244\336\244\271", - (u_char *)" \244\263\244\316\306\311\244\337\312\270\273\372\316\363\244\307\244\317\305\320\317\277\244\307\244\255\244\336\244\273\244\363", - (u_char *)" \244\263\244\316\264\301\273\372\312\270\273\372\316\363\244\307\244\317\305\320\317\277\244\307\244\255\244\336\244\273\244\363", - (u_char *)" \244\263\244\354\260\312\276\345\306\261\244\270\306\311\244\337\244\307\244\317\305\320\317\277\244\307\244\255\244\336\244\273\244\363", - (u_char *)" \244\263\244\354\260\312\276\345\245\346\241\274\245\266\274\255\275\361\244\313\244\317\305\320\317\277\244\307\244\255\244\336\244\273\244\363", - (u_char *)" \245\346\241\274\245\266\274\255\275\361\244\254\245\355\245\303\245\257\244\265\244\354\244\306\244\244\244\336\244\271", - (u_char *)" \245\267\245\271\245\306\245\340\245\250\245\351\241\274\244\307\305\320\317\277\244\307\244\255\244\336\244\273\244\363", - (u_char *)",", + (unsigned char *)"\305\320\317\277", + (unsigned char *)" \310\317\260\317\244\362\273\330\304\352\244\267\244\306\244\257\244\300\244\265\244\244 ", + (unsigned char *)" \264\301\273\372 [%s] : \306\311\244\337\306\376\316\317 ", + (unsigned char *)" \264\301\273\372 [%s] : \306\311\244\337 [%s] : \311\312\273\354 [%s] (y/n)? ", + (unsigned char *)" \264\301\273\372 [%s] : \306\311\244\337 [%s] (y/n)? ", + (unsigned char *)" \312\270\313\241\276\360\312\363 : 1.\314\276\273\354 2.\314\276\273\372 3.\314\276\301\260 4.\303\317\314\276 5.\245\265\312\321\306\260\273\354", + (unsigned char *)" \305\320\317\277\244\267\244\336\244\267\244\277 ", + (unsigned char *)" \306\311\244\337\306\376\316\317 ", + (unsigned char *)" 1", + (unsigned char *)"y", + (unsigned char *)" \306\261\260\354\244\316\303\261\270\354\244\254\244\271\244\307\244\313\302\270\272\337\244\267\244\306\244\244\244\336\244\271", + (unsigned char *)" \244\263\244\316\306\311\244\337\312\270\273\372\316\363\244\307\244\317\305\320\317\277\244\307\244\255\244\336\244\273\244\363", + (unsigned char *)" \244\263\244\316\264\301\273\372\312\270\273\372\316\363\244\307\244\317\305\320\317\277\244\307\244\255\244\336\244\273\244\363", + (unsigned char *)" \244\263\244\354\260\312\276\345\306\261\244\270\306\311\244\337\244\307\244\317\305\320\317\277\244\307\244\255\244\336\244\273\244\363", + (unsigned char *)" \244\263\244\354\260\312\276\345\245\346\241\274\245\266\274\255\275\361\244\313\244\317\305\320\317\277\244\307\244\255\244\336\244\273\244\363", + (unsigned char *)" \245\346\241\274\245\266\274\255\275\361\244\254\245\355\245\303\245\257\244\265\244\354\244\306\244\244\244\336\244\271", + (unsigned char *)" \245\267\245\271\245\306\245\340\245\250\245\351\241\274\244\307\305\320\317\277\244\307\244\255\244\336\244\273\244\363", + (unsigned char *)",", - (u_char *)"\276\303\265\356", - (u_char *)" \264\301\273\372 [%s] : \306\311\244\337 [%s] : \311\312\273\354 [%s]\244\362\276\303\265\356\244\267\244\336\244\267\244\277 ", - (u_char *)" \273\330\304\352\244\265\244\354\244\277\306\311\244\337\241\246\264\301\273\372\244\317\305\320\317\277\244\265\244\354\244\306\244\244\244\336\244\273\244\363", - (u_char *)" \245\346\241\274\245\266\274\255\275\361\244\254\245\355\245\303\245\257\244\265\244\354\244\306\244\244\244\336\244\271", - (u_char *)" \244\263\244\316\306\311\244\337\312\270\273\372\316\363\244\317\276\303\265\356\244\307\244\255\244\336\244\273\244\363", - (u_char *)" \244\263\244\316\264\301\273\372\312\270\273\372\316\363\244\317\276\303\265\356\244\307\244\255\244\336\244\273\244\363", - (u_char *)" \245\267\245\271\245\306\245\340\245\250\245\351\241\274\244\307\276\303\265\356\244\307\244\255\244\336\244\273\244\363", + (unsigned char *)"\276\303\265\356", + (unsigned char *)" \264\301\273\372 [%s] : \306\311\244\337 [%s] : \311\312\273\354 [%s]\244\362\276\303\265\356\244\267\244\336\244\267\244\277 ", + (unsigned char *)" \273\330\304\352\244\265\244\354\244\277\306\311\244\337\241\246\264\301\273\372\244\317\305\320\317\277\244\265\244\354\244\306\244\244\244\336\244\273\244\363", + (unsigned char *)" \245\346\241\274\245\266\274\255\275\361\244\254\245\355\245\303\245\257\244\265\244\354\244\306\244\244\244\336\244\271", + (unsigned char *)" \244\263\244\316\306\311\244\337\312\270\273\372\316\363\244\317\276\303\265\356\244\307\244\255\244\336\244\273\244\363", + (unsigned char *)" \244\263\244\316\264\301\273\372\312\270\273\372\316\363\244\317\276\303\265\356\244\307\244\255\244\336\244\273\244\363", + (unsigned char *)" \245\267\245\271\245\306\245\340\245\250\245\351\241\274\244\307\276\303\265\356\244\307\244\255\244\336\244\273\244\363", - (u_char *)"\244\362\306\311\244\337\271\376\244\337\244\336\244\267\244\277", - (u_char *)"\244\362\306\311\244\337\271\376\244\341\244\336\244\273\244\363\244\307\244\267\244\277", - (u_char *)"\245\273\245\303\245\310\245\242\245\303\245\327\245\325\245\241\245\244\245\353\244\254\244\242\244\352\244\336\244\273\244\363 ", + (unsigned char *)"\244\362\306\311\244\337\271\376\244\337\244\336\244\267\244\277", + (unsigned char *)"\244\362\306\311\244\337\271\376\244\341\244\336\244\273\244\363\244\307\244\267\244\277", + (unsigned char *)"\245\273\245\303\245\310\245\242\245\303\245\327\245\325\245\241\245\244\245\353\244\254\244\242\244\352\244\336\244\273\244\363 ", - (u_char *)"Change weight (1-9) current weight %d ", + (unsigned char *)"Change weight (1-9) current weight %d ", - (u_char *)"\272\306\300\334\302\263 ", - (u_char *)" \245\265\241\274\245\320\314\276 [%s] \244\362\273\330\304\352\244\267\244\306\244\257\244\300\244\265\244\244 ", - (u_char *)" \245\265\241\274\245\320 [%s] \244\313\300\334\302\263\244\267\244\336\244\267\244\277 ", - (u_char *)"\245\265\241\274\245\320 [%s] \244\310\244\316\300\334\302\263\244\254\300\332\244\354\244\336\244\267\244\277", + (unsigned char *)"\272\306\300\334\302\263 ", + (unsigned char *)" \245\265\241\274\245\320\314\276 [%s] \244\362\273\330\304\352\244\267\244\306\244\257\244\300\244\265\244\244 ", + (unsigned char *)" \245\265\241\274\245\320 [%s] \244\313\300\334\302\263\244\267\244\336\244\267\244\277 ", + (unsigned char *)"\245\265\241\274\245\320 [%s] \244\310\244\316\300\334\302\263\244\254\300\332\244\354\244\336\244\267\244\277", - (u_char *)" ", - (u_char *)" ", - (u_char *)" \302\263\244\261\244\336\244\271\244\253? y", + (unsigned char *)" ", + (unsigned char *)" ", + (unsigned char *)" \302\263\244\261\244\336\244\271\244\253? y", - (u_char *)"\245\265\241\274\245\320\241\274\244\254\273\340\244\313\244\336\244\267\244\277\241\243", - (u_char *)"\245\265\241\274\245\320\241\274\244\313\300\334\302\263\272\321\244\307\244\271\241\243", - (u_char *)"\245\265\241\274\245\320\241\274\244\330\244\316\300\334\302\263\244\313\274\272\307\324\244\267\244\336\244\267\244\277\241\243", - (u_char *)"\245\341\245\244\245\363\274\255\275\361\245\325\245\241\245\244\245\353\244\362\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273\244\363\241\243", - (u_char *)"\245\346\241\274\245\266\241\246\245\307\245\243\245\354\245\257\245\310\245\352\244\316\272\356\300\256\244\313\274\272\307\324\244\267\244\336\244\267\244\277\241\243", - (u_char *)"\245\346\241\274\245\266\274\255\275\361\245\325\245\241\245\244\245\353\244\316\300\270\300\256\244\313\274\272\307\324\244\267\244\336\244\267\244\277\241\243", - (u_char *)"\245\346\241\274\245\266\274\255\275\361\245\325\245\241\245\244\245\353\244\362\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273\244\363\241\243", - (u_char *)"\263\330\275\254\245\325\245\241\245\244\245\353\244\316\300\270\300\256\244\313\274\272\307\324\244\267\244\336\244\267\244\277\241\243", - (u_char *)"\263\330\275\254\245\325\245\241\245\244\245\353\244\362\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273\244\363\241\243", + (unsigned char *)"\245\265\241\274\245\320\241\274\244\254\273\340\244\313\244\336\244\267\244\277\241\243", + (unsigned char *)"\245\265\241\274\245\320\241\274\244\313\300\334\302\263\272\321\244\307\244\271\241\243", + (unsigned char *)"\245\265\241\274\245\320\241\274\244\330\244\316\300\334\302\263\244\313\274\272\307\324\244\267\244\336\244\267\244\277\241\243", + (unsigned char *)"\245\341\245\244\245\363\274\255\275\361\245\325\245\241\245\244\245\353\244\362\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273\244\363\241\243", + (unsigned char *)"\245\346\241\274\245\266\241\246\245\307\245\243\245\354\245\257\245\310\245\352\244\316\272\356\300\256\244\313\274\272\307\324\244\267\244\336\244\267\244\277\241\243", + (unsigned char *)"\245\346\241\274\245\266\274\255\275\361\245\325\245\241\245\244\245\353\244\316\300\270\300\256\244\313\274\272\307\324\244\267\244\336\244\267\244\277\241\243", + (unsigned char *)"\245\346\241\274\245\266\274\255\275\361\245\325\245\241\245\244\245\353\244\362\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273\244\363\241\243", + (unsigned char *)"\263\330\275\254\245\325\245\241\245\244\245\353\244\316\300\270\300\256\244\313\274\272\307\324\244\267\244\336\244\267\244\277\241\243", + (unsigned char *)"\263\330\275\254\245\325\245\241\245\244\245\353\244\362\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273\244\363\241\243", - (u_char *)"\312\324\275\270 ", - (u_char *)"\243\323\243\312\243\263\241\241\241\241\241\241\241\241\241\241\241\241\241\241", + (unsigned char *)"\312\324\275\270 ", + (unsigned char *)"\243\323\243\312\243\263\241\241\241\241\241\241\241\241\241\241\241\241\241\241", - (u_char *)" \312\324\275\270\312\270\273\372\316\363\244\254\304\271\244\271\244\256\244\336\244\271", - (u_char *)"$$", + (unsigned char *)" \312\324\275\270\312\270\273\372\316\363\244\254\304\271\244\271\244\256\244\336\244\271", + (unsigned char *)"$$", - (u_char *)"on", - (u_char *)"off", + (unsigned char *)"on", + (unsigned char *)"off", - (u_char *)"\314\276\273\354", - (u_char *)"\314\276\273\372", - (u_char *)"\314\276\301\260", - (u_char *)"\303\317\314\276", - (u_char *)"\245\265\312\321\306\260\273\354", + (unsigned char *)"\314\276\273\354", + (unsigned char *)"\314\276\273\372", + (unsigned char *)"\314\276\301\260", + (unsigned char *)"\303\317\314\276", + (unsigned char *)"\245\265\312\321\306\260\273\354", - (u_char *)"", - (u_char *)"F1", - (u_char *)"F2", - (u_char *)"F3", - (u_char *)"F4", - (u_char *)"F5", - (u_char *)"F6", - (u_char *)"F7", - (u_char *)"F8", - (u_char *)"F9", - (u_char *)"F10", - (u_char *)"F11", - (u_char *)"F12", - (u_char *)"F13", - (u_char *)"F14", - (u_char *)"F15", - (u_char *)"F16", - (u_char *)"F17", - (u_char *)"F18", - (u_char *)"F19", - (u_char *)"F20", - (u_char *)"Select", - (u_char *)"Kanji", - (u_char *)"Cancel", - (u_char *)"Execute", - (u_char *)"Up", - (u_char *)"Down", - (u_char *)"Right", - (u_char *)"Left", + (unsigned char *)"", + (unsigned char *)"F1", + (unsigned char *)"F2", + (unsigned char *)"F3", + (unsigned char *)"F4", + (unsigned char *)"F5", + (unsigned char *)"F6", + (unsigned char *)"F7", + (unsigned char *)"F8", + (unsigned char *)"F9", + (unsigned char *)"F10", + (unsigned char *)"F11", + (unsigned char *)"F12", + (unsigned char *)"F13", + (unsigned char *)"F14", + (unsigned char *)"F15", + (unsigned char *)"F16", + (unsigned char *)"F17", + (unsigned char *)"F18", + (unsigned char *)"F19", + (unsigned char *)"F20", + (unsigned char *)"Select", + (unsigned char *)"Kanji", + (unsigned char *)"Cancel", + (unsigned char *)"Execute", + (unsigned char *)"Up", + (unsigned char *)"Down", + (unsigned char *)"Right", + (unsigned char *)"Left", - (u_char *)"start", - (u_char *)"henkan", - (u_char *)"muhen", - (u_char *)"kettei", - (u_char *)"hira", - (u_char *)"halpha", - (u_char *)"zalpha", - (u_char *)"hkata", - (u_char *)"zkata", - (u_char *)"code", - (u_char *)"etc", - (u_char *)"right", - (u_char *)"left", - (u_char *)"kaku", - (u_char *)"syuku", - (u_char *)"edit", - (u_char *)"toggle", - (u_char *)"wrapback", - (u_char *)"wrap", - (u_char *)"sjrc", - (u_char *)"buffer", - (u_char *)"toroku", - (u_char *)"syoukyo", - (u_char *)"help", - (u_char *)"ha-kettei", - (u_char *)"flush", - (u_char *)"debug", - (u_char *)"cancel", - (u_char *)"saihenkan", - (u_char *)"ignore", - (u_char *)"top", - (u_char *)"end", - (u_char *)"reconnect", - (u_char *)"kill", + (unsigned char *)"start", + (unsigned char *)"henkan", + (unsigned char *)"muhen", + (unsigned char *)"kettei", + (unsigned char *)"hira", + (unsigned char *)"halpha", + (unsigned char *)"zalpha", + (unsigned char *)"hkata", + (unsigned char *)"zkata", + (unsigned char *)"code", + (unsigned char *)"etc", + (unsigned char *)"right", + (unsigned char *)"left", + (unsigned char *)"kaku", + (unsigned char *)"syuku", + (unsigned char *)"edit", + (unsigned char *)"toggle", + (unsigned char *)"wrapback", + (unsigned char *)"wrap", + (unsigned char *)"sjrc", + (unsigned char *)"buffer", + (unsigned char *)"toroku", + (unsigned char *)"syoukyo", + (unsigned char *)"help", + (unsigned char *)"ha-kettei", + (unsigned char *)"flush", + (unsigned char *)"debug", + (unsigned char *)"cancel", + (unsigned char *)"saihenkan", + (unsigned char *)"ignore", + (unsigned char *)"top", + (unsigned char *)"end", + (unsigned char *)"reconnect", + (unsigned char *)"kill", - (u_char *)"key", - (u_char *)"escape", - (u_char *)"sjxkey", - (u_char *)"etckey", - (u_char *)"intr", - (u_char *)"bskey", - (u_char *)"delkey", - (u_char *)"setnormal", - (u_char *)"throughnext", - (u_char *)"initialmode", - (u_char *)"helpmode", - (u_char *)"defaultcode", - (u_char *)"muhenkanmode", - (u_char *)"muhenkaninedit", - (u_char *)"muhenkantoggle", - (u_char *)"guide", - (u_char *)"forkshell", - (u_char *)"execshell", - (u_char *)"dictionary", - (u_char *)"userdic", - (u_char *)"maindic", - (u_char *)"romaji", - (u_char *)"bstudy", - (u_char *)"silent", - (u_char *)"flushafterconversion", - (u_char *)"rkerrbell", - (u_char *)"server", + (unsigned char *)"key", + (unsigned char *)"escape", + (unsigned char *)"sjxkey", + (unsigned char *)"etckey", + (unsigned char *)"intr", + (unsigned char *)"bskey", + (unsigned char *)"delkey", + (unsigned char *)"setnormal", + (unsigned char *)"throughnext", + (unsigned char *)"initialmode", + (unsigned char *)"helpmode", + (unsigned char *)"defaultcode", + (unsigned char *)"muhenkanmode", + (unsigned char *)"muhenkaninedit", + (unsigned char *)"muhenkantoggle", + (unsigned char *)"guide", + (unsigned char *)"forkshell", + (unsigned char *)"execshell", + (unsigned char *)"dictionary", + (unsigned char *)"userdic", + (unsigned char *)"maindic", + (unsigned char *)"romaji", + (unsigned char *)"bstudy", + (unsigned char *)"silent", + (unsigned char *)"flushafterconversion", + (unsigned char *)"rkerrbell", + (unsigned char *)"server", - (u_char *)"shiftjis", - (u_char *)"sjis", - (u_char *)"euc", - (u_char *)"euc2", - (u_char *)"jis", - (u_char *)"jis2", - (u_char *)"kuten", - (u_char *)"kuten2", + (unsigned char *)"shiftjis", + (unsigned char *)"sjis", + (unsigned char *)"euc", + (unsigned char *)"euc2", + (unsigned char *)"jis", + (unsigned char *)"jis2", + (unsigned char *)"kuten", + (unsigned char *)"kuten2", - (u_char *)"buff", - (u_char *)"unbuff", - (u_char *)"direct", + (unsigned char *)"buff", + (unsigned char *)"unbuff", + (unsigned char *)"direct", - (u_char *)"sj2", - (u_char *)"shift", + (unsigned char *)"sj2", + (unsigned char *)"shift", - (u_char *)"function", + (unsigned char *)"function", - (u_char *)"unbuffer", - (u_char *)"funcetc" + (unsigned char *)"unbuffer", + (unsigned char *)"funcetc" }; diff --git a/execute.c b/execute.c index ecd8f7b..3509e6b 100644 --- a/execute.c +++ b/execute.c @@ -67,18 +67,18 @@ extern char *dict_dir; extern int dir_mode; extern int file_mode; -static u_char buf1[YomiBufSize]; -static u_char buf2[YomiBufSize]; -static u_char buf3[YomiBufSize]; -static u_char buf4[YomiBufSize]; -static u_char kbuf[KanjiBufSize]; -static u_char skbuf[KanjiBufSize]; +static unsigned char buf1[YomiBufSize]; +static unsigned char buf2[YomiBufSize]; +static unsigned char buf3[YomiBufSize]; +static unsigned char buf4[YomiBufSize]; +static unsigned char kbuf[KanjiBufSize]; +static unsigned char skbuf[KanjiBufSize]; static jmp_buf error_ret; static WorkArea *worklist = NULL; static Client *cur_cli; -static u_char defaultchar[2] = {(u_char)0x81, (u_char)0x40}; +static unsigned char defaultchar[2] = {(unsigned char)0x81, (unsigned char)0x40}; static int defuse=0, defuse2=0; DictFile *opendict(); @@ -86,7 +86,7 @@ int closedict(); StdyFile *openstdy(); int closestdy(); -u_char *put_ndata(), *put_string(); +unsigned char *put_ndata(), *put_string(); @@ -486,7 +486,7 @@ void exec_ph2knj (int mb_flag) { int i, j, l, stdy_size, buf_size, srchead = 0, srclen; - u_char *p,*q; + unsigned char *p,*q; i = get_nstring(buf1, sizeof(buf1)); @@ -564,7 +564,7 @@ exec_cl2knj (int mb_flag) { int len, stdy_size, buf_size; int i, j, l; - u_char *ptr, *q; + unsigned char *ptr, *q; len = get_int(); i = get_nstring(buf1, sizeof(buf1)); @@ -629,7 +629,7 @@ exec_nextcl (int mb_flag) { int mode, stdy_size, buf_size; int i, l; - u_char *ptr, *q; + unsigned char *ptr, *q; mode = get_int(); @@ -682,7 +682,7 @@ exec_prevcl (int mb_flag) { int mode, stdy_size, buf_size; int i, l; - u_char *ptr, *q; + unsigned char *ptr, *q; mode = get_int(); @@ -784,7 +784,7 @@ exec_cl2knj_all (int mb_flag) { int len, stdy_size, buf_size; int i, l; - u_char *ptr, *q; + unsigned char *ptr, *q; len = get_int(); i = get_nstring(buf1, sizeof(buf1)); @@ -1082,7 +1082,7 @@ exec_getdict (int mb_flag) TypeDicID dicid; int err, buf_size, l; DICTL *dl; - u_char *ptr, *q; + unsigned char *ptr, *q; dicid = get_int(); @@ -1166,7 +1166,7 @@ exec_nextdict (int mb_flag) TypeDicID dicid; int err, buf_size, l; DICTL *dl; - u_char *ptr, *q; + unsigned char *ptr, *q; dicid = get_int(); @@ -1250,7 +1250,7 @@ exec_prevdict (int mb_flag) TypeDicID dicid; int err, buf_size, l; DICTL *dl; - u_char *ptr, *q; + unsigned char *ptr, *q; dicid = get_int(); diff --git a/fuzoku.c b/fuzoku.c index 1977848..7a51bbb 100644 --- a/fuzoku.c +++ b/fuzoku.c @@ -50,8 +50,8 @@ int terminate(); static int fzkstrcmp(yptr, fzkp, saml) -u_char *yptr; -u_char *fzkp; +unsigned char *yptr; +unsigned char *fzkp; int *saml; { int asklen, nkrlen; @@ -95,7 +95,7 @@ int *saml; void setclrec(jrec, yptr, right) JREC *jrec; -u_char *yptr; +unsigned char *yptr; TypeCnct right; { CLREC *new; @@ -185,7 +185,7 @@ static int fzkcnct(right, left) TypeCnct right; TypeCnct left; { - u_char *cncttbl; + unsigned char *cncttbl; if (right && left) { cncttbl = Rigtadr(right); @@ -199,14 +199,14 @@ TypeCnct left; void srchfzk(jrec, yptr, right, level) JREC *jrec; -u_char *yptr; +unsigned char *yptr; TypeCnct right; int level; { - u_char *fzk; + unsigned char *fzk; int len = 0; int cmp; - u_char *next; + unsigned char *next; FREC *fzkrec; int i; int nlen; diff --git a/fzkyomi.c b/fzkyomi.c index d2d0be7..6780843 100644 --- a/fzkyomi.c +++ b/fzkyomi.c @@ -42,13 +42,13 @@ #include "sj_right.h" #include "sj_left.h" -static u_char fzk_wo[] = { +static unsigned char fzk_wo[] = { (0<<5)+0, L_WO, R_WO, (0<<5)+0, L_WO_S, R_WO_S, 0xff }; -static u_char fzk_xtu[] = { +static unsigned char fzk_xtu[] = { (0<<5) + 1, _KE, L_KKE, R_SHUUJO, (0<<5) + 3, _TA,_XTU,_TE, L_TTATTE, R_TTATTE, (1<<5) + 1, _RA, L_TTARA, R_TTARA, @@ -69,7 +69,7 @@ static u_char fzk_xtu[] = { 0xff }; -static u_char fzk_a[] = { +static unsigned char fzk_a[] = { (0<<5) + 1, _GE, L_YOUGEN, R_AGE, (1<<5) + 1, _YO, L_YOUGEN, R_MEIREI2, (1<<5) + 1, _RU, L_YOUGEN, R_SHUUSI, @@ -88,7 +88,7 @@ static u_char fzk_a[] = { 0xff }; -static u_char fzk_i[] = { +static unsigned char fzk_i[] = { (0<<5) + 0, L_IRU, R_I, (0<<5) + 1, _I, L_II, R_SHUUSI, (0<<5) + 1, _KA, L_YOUGEN, R_MIZEN5, @@ -111,21 +111,21 @@ static u_char fzk_i[] = { 0xff }; -static u_char fzk_u[] = { +static unsigned char fzk_u[] = { (0<<5) + 1, _E, L_UE, R_UE, (0<<5) + 1, _TI, L_UTI, R_UTI, (0<<5) + 1, _RU, L_ERU, R_SHUUSI, 0xff }; -static u_char fzk_e[] = { +static unsigned char fzk_e[] = { (0<<5) + 0, L_ERU, R_E, (0<<5) + 1, _RU, L_ERU, R_SHUUSI, (0<<5) + 1, _RE, L_ERU, R_KATEI3, 0xff }; -static u_char fzk_o[] = { +static unsigned char fzk_o[] = { (0<<5) + 1, _I, L_YOUGEN, R_ONBIN8, (1<<5) + 1, _TE, L_OITE, R_OITE, (0<<5) + 1, _KA, L_YOUGEN, R_MIZEN5, @@ -141,7 +141,7 @@ static u_char fzk_o[] = { 0xff }; -static u_char fzk_ka[] = { +static unsigned char fzk_ka[] = { (0<<5) + 0 + 8, L_KA1, R_KA1, (0<<5) + 0 + 8, L_KA2, R_KA2, (0<<5) + 1, _I, L_KAI, R_SHUUJO, @@ -166,7 +166,7 @@ static u_char fzk_ka[] = { 0xff }; -static u_char fzk_ga[] = { +static unsigned char fzk_ga[] = { (0<<5) + 0, L_GA1, R_GA1, (0<<5) + 0, L_GA2, R_GA2, (0<<5) + 2, _TA,_I, L_GATAI, R_KSHUUSI, @@ -186,13 +186,13 @@ static u_char fzk_ga[] = { 0xff }; -static u_char fzk_ki[] = { +static unsigned char fzk_ki[] = { (0<<5) + 0, L_YOUGEN, R_FZKKI, (0<<5) + 1, _RI, L_KIRI, R_KIRI, 0xff }; -static u_char fzk_ku[] = { +static unsigned char fzk_ku[] = { (0<<5) + 2, _SE,_NI, L_KUSENI, R_KUSENI, (0<<5) + 3, _DA,_SA,_I, L_KUDASARU, R_KUDASAI, (2<<5) + 1, _XTU, L_KUDASARU, R_ONBIN6, @@ -208,13 +208,13 @@ static u_char fzk_ku[] = { 0xff }; -static u_char fzk_gu[] = { +static unsigned char fzk_gu[] = { (0<<5) + 2, _RA,_I, L_KURAI, R_KURAI, (0<<5) + 2, _RU,_MI, L_GURUMI, R_GURUMI, 0xff }; -static u_char fzk_ke[] = { +static unsigned char fzk_ke[] = { (0<<5) + 1, _DO, L_KEDO, R_KEDO, (1<<5) + 1, _MO, L_KEDO, R_KEDO, (0<<5) + 2, _RE,_DO, L_KEDO, R_KEDO, @@ -222,7 +222,7 @@ static u_char fzk_ke[] = { 0xff }; -static u_char fzk_ko[] = { +static unsigned char fzk_ko[] = { (0<<5) + 0, L_YOUGEN, R_KO, (0<<5) + 1, _I, L_YOUGEN, R_MEIREI1, (0<<5) + 1, _SO, L_KOSO, R_KOSO, @@ -230,7 +230,7 @@ static u_char fzk_ko[] = { 0xff }; -static u_char fzk_go[] = { +static unsigned char fzk_go[] = { (0<<5) + 2, _ZA,_I, L_GOZAI, R_GOZAI, (0<<5) + 2, _TO,_KI, L_GOTOSI, R_GOTOKI, (1<<5) + 1, _KU, L_GOTOSI, R_GOTOKU, @@ -238,7 +238,7 @@ static u_char fzk_go[] = { 0xff }; -static u_char fzk_sa[] = { +static unsigned char fzk_sa[] = { (0<<5) + 0, L_SA1, R_MIZEN1, (0<<5) + 0, L_SA2, R_SHUUJO, (0<<5) + 1, _E, L_SAE, R_SAE, @@ -250,13 +250,13 @@ static u_char fzk_sa[] = { 0xff }; -static u_char fzk_za[] = { +static unsigned char fzk_za[] = { (0<<5) + 1, _RU, L_ZARU, R_ZARU, (0<<5) + 1, _RE, L_ZARU, R_KATEI2, 0xff }; -static u_char fzk_si[] = { +static unsigned char fzk_si[] = { (0<<5) + 0, L_SI1, R_SI1, (0<<5) + 0, L_SI2, R_SI2, (0<<5) + 0, L_N_SI, R_N_SI, @@ -272,7 +272,7 @@ static u_char fzk_si[] = { 0xff }; -static u_char fzk_ji[] = { +static unsigned char fzk_ji[] = { (0<<5) + 2, _MA,_I, L_JIMAU, R_IKI, (1<<5) + 1, _U, L_JIMAU, R_SHUUSI, (1<<5) + 1, _E, L_JIMAU, R_IKE, @@ -289,7 +289,7 @@ static u_char fzk_ji[] = { 0xff }; -static u_char fzk_su[] = { +static unsigned char fzk_su[] = { (0<<5) + 1, _GI, L_SUGIRU, R_SUGI, (1<<5) + 1, _RU, L_SUGIRU, R_SHUUSI, (1<<5) + 1, _RE, L_SUGIRU, R_KATEI2, @@ -303,7 +303,7 @@ static u_char fzk_su[] = { 0xff }; -static u_char fzk_zu[] = { +static unsigned char fzk_zu[] = { (0<<5) + 0, L_ZU, R_ZU, (0<<5) + 1, _TU, L_ZUTU, R_ZUTU, (0<<5) + 2, _NI,_I, L_ZU, R_I, @@ -312,7 +312,7 @@ static u_char fzk_zu[] = { 0xff }; -static u_char fzk_se[] = { +static unsigned char fzk_se[] = { (0<<5) + 0, L_SE, R_MIZEN2, (0<<5) + 0, L_SERU, R_SASE, (0<<5) + 1, _YO, L_SEYO, R_MEIREI2, @@ -323,12 +323,12 @@ static u_char fzk_se[] = { 0xff }; -static u_char fzk_ze[] = { +static unsigned char fzk_ze[] = { (0<<5) + 0, L_ZE, R_SHUUJO, 0xff }; -static u_char fzk_so[] = { +static unsigned char fzk_so[] = { (0<<5) + 1, _U, L_SOUDA, R_SOU, (1<<5) + 1, _DA, L_SOUDA, R_SOUDA, (2<<5) + 1, _XTU, L_YOUTAI, R_ONBIN1, @@ -345,12 +345,12 @@ static u_char fzk_so[] = { 0xff }; -static u_char fzk_zo[] = { +static unsigned char fzk_zo[] = { (0<<5) + 0, L_ZO, R_SHUUJO, 0xff }; -static u_char fzk_ta[] = { +static unsigned char fzk_ta[] = { (0<<5) + 0, L_TA, R_TA, (0<<5) + 1, _I, L_TAI, R_TAI, (0<<5) + 2, _KA,_XTU, L_TAI, R_ONBIN1, @@ -376,7 +376,7 @@ static u_char fzk_ta[] = { 0xff }; -static u_char fzk_da[] = { +static unsigned char fzk_da[] = { (0<<5) + 0, L_DA1, R_TA, (0<<5) + 0, L_DA2, R_DSHUUSI1, (0<<5) + 1, _KE, L_DAKE, R_DAKE, @@ -389,7 +389,7 @@ static u_char fzk_da[] = { 0xff }; -static u_char fzk_ti[] = { +static unsigned char fzk_ti[] = { (0<<5) + 2, _MA,_I, L_TIMAU, R_IKI, (1<<5) + 1, _U, L_TIMAU, R_SHUUSI, (1<<5) + 1, _E, L_TIMAU, R_IKE, @@ -406,12 +406,12 @@ static u_char fzk_ti[] = { 0xff }; -static u_char fzk_di[] = { +static unsigned char fzk_di[] = { (0<<5) + 1, _XYA, L_JYA, R_JYA, 0xff }; -static u_char fzk_tu[] = { +static unsigned char fzk_tu[] = { (0<<5) + 2, _I,_TE, L_TUITE, R_TUITE, (0<<5) + 1, _KI, L_TUKI, R_TUKI, (0<<5) + 1, _TU, L_TUTU, R_TUTU, @@ -419,14 +419,14 @@ static u_char fzk_tu[] = { 0xff }; -static u_char fzk_te[] = { +static unsigned char fzk_te[] = { (0<<5) + 0, L_TE1, R_TE1, (0<<5) + 0, L_TE2, R_TE2, (0<<5) + 1, _RU, L_TERU, R_TERU, 0xff }; -static u_char fzk_de[] = { +static unsigned char fzk_de[] = { (0<<5) + 0, L_DE, R_DE, (0<<5) + 0, L_DA1, R_TE2, (0<<5) + 3, _A,_RO,_U, L_DEAROU, R_AROU, @@ -442,7 +442,7 @@ static u_char fzk_de[] = { 0xff }; -static u_char fzk_to[] = { +static unsigned char fzk_to[] = { (0<<5) + 0, L_TO1, R_TO1, (0<<5) + 0, L_TO2, R_TO2, (0<<5) + 1, _I, L_TE2, R_ONBIN8, @@ -463,7 +463,7 @@ static u_char fzk_to[] = { 0xff }; -static u_char fzk_do[] = { +static unsigned char fzk_do[] = { (0<<5) + 0, L_DO, R_DO, (0<<5) + 1, _I, L_DA1, R_ONBIN8, (0<<5) + 2, _O,_RI, L_DOORI, R_DOORI, @@ -478,7 +478,7 @@ static u_char fzk_do[] = { 0xff }; -static u_char fzk_na[] = { +static unsigned char fzk_na[] = { (0<<5) + 0, L_NA1, R_SHUUJO, (0<<5) + 0, L_NA2, R_NA2, (0<<5) + 1, _XA, L_NAA, R_SHUUJO, @@ -515,7 +515,7 @@ static u_char fzk_na[] = { 0xff }; -static u_char fzk_ni[] = { +static unsigned char fzk_ni[] = { (0<<5) + 0, L_NI1, R_NI1, (0<<5) + 0, L_NI2, R_NI2, (0<<5) + 0, L_NI3, R_NI3, @@ -531,19 +531,19 @@ static u_char fzk_ni[] = { 0xff }; -static u_char fzk_nu[] = { +static unsigned char fzk_nu[] = { (0<<5) + 0, L_NU, R_NU, 0xff }; -static u_char fzk_ne[] = { +static unsigned char fzk_ne[] = { (0<<5) + 0, L_NE1, R_SHUUJO, (0<<5) + 0, L_NE2, R_KATEI2, (0<<5) + 1, _E, L_NEE, R_SHUUJO, 0xff }; -static u_char fzk_no[] = { +static unsigned char fzk_no[] = { (0<<5) + 0, L_NO1, R_NO1, (0<<5) + 0, L_NO2, R_NO2, (0<<5) + 1, _DE, L_NODE, R_NODE, @@ -553,14 +553,14 @@ static u_char fzk_no[] = { 0xff }; -static u_char fzk_ha[] = { +static unsigned char fzk_ha[] = { (0<<5) + 0, L_HA, R_HA, (0<<5) + 1, _SI, L_HA, R_HASI, (0<<5) + 1, _ZU, L_HAZU, R_HAZU, 0xff }; -static u_char fzk_ba[] = { +static unsigned char fzk_ba[] = { (0<<5) + 0, L_BA, R_BA, (0<<5) + 2, _KA,_SI, L_BAKARI, R_BAKARI, (1<<5) + 1, _RI, L_BAKARI, R_BAKARI, @@ -569,7 +569,7 @@ static u_char fzk_ba[] = { 0xff }; -static u_char fzk_hu[] = { +static unsigned char fzk_hu[] = { (0<<5) + 2, _U,_DA, L_FUUDA, R_SOUDA, (2<<5) + 1, _XTU, L_FUUDA, R_ONBIN1, (2<<5) + 2, _RO,_U, L_FUUDA, R_DAROU, @@ -584,12 +584,12 @@ static u_char fzk_hu[] = { 0xff }; -static u_char fzk_he[] = { +static unsigned char fzk_he[] = { (0<<5)+0, L_HE, R_HE, 0xff }; -static u_char fzk_be[] = { +static unsigned char fzk_be[] = { (0<<5) + 2, _KA,_RA, L_BESI, R_BEKARA, (0<<5) + 1, _KI, L_BESI, R_BEKI, (0<<5) + 1, _KU, L_BESI, R_BEKU, @@ -597,14 +597,14 @@ static u_char fzk_be[] = { 0xff }; -static u_char fzk_ho[] = { +static unsigned char fzk_ho[] = { (0<<5) + 1, _U, L_HOU, R_HOU, (0<<5) + 1, _KA, L_HOKA, R_HOKA, (0<<5) + 1, _DO, L_HODO, R_HODO, 0xff }; -static u_char fzk_ma[] = { +static unsigned char fzk_ma[] = { (0<<5) + 1, _I, L_MAI, R_MAI, (0<<5) + 1, _SI, L_MASU, R_DESHI, (1<<5) + 0, L_MASU, R_MEIREI2, @@ -620,7 +620,7 @@ static u_char fzk_ma[] = { 0xff }; -static u_char fzk_mi[] = { +static unsigned char fzk_mi[] = { (0<<5) + 0, L_YOUGEN, R_MI, (0<<5) + 2, _TA,_I, L_MITAIDA, R_MITAI, (2<<5) + 1, _DA, L_MITAIDA, R_MITAIDA, @@ -641,7 +641,7 @@ static u_char fzk_mi[] = { 0xff }; -static u_char fzk_mo[] = { +static unsigned char fzk_mo[] = { (0<<5) + 0, L_MO1, R_MO1, (0<<5) + 0, L_MO2, R_MO2, (0<<5) + 2, _XTU,_TE, L_MOTTE, R_MOTTE, @@ -657,7 +657,7 @@ static u_char fzk_mo[] = { 0xff }; -static u_char fzk_ya[] = { +static unsigned char fzk_ya[] = { (0<<5) + 0, L_YA1, R_YA1, (0<<5) + 0, L_YA2, R_YA2, (0<<5) + 2, _SU,_I, L_YASUI, R_KSHUUSI, @@ -676,12 +676,12 @@ static u_char fzk_ya[] = { 0xff }; -static u_char fzk_yu[] = { +static unsigned char fzk_yu[] = { (0<<5) + 1, _E, L_YUE, R_YUE, 0xff }; -static u_char fzk_yo[] = { +static unsigned char fzk_yo[] = { (0<<5) + 0, L_YO, R_SHUUJO, (0<<5) + 1, _I, L_YOI, R_KSHUUSI, (0<<5) + 1, _U, L_YOU, R_YOU1, @@ -714,7 +714,7 @@ static u_char fzk_yo[] = { 0xff }; -static u_char fzk_ra[] = { +static unsigned char fzk_ra[] = { (0<<5) + 2, _SI,_I, L_RASII, R_RASII, (1<<5) + 2, _KA,_XTU, L_RASII, R_ONBIN1, (1<<5) + 1, _KI, L_RASII, R_GOTOKI, @@ -728,7 +728,7 @@ static u_char fzk_ra[] = { 0xff }; -static u_char fzk_re[] = { +static unsigned char fzk_re[] = { (0<<5) + 0, L_RERU, R_RARE, (0<<5) + 1, _YO, L_RERU, R_MEIREI2, (0<<5) + 1, _RU, L_RERU, R_SHUUSI, @@ -737,7 +737,7 @@ static u_char fzk_re[] = { 0xff }; -static u_char fzk_wa[] = { +static unsigned char fzk_wa[] = { (0<<5) + 0, L_WA, R_SHUUJO, (0<<5) + 1, _KE, L_WAKE, R_WAKE, (0<<5) + 1, _NE, L_WANE, R_SHUUJO, @@ -745,7 +745,7 @@ static u_char fzk_wa[] = { 0xff }; -static u_char fzk_nn[] = { +static unsigned char fzk_nn[] = { (0<<5) + 0, L_NN1, R_NN1, (0<<5) + 0, L_NN2, R_NN2, 0xff @@ -753,7 +753,7 @@ static u_char fzk_nn[] = { -u_char *fzkadr[] = { +unsigned char *fzkadr[] = { 0, fzk_a, 0, fzk_i, 0, fzk_u, 0, fzk_e, 0, fzk_o, fzk_ka, fzk_ga, fzk_ki, 0, fzk_ku, diff --git a/getkanji.c b/getkanji.c index 69d9af6..419f241 100644 --- a/getkanji.c +++ b/getkanji.c @@ -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); diff --git a/getrank.c b/getrank.c index b512fa7..34a7bc3 100644 --- a/getrank.c +++ b/getrank.c @@ -112,7 +112,7 @@ setnspr (KHREC *kptr, STDYIN *sptr) } } - kptr -> rank = (u_char)keepnm; + kptr -> rank = (unsigned char)keepnm; trank++; if (keepnm <= nrank) nrank++; if (sptr -> nmflg && (nrank > keepnm)) nrank = keepnm; @@ -138,12 +138,12 @@ regetrank (void) for (count = khcount, kptr = kouhotbl ; count-- ; kptr++) { if (!(kptr -> rank)) { if (tmp && kptr -> mode && !(kptr -> offs)) { - kptr -> rank = (u_char)tmp++; + kptr -> rank = (unsigned char)tmp++; } else - kptr -> rank = (u_char)trank++; + kptr -> rank = (unsigned char)trank++; } else if ((short)kptr -> rank >= nrank) - kptr -> rank += (u_char)nkhcount; + kptr -> rank += (unsigned char)nkhcount; } } diff --git a/henkan.c b/henkan.c index c987b5e..a8a8a44 100644 --- a/henkan.c +++ b/henkan.c @@ -52,7 +52,7 @@ exec_henkan () short sp; int len, rlen, ilen; int opos, ipos, bnum; - u_char index[BUFFLENGTH * 2], mode; + unsigned char index[BUFFLENGTH * 2], mode; cv = GetConversion (); sp = 0; @@ -283,9 +283,9 @@ Getcode (in, out) wchar16_t *in, *out; { int c, i, j; - u_char s[5]; + unsigned char s[5]; int base, c_code; - u_short code; + unsigned short code; wchar16_t sw[5]; wchar16_t tmp[3]; @@ -308,7 +308,7 @@ wchar16_t *in, *out; in ++; if (i == 4) { s[i] = '\0'; - code = (u_short)strtol((char *)s, (char **)NULL, base); + code = (unsigned short)strtol((char *)s, (char **)NULL, base); switch (c_code) { case CODE_KUTEN : case CODE_KUTEN2 : @@ -348,16 +348,16 @@ wchar16_t *in, *out; } -static u_char load_mode; +static unsigned char load_mode; load_bun (num, s, type) int num; wchar16_t *s; -u_char type; +unsigned char type; { Conversion *cv; int len, ilen; - u_char itype; + unsigned char itype; wchar16_t Htmp[BUFFLENGTH], Ztmp[BUFFLENGTH * 2]; cv = GetConversion (); @@ -426,13 +426,13 @@ u_char type; load_bun2(num, htmp, ztmp, omode) int num; wchar16_t *htmp, *ztmp; -u_short *omode; +unsigned short *omode; { Conversion *cv; int i; int len, ilen; - u_short *op; - u_char type; + unsigned short *op; + unsigned char type; wchar16_t Ztmp[DLEN + 1]; @@ -532,7 +532,7 @@ int first; -static u_char Bstr_mode; +static unsigned char Bstr_mode; Bstr (bnum, s) int bnum; @@ -669,7 +669,7 @@ Bdisp (redraw) int displen; int amount = 0; int tmpcol=0; - u_short row, col; + unsigned short row, col; CursorRead(&row, &col); @@ -716,7 +716,7 @@ Rdisp () int displen; int amount=0; int tmpcol=0; - u_short row, col; + unsigned short row, col; CursorRead(&row, &col); @@ -766,7 +766,7 @@ int Total; int displen; int amount=0; int tmpcol=0; - u_short row, col; + unsigned short row, col; CursorRead(&row, &col); diff --git a/hindo.c b/hindo.c index b741a41..5743da0 100644 --- a/hindo.c +++ b/hindo.c @@ -51,7 +51,7 @@ extern int kanji_num; int -check_hindo(u_char* ptr, int len) +check_hindo(unsigned char* ptr, int len) { int low, high, mid; int i; @@ -262,10 +262,10 @@ reset_assyuku(HindoRec* hrec) static HindoRec* -makehindo(u_char* ptr, int len, int alen) +makehindo(unsigned char* ptr, int len, int alen) { HindoRec *hrec; - u_char *p; + unsigned char *p; hrec = (HindoRec *)Malloc(sizeof(HindoRec)); @@ -273,7 +273,7 @@ makehindo(u_char* ptr, int len, int alen) fprintf(stderr, "\245\341\245\342\245\352\244\254\302\255\244\352\244\336\244\273\244\363\n"); exit(1); } - p = (u_char *)Malloc(len); + p = (unsigned char *)Malloc(len); if (!p) { fprintf(stderr, "\245\341\245\342\245\352\244\254\302\255\244\352\244\336\244\273\244\363\n"); exit(1); @@ -301,7 +301,7 @@ makehindo(u_char* ptr, int len, int alen) static void -set_hindo(u_char* ptr, int len, int alen) +set_hindo(unsigned char* ptr, int len, int alen) { HindoRec *hrec; int low, high, mid; @@ -376,7 +376,7 @@ set_hindo(u_char* ptr, int len, int alen) static void -reset_hindo(u_char* p, int l) +reset_hindo(unsigned char* p, int l) { HindoRec *hrec; int low, high, mid; @@ -428,13 +428,13 @@ reset_hindo(u_char* p, int l) void -knjhnd_set(u_char* p, int l) +knjhnd_set(unsigned char* p, int l) { - u_char *kp1; - u_char *kp2; + unsigned char *kp1; + unsigned char *kp2; int i; int kl1; - u_char tmp[MaxKanjiLength * 2 + MaxAtrNumber * 2 + 1]; + unsigned char tmp[MaxKanjiLength * 2 + MaxAtrNumber * 2 + 1]; for (kp1 = p, kl1 = l ; kl1 > 0 ; ) { @@ -462,13 +462,13 @@ knjhnd_set(u_char* p, int l) void -knjhnd_reset(u_char* p, int l) +knjhnd_reset(unsigned char* p, int l) { - u_char *kp1; - u_char *kp2; + unsigned char *kp1; + unsigned char *kp2; int i; int kl1; - u_char tmp[MaxKanjiLength * 2 + MaxAtrNumber * 2 + 1]; + unsigned char tmp[MaxKanjiLength * 2 + MaxAtrNumber * 2 + 1]; for (kp1 = p, kl1 = l ; kl1 > 0 ; ) { @@ -499,7 +499,7 @@ knjhnd_reset(u_char* p, int l) static int check_assyuku(HindoRec* p, HindoRec* q) { - u_char ptmp[128], qtmp[128]; + unsigned char ptmp[128], qtmp[128]; int plen; int qlen; @@ -528,7 +528,7 @@ decide_knjask(void) int i, j; AssyukuRec *p; HindoRec *q; - u_char *r; + unsigned char *r; int len = 0; askknj_num = 0; @@ -582,7 +582,7 @@ decide_knjask(void) end: { int i, j, len; - u_char *p; + unsigned char *p; for (i = 0 ; i < askknj_num ; i++) { len = askknj[i] -> klen; diff --git a/hzstrlen.c b/hzstrlen.c index 6e781f2..e887a7a 100644 --- a/hzstrlen.c +++ b/hzstrlen.c @@ -44,7 +44,7 @@ #include "kanakan.h" int -euc_codesize (u_char c) +euc_codesize (unsigned char c) { if ((c & KanjiModeMask) == 0x90) { return 1; @@ -58,9 +58,9 @@ euc_codesize (u_char c) } int -hzstrlen (u_char *ptr, int len) +hzstrlen (unsigned char *ptr, int len) { - u_char *head; + unsigned char *head; head = ptr; while (len-- > 0) ptr += euc_codesize(*ptr); return (ptr - head); diff --git a/init.c b/init.c index abfc1f6..85e3cd0 100644 --- a/init.c +++ b/init.c @@ -40,8 +40,8 @@ void seg_count(dict) DICT *dict; { - u_char *p; - u_char *q; + unsigned char *p; + unsigned char *q; TypeDicSeg segcnt = 0; if (dict-> getidx) { @@ -61,7 +61,7 @@ DICT *dict; void mkidxtbl(dict) DICT *dict; { - u_char *p; + unsigned char *p; TypeDicSeg seg; if (!dict->getidx || !dict->getofs) return; diff --git a/istrcmp.c b/istrcmp.c index f8a585f..01d1a91 100644 --- a/istrcmp.c +++ b/istrcmp.c @@ -34,7 +34,7 @@ #include "sj_typedef.h" int -istrcmp(u_char *yomip, u_char *idxp, int ylen, int ilen) +istrcmp(unsigned char *yomip, unsigned char *idxp, int ylen, int ilen) { while (1) { if ((ilen | ylen) == 0) diff --git a/kanakan.h b/kanakan.h index 98c5f15..6958eec 100644 --- a/kanakan.h +++ b/kanakan.h @@ -38,7 +38,7 @@ #include "Struct.h" /* adddic.c */ -u_int adddic(u_char *yomi, u_char *kanji, TypeGram hinsi); +unsigned int adddic(unsigned char *yomi, unsigned char *kanji, TypeGram hinsi); /* addelcmn.c */ void set_size(unsigned char *p, int size, int plen, int nlen); @@ -57,17 +57,17 @@ CLREC *alloc_clrec(void); void free_clrec(CLREC *p); /* charsize.c */ -int codesize(u_char code); +int codesize(unsigned char code); /* cl2knj.c */ -int cl2knj(u_char *yomi, int len, u_char *kouho); -int nextcl(u_char *kouho, int mode); -int prevcl(u_char *kouho, int mode); +int cl2knj(unsigned char *yomi, int len, unsigned char *kouho); +int nextcl(unsigned char *kouho, int mode); +int prevcl(unsigned char *kouho, int mode); int selectnum(void); /* clstudy.c */ -int clstudy(u_char *yomi1, u_char *yomi2, STDYOUT *stdy); -void delclsub(u_char *target); +int clstudy(unsigned char *yomi1, unsigned char *yomi2, STDYOUT *stdy); +void delclsub(unsigned char *target); void mkclidx(void); /* cvtdict.c */ @@ -81,7 +81,7 @@ void cvtkouho(KHREC *krec); void setstyrec(KHREC *krec); /* deldic.c */ -u_int deldic(u_char *yomi, u_char *kanji, TypeGram hinsi); +unsigned int deldic(unsigned char *yomi, unsigned char *kanji, TypeGram hinsi); /* depend.c */ DictFile *opendict(char *name, char *passwd); @@ -105,17 +105,17 @@ void get_stdysize(int *stynum, int *clstep, int *cllen); /* dict.c */ void get_askknj(void); int seldict(TypeDicID id); -u_char *get_idxptr(TypeDicSeg seg); +unsigned char *get_idxptr(TypeDicSeg seg); /* getkanji.c */ -u_char *getkan_none(u_char *s, u_char *d, u_char *ym, int yl, int flg); -u_char *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); -u_char *getkan_knj(u_char *s, u_char *d, u_char *ym, int yl, int flg); -u_char *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); -u_char *getkan_ascii(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); +unsigned char *getkan_none(unsigned char *s, unsigned char *d, unsigned char *ym, int yl, int flg); +unsigned char *getkan_hira(unsigned char *s, unsigned char *d, unsigned char *ym, int yl, int flg); +unsigned char *getkan_kata(unsigned char *s, unsigned char *d, unsigned char *ym, int yl, int flg); +unsigned char *getkan_knj(unsigned char *s, unsigned char *d, unsigned char *ym, int yl, int flg); +unsigned char *getkan_ofs(unsigned char *s, unsigned char *d, unsigned char *ym, int yl, int flg); +unsigned char *getkan_norm(unsigned char *s, unsigned char *d, unsigned char *ym, int yl, int flg); +unsigned char *getkan_ascii(unsigned char *s, unsigned char *d, unsigned char *ym, int yl, int flg); +int getkanji(unsigned char *ym, int yl, unsigned char *ptr, unsigned char *buf); /* getrank.c */ void getrank(void); @@ -133,31 +133,31 @@ void mkjiritu(int mode); JREC *argjrec(int len, JREC *rec); /* mkkouho.c */ -u_char *makekan_none(u_char *s, u_char *d, int flg); -u_char *makekan_1byte(u_char *s, u_char *d, int flg); -u_char *makekan_knj(u_char *s, u_char *d, int flg); -u_char *makekan_ofs(u_char *s, u_char *d, int flg); -u_char *makekan_norm(u_char *s, u_char *d, int flg); -u_char *makekan_ascii(u_char *s, u_char *d, int flg); +unsigned char *makekan_none(unsigned char *s, unsigned char *d, int flg); +unsigned char *makekan_1byte(unsigned char *s, unsigned char *d, int flg); +unsigned char *makekan_knj(unsigned char *s, unsigned char *d, int flg); +unsigned char *makekan_ofs(unsigned char *s, unsigned char *d, int flg); +unsigned char *makekan_norm(unsigned char *s, unsigned char *d, int flg); +unsigned char *makekan_ascii(unsigned char *s, unsigned char *d, int flg); void mkkouho(void); int sel_sjmode(JREC *jrec); /* mknumber.c */ -void num_type00(u_char *s1, u_char *s2, JREC *jrec); -void num_type01(u_char *s1, u_char *s2, JREC *jrec); -void num_type02(u_char *s1, u_char *s2, JREC *jrec); -void num_type03(u_char *s1, u_char *s2, JREC *jrec); -void num_type04(u_char *s1, u_char *s2, JREC *jrec); -void num_type05(u_char *s1, u_char *s2, JREC *jrec); -void num_type06(u_char *s1, u_char *s2, JREC *jrec); -void num_type07(u_char *s1, u_char *s2, JREC *jrec); -void num_type08(u_char *s1, u_char *s2, JREC *jrec); -void num_type09(u_char *s1, u_char *s2, JREC *jrec); -void num_type10(u_char *s1, u_char *s2, JREC *jrec); -void num_type11(u_char *s1, u_char *s2, JREC *jrec); -void num_type12(u_char *s1, u_char *s2, JREC *jrec); -void num_type13(u_char *s1, u_char *s2, JREC *jrec); -void num_type14(u_char *s1, u_char *s2, JREC *jrec); +void num_type00(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type01(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type02(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type03(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type04(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type05(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type06(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type07(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type08(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type09(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type10(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type11(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type12(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type13(unsigned char *s1, unsigned char *s2, JREC *jrec); +void num_type14(unsigned char *s1, unsigned char *s2, JREC *jrec); /* peepdic.c */ int getusr(unsigned char *buf); @@ -174,45 +174,45 @@ int ph_khtbl(CLREC *clrec); int setconj(TypeGram hinsi, JREC *jrec, CREC *crec); /* setjrec.c */ -int setj_atrb(u_char* p); -int setj_ofs(u_char* p); -int setj_knj(u_char* p); -int setj_norm1(u_char* p); -int setj_norm2(u_char* p); -int setj_norm3(u_char* p); -void setjrec(u_char* tagp, int mode); -void setnumrec(u_char* tagp, JREC* rec, TypeGram gram); -void setcrec(u_char* tagp); +int setj_atrb(unsigned char* p); +int setj_ofs(unsigned char* p); +int setj_knj(unsigned char* p); +int setj_norm1(unsigned char* p); +int setj_norm2(unsigned char* p); +int setj_norm3(unsigned char* p); +void setjrec(unsigned char* tagp, int mode); +void setnumrec(unsigned char* tagp, JREC* rec, TypeGram gram); +void setcrec(unsigned char* tagp); /* setkouho.c */ void setkouho(CLREC* clrec, TypeDicOfs offs, int mode); void ph_setkouho(CLREC* clrec, TypeDicOfs offs, STDYIN* sptr); -int hiraknj_atrb(u_char*, int*); -int hiraknj_ofs (u_char*, int*); -int hiraknj_knj (u_char*, int*); -int hiraknj_hask(u_char*, int*); -int hiraknj_kask(u_char*, int*); -int hiraknj_norm(u_char*, int*); -int hiraknj_hira(u_char*, int*); +int hiraknj_atrb(unsigned char*, int*); +int hiraknj_ofs (unsigned char*, int*); +int hiraknj_knj (unsigned char*, int*); +int hiraknj_hask(unsigned char*, int*); +int hiraknj_kask(unsigned char*, int*); +int hiraknj_norm(unsigned char*, int*); +int hiraknj_hira(unsigned char*, int*); /* setubi.c */ unsigned char *getstb(TypeGram hinsi); void setubi(JREC *rec, unsigned char *stbtbl); /* skipkstr.c */ -u_char* skipkstr(u_char* ptr); +unsigned char* skipkstr(unsigned char* ptr); /* srchdict.c */ -int yomicmp(u_char *ptr1, u_char *ptr2, u_char *saml); -u_char *srchdict(u_char *tagp); +int yomicmp(unsigned char *ptr1, unsigned char *ptr2, unsigned char *saml); +unsigned char *srchdict(unsigned char *tagp); /* srchidx.c */ TypeDicSeg srchidx(TypeDicSeg low, int len); /* srchnum.c */ void srchnum(void); -void setwdnum(u_char *p, int len, u_short *wd); -int setucnum(u_char *p, int len, u_char *ud); +void setwdnum(unsigned char *p, int len, unsigned short *wd); +int setucnum(unsigned char *p, int len, unsigned char *ud); /* study.c */ int study(STDYOUT *stdy); diff --git a/kigou.c b/kigou.c index dba25c6..085f964 100644 --- a/kigou.c +++ b/kigou.c @@ -45,7 +45,7 @@ static int lastcode = BEGIN_CODE; -static u_short row, col; +static unsigned short row, col; void input_kigou(); @@ -54,7 +54,7 @@ kigou () extern int keyvalue; int increse, code, basecode; int inc, ki, low; - u_short num, CheckCcode(), strtocode(); + unsigned short num, CheckCcode(), strtocode(); int rval; increse = INCRESE; @@ -221,7 +221,7 @@ int bcode, code, increse; extern wchar16_t Mguide[]; wchar16_t wtmp[20]; char tmp[20]; - u_short prcode; + unsigned short prcode; TopGuide (); printR (Mguide); @@ -251,7 +251,7 @@ pkigou (code) int code; { wchar16_t tmp[3]; - u_short ccode; + unsigned short ccode; if (jis2euc(code) == 0) { ccode = BEGIN_CODE; @@ -274,7 +274,7 @@ input_kigou (basecode, code, increse) int basecode, code, increse; { wchar16_t s[2]; - u_short ccode, svlen; + unsigned short ccode, svlen; Conversion *cv; if (jis2euc(code) == 0) { diff --git a/knjcvt.c b/knjcvt.c index 1cefe96..ebd50da 100644 --- a/knjcvt.c +++ b/knjcvt.c @@ -47,7 +47,7 @@ typedef struct div_list { int len; - u_char code[3]; + unsigned char code[3]; struct div_list *child; } DivList; @@ -88,7 +88,7 @@ make_divrec(void) static int -make_divlist(DivList* parent, u_char *knj, int len) +make_divlist(DivList* parent, unsigned char *knj, int len) { int i, j; int num; @@ -195,11 +195,11 @@ make_divlist(DivList* parent, u_char *knj, int len) -u_char* -knjofscvt(u_char* ptr, int len, int* ret) +unsigned char* +knjofscvt(unsigned char* ptr, int len, int* ret) { int i; - u_char *p, *q; + unsigned char *p, *q; DivList parent, *dl; @@ -211,7 +211,7 @@ knjofscvt(u_char* ptr, int len, int* ret) *ret = i; - p = (u_char *)Malloc(i); + p = (unsigned char *)Malloc(i); if (!p) { fprintf(stderr, "\245\341\245\342\245\352\244\254\311\324\302\255\244\267\244\336\244\267\244\277"); exit(1); @@ -234,11 +234,11 @@ knjofscvt(u_char* ptr, int len, int* ret) -u_char* -knjcvt(u_char* ptr, int len, int* ret) +unsigned char* +knjcvt(unsigned char* ptr, int len, int* ret) { int i; - u_char *p, *q; + unsigned char *p, *q; DivList parent, *dl; @@ -247,7 +247,7 @@ knjcvt(u_char* ptr, int len, int* ret) *ret = i; - p = (u_char *)Malloc(i); + p = (unsigned char *)Malloc(i); if (!p) { fprintf(stderr, "\245\341\245\342\245\352\244\254\311\324\302\255\244\267\244\336\244\267\244\277"); exit(1); diff --git a/level1.c b/level1.c index 5ac2427..cae4cca 100644 --- a/level1.c +++ b/level1.c @@ -55,8 +55,8 @@ int sj3_port_number = PortNumber; #define BUFFER_SIZE BUFSIZ static char *af_unix_str = "unix"; -static u_char putbuf[BUFFER_SIZE]; -static u_char getbuf[BUFFER_SIZE]; +static unsigned char putbuf[BUFFER_SIZE]; +static unsigned char getbuf[BUFFER_SIZE]; static int putpos = 0; static int getlen = 0; static int getpos = 0; @@ -81,7 +81,7 @@ static int put_flush(void) { int i, j; - u_char *p; + unsigned char *p; for (i = putpos, p = putbuf; i > 0; i -= j, p += j) { if ((j = write(server_fd, p, i)) <= 0) { @@ -129,10 +129,10 @@ put_cmd(int cmd) #define put_string put_ndata -static u_char * +static unsigned char * put_ndata(void *p, int n) { - u_char *pp = (u_char *)p; + unsigned char *pp = (unsigned char *)p; while (n-- > 0) put_byte(pp ? *pp++ : 0); @@ -141,28 +141,28 @@ put_ndata(void *p, int n) static int put_over(int buflen, int n, - u_char *(*func1)(), void *str1, int len1, - u_char *(*func2)(), void *str2, int len2, - u_char *(*func3)(), void *str3, int len3, - u_char *(*func4)(), void *str4, int len4) + 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) { #define ARGNUM 4 - u_char *(*func[ARGNUM])(); - u_char *data[ARGNUM]; + unsigned char *(*func[ARGNUM])(); + unsigned char *data[ARGNUM]; int len[ARGNUM]; int i; func[0] = func1; - data[0] = (u_char *)str1; + data[0] = (unsigned char *)str1; len[0] = len1; func[1] = func2; - data[1] = (u_char *)str2; + data[1] = (unsigned char *)str2; len[1] = len2; func[2] = func3; - data[2] = (u_char *)str3; + data[2] = (unsigned char *)str3; len[2] = len3; func[3] = func4; - data[3] = (u_char *)str4; + data[3] = (unsigned char *)str4; len[3] = len4; for (i = 0; i < n; i++) { @@ -204,7 +204,7 @@ get_buffer(void) return getlen; } -static u_char +static unsigned char get_byte(void) { if ((getpos >= getlen) && (get_buffer() == ERROR)) { @@ -236,8 +236,8 @@ get_int(void) return ((i0 << (8*3)) | (i1 << (8*2)) | (i2 << (8*1)) | get_byte()); } -static u_char * -get_string(u_char *p) +static unsigned char * +get_string(unsigned char *p) { int c; @@ -249,7 +249,7 @@ get_string(u_char *p) } static int -get_nstring(u_char *p, int n) +get_nstring(unsigned char *p, int n) { int c; @@ -266,10 +266,10 @@ get_nstring(u_char *p, int n) return n; } -static u_char * +static unsigned char * get_ndata(void *p, int n) { - u_char *pp = (u_char *)p; + unsigned char *pp = (unsigned char *)p; while (n-- > 0) *pp++ = get_byte(); return pp; @@ -625,13 +625,13 @@ sj3_unlock_server(SJ3_CLIENT_ENV *client) int sj3_ikkatu_henkan(SJ3_CLIENT_ENV *client, - u_char *src, - u_char *dst, + unsigned char *src, + unsigned char *dst, int dstsiz, int mb_flag) { int c; - u_char *top; + unsigned char *top; int result; int len; int len1; @@ -702,9 +702,9 @@ error2: int sj3_bunsetu_henkan(SJ3_CLIENT_ENV *client, - u_char *yomi, + unsigned char *yomi, int len, - u_char *kanji, + unsigned char *kanji, int mb_flag) { int result; @@ -738,7 +738,7 @@ sj3_bunsetu_henkan(SJ3_CLIENT_ENV *client, int sj3_bunsetu_jikouho(SJ3_CLIENT_ENV *client, - u_char *kanji, + unsigned char *kanji, int mode, int mb_flag) { @@ -764,7 +764,7 @@ sj3_bunsetu_jikouho(SJ3_CLIENT_ENV *client, int sj3_bunsetu_maekouho(SJ3_CLIENT_ENV *client, - u_char *kanji, int mode, int mb_flag) + unsigned char *kanji, int mode, int mb_flag) { int result; @@ -788,7 +788,7 @@ sj3_bunsetu_maekouho(SJ3_CLIENT_ENV *client, int sj3_bunsetu_kouhosuu(SJ3_CLIENT_ENV *client, - u_char *yomi, + unsigned char *yomi, int len, int mb_flag) { @@ -822,7 +822,7 @@ sj3_bunsetu_kouhosuu(SJ3_CLIENT_ENV *client, int sj3_bunsetu_zenkouho(SJ3_CLIENT_ENV *client, - u_char *yomi, + unsigned char *yomi, int len, SJ3_DOUON *douon, int mb_flag) @@ -887,8 +887,8 @@ sj3_tango_gakusyuu(SJ3_CLIENT_ENV *client, SJ3_STUDYREC *stdy) int sj3_bunsetu_gakusyuu(SJ3_CLIENT_ENV *client, - u_char *yomi1, - u_char *yomi2, + unsigned char *yomi1, + unsigned char *yomi2, SJ3_STUDYREC *stdy, int mb_flag) { @@ -926,8 +926,8 @@ sj3_bunsetu_gakusyuu(SJ3_CLIENT_ENV *client, int sj3_tango_touroku(SJ3_CLIENT_ENV *client, long dicid, - u_char *yomi, - u_char *kanji, + unsigned char *yomi, + unsigned char *kanji, int code, int mb_flag) { @@ -966,8 +966,8 @@ sj3_tango_touroku(SJ3_CLIENT_ENV *client, int sj3_tango_sakujo(SJ3_CLIENT_ENV *client, long dicid, - u_char *yomi, - u_char *kanji, + unsigned char *yomi, + unsigned char *kanji, int code, int mb_flag) { @@ -1006,10 +1006,10 @@ sj3_tango_sakujo(SJ3_CLIENT_ENV *client, int sj3_tango_syutoku(SJ3_CLIENT_ENV *client, int dicid, - u_char *buf, + unsigned char *buf, int mb_flag) { - u_char *p; + unsigned char *p; client_init(client); @@ -1033,10 +1033,10 @@ sj3_tango_syutoku(SJ3_CLIENT_ENV *client, int sj3_tango_jikouho(SJ3_CLIENT_ENV *client, int dicid, - u_char *buf, + unsigned char *buf, int mb_flag) { - u_char *p; + unsigned char *p; client_init(client); @@ -1060,10 +1060,10 @@ sj3_tango_jikouho(SJ3_CLIENT_ENV *client, int sj3_tango_maekouho(SJ3_CLIENT_ENV *client, int dicid, - u_char *buf, + unsigned char *buf, int mb_flag) { - u_char *p; + unsigned char *p; client_init(client); diff --git a/libif.c b/libif.c index 4e94090..7b93391 100644 --- a/libif.c +++ b/libif.c @@ -71,8 +71,8 @@ int kanjilen; int retv; SJ3_BUNSETU sbun[BUFFLENGTH]; int i, sentou, saigo; - u_char yomi[BUFFLENGTH * 3]; - u_char kanji[BUFFLENGTH * 6]; + unsigned char yomi[BUFFLENGTH * 3]; + unsigned char kanji[BUFFLENGTH * 6]; (void) wcstombs((char *) yomi, yomiout, BUFFLENGTH*3); if (current_locale == LC_CTYPE_SHIFTJIS) { @@ -162,7 +162,7 @@ int reconv; { int i, ret; SJ3_DOUON d_sjis[DOUON_N]; - u_char yomi[BUFFLENGTH * 3]; + unsigned char yomi[BUFFLENGTH * 3]; (void) wcstombs((char *) yomi, s, BUFFLENGTH*3); @@ -202,8 +202,8 @@ SJ2_clstudy (yomi1, yomi2, dcid) wchar16_t *yomi1, *yomi2; struct studyrec *dcid; { - u_char y1[BUFFLENGTH*2]; - u_char y2[BUFFLENGTH*2]; + unsigned char y1[BUFFLENGTH*2]; + unsigned char y2[BUFFLENGTH*2]; (void) wcstombs((char *) y1, yomi1, BUFFLENGTH*2); (void) wcstombs((char *) y2, yomi2, BUFFLENGTH*2); @@ -219,8 +219,8 @@ SJ2_toroku (yomi, kanji, hinshi) wchar16_t *yomi, *kanji; int hinshi; { - u_char y[(YOMILEN+1)*3]; - u_char k[(KLEN+1)*3]; + unsigned char y[(YOMILEN+1)*3]; + unsigned char k[(KLEN+1)*3]; int ret; (void)wcstombs((char *) y, yomi, (YOMILEN+1)*3); @@ -237,8 +237,8 @@ SJ2_syoukyo (yomi, kanji, hinshi) wchar16_t *yomi, *kanji; int hinshi; { - u_char y[(YOMILEN+1)*3]; - u_char k[(KLEN+1)*3]; + unsigned char y[(YOMILEN+1)*3]; + unsigned char k[(KLEN+1)*3]; int ret; (void)wcstombs((char *) y, yomi, (YOMILEN+1)*3); diff --git a/makedict.c b/makedict.c index 88dfdd6..e579ca5 100644 --- a/makedict.c +++ b/makedict.c @@ -61,7 +61,7 @@ main(int argc, char** argv) while (readline()) setline(makelist); flush_douon(); - makehead((u_char *)argv[2]); + makehead((unsigned char *)argv[2]); return 0; } diff --git a/makelist.c b/makelist.c index 9601da4..2337eb7 100644 --- a/makelist.c +++ b/makelist.c @@ -131,15 +131,15 @@ clear_list(void) -static u_char* +static unsigned char* makekanji(int *yomi, int* kanji, int* atr, int* len) { int kana[MaxYomiLength + 1]; - u_char ktmp[MaxKanjiLength * 3 + MaxAtrNumber * 2 + 1]; + unsigned char ktmp[MaxKanjiLength * 3 + MaxAtrNumber * 2 + 1]; int i; int pos = 0; int *p; - u_char *q; + unsigned char *q; for (p = yomi, i = 0 ; *p ; ) @@ -206,7 +206,7 @@ makekanji(int *yomi, int* kanji, int* atr, int* len) *len = pos; - q = (u_char *)Malloc(pos); + q = (unsigned char *)Malloc(pos); if (!q) { fprintf(stderr, "\245\341\245\342\245\352\244\254\311\324\302\255\244\267\244\336\244\267\244\277"); exit(1); @@ -218,14 +218,14 @@ makekanji(int *yomi, int* kanji, int* atr, int* len) -static u_char* +static unsigned char* makeyomi(int* yomi) { - u_char tmp[MaxYomiLength + 1]; + unsigned char tmp[MaxYomiLength + 1]; int i; int j; int *y = yomi; - u_char *p; + unsigned char *p; for (i = 0 ; *y ; ) { @@ -240,7 +240,7 @@ makeyomi(int* yomi) tmp[i++] = 0; - p = (u_char *)Malloc(i); + p = (unsigned char *)Malloc(i); if (!p) { fprintf(stderr, "\245\341\245\342\245\352\244\254\311\324\302\255\244\267\244\336\244\267\244\277"); exit(1); @@ -253,7 +253,7 @@ makeyomi(int* yomi) static KanjiRec* -make_krec(u_char* kcode, int klen) +make_krec(unsigned char* kcode, int klen) { KanjiRec *krec; @@ -299,7 +299,7 @@ make_hrec(int hinsi) static DouonRec* -make_drec(u_char* ycode) +make_drec(unsigned char* ycode) { DouonRec *drec; @@ -326,8 +326,8 @@ diff_ylen(DouonRec *drec) { DouonRec *dptr; DouonRec *dprev; - u_char *p1; - u_char *p2; + unsigned char *p1; + unsigned char *p2; int ylen = 0; @@ -370,8 +370,8 @@ douon_knj(DouonRec* drec) { int i; int len = 0; - u_char *p; - u_char *knjofscvt(); + unsigned char *p; + unsigned char *knjofscvt(); HinsiRec *hrec; KanjiRec *krec; @@ -564,8 +564,8 @@ flush_douon(void) void makelist(int* yomi, int* kanji, int hinsi, int* atr) { - u_char *ycode; - u_char *kcode; + unsigned char *ycode; + unsigned char *kcode; int klen; HinsiRec *hrec; KanjiRec *krec, *kprev; diff --git a/makeseg.c b/makeseg.c index 2d53c0b..5709f80 100644 --- a/makeseg.c +++ b/makeseg.c @@ -52,16 +52,16 @@ extern DouonRec *douon_ptr; extern FILE *outfp; extern int douon_num; -static u_char segindex[MainSegmentLength]; +static unsigned char segindex[MainSegmentLength]; static int idxpos = 0; static int idxnum = 0; -static u_char* -set_ofsask(u_char* src, u_char* dst) +static unsigned char* +set_ofsask(unsigned char* src, unsigned char* dst) { int len; - u_char *ptr; + unsigned char *ptr; OffsetRec *ofsrec; @@ -109,9 +109,9 @@ set_ofsask(u_char* src, u_char* dst) size_t -make_knjstr(u_char* src, int len, u_char* dst) +make_knjstr(unsigned char* src, int len, unsigned char* dst) { - u_char *keep = dst; + unsigned char *keep = dst; while (len > 0) { switch (*src & KanjiModeMask) { @@ -160,8 +160,8 @@ static int make_knjask(void) { int i; - u_char *p; - u_char buf[128]; + unsigned char *p; + unsigned char buf[128]; int len; int tlen = 0; @@ -175,7 +175,7 @@ make_knjask(void) Free(askknj[i] -> kptr); - p = (u_char *)Malloc(len); + p = (unsigned char *)Malloc(len); if (!p) { fprintf(stderr, "\245\341\245\342\245\352\244\254\302\255\244\352\244\336\244\273\244\363\n"); exit(1); @@ -197,15 +197,15 @@ make_knjask(void) void makeseg(void) { - u_char buf[MainSegmentLength]; + unsigned char buf[MainSegmentLength]; DouonRec *drec; HinsiRec *hrec; KanjiRec *krec; int i, j, k; int slen; - u_char *dst; - u_char *sdst; - u_char *p, *q; + unsigned char *dst; + unsigned char *sdst; + unsigned char *p, *q; #ifndef HEHE #define datset(i) { if (dst >= buf+sizeof(buf)) goto err; *dst++ = i; } @@ -375,7 +375,7 @@ err: } static void -put4byte(u_char* p, size_t n) +put4byte(unsigned char* p, size_t n) { p += 3; *p-- = n; n >>= 8; @@ -385,11 +385,11 @@ put4byte(u_char* p, size_t n) } void -makehead(u_char* dict_name) +makehead(unsigned char* dict_name) { - u_char header[HeaderLength + CommentLength]; + unsigned char header[HeaderLength + CommentLength]; long i; - u_char *p; + unsigned char *p; time_t curtime; #define IndexPos (HeaderLength + CommentLength) diff --git a/mk2claus.c b/mk2claus.c index 783e4d3..0a8ba6f 100644 --- a/mk2claus.c +++ b/mk2claus.c @@ -67,7 +67,7 @@ CLREC *clrec; void mk2claus() { - u_char *keepptr; + unsigned char *keepptr; int keeplen; CLREC *clrec; int len; @@ -117,9 +117,9 @@ void mk2claus() } if (Termtbl[clrec -> right] & T_SHUUJO) - clrec -> cl2len = (u_char)len; + clrec -> cl2len = (unsigned char)len; else - clrec -> cl2len = (u_char)save2ln; + clrec -> cl2len = (unsigned char)save2ln; if (selcl -> cl2len > clrec -> cl2len) continue; diff --git a/mkbunset.c b/mkbunset.c index 9dfa7f3..a5f35ba 100644 --- a/mkbunset.c +++ b/mkbunset.c @@ -50,11 +50,11 @@ mkbunsetu(void) { JREC *jrec; TypeGram hinsi; - u_char *cnj; + unsigned char *cnj; CREC crec[4]; int count; TypeCnct right; - u_char *next; + unsigned char *next; int i; fzkcount = 0; @@ -132,8 +132,8 @@ argclrec(int len) if (rec -> jnode) (rec -> jnode)--; } - memset((u_char*)rec, 0, sizeof(*rec)); - rec -> cllen = rec -> cl2len = (u_char)len; + memset((unsigned char*)rec, 0, sizeof(*rec)); + rec -> cllen = rec -> cl2len = (unsigned char)len; if (!maxclptr) { maxclptr = rec; diff --git a/mkjiritu.c b/mkjiritu.c index d7bb3d3..ea3dd5f 100644 --- a/mkjiritu.c +++ b/mkjiritu.c @@ -49,10 +49,10 @@ static void dic_cl(void); void mkjiritu(int mode) { - u_char chkind1; - u_char chkind2; + unsigned char chkind1; + unsigned char chkind2; JREC *jrec; - u_char *stb; + unsigned char *stb; headcode = headlen = 0; @@ -95,7 +95,7 @@ mkjiritu(int mode) static void dic_mu(int mode) { - u_char *tagp; + unsigned char *tagp; DICTL *dp; for (dp = dictlist ; dp ; dp = dp -> next) { @@ -136,10 +136,10 @@ argjrec(int len, JREC* rec) } if (rec) - memcpy((u_char*)rec, (u_char*)jrec, sizeof(JREC)); + memcpy((unsigned char*)rec, (unsigned char*)jrec, sizeof(JREC)); else - memset((u_char*)jrec, 0, sizeof(*jrec)); - jrec -> jlen = (u_char)len; + memset((unsigned char*)jrec, 0, sizeof(*jrec)); + jrec -> jlen = (unsigned char)len; if (!maxjptr) { maxjptr = jrec; @@ -169,17 +169,17 @@ argjrec(int len, JREC* rec) static void dic_cl(void) { - u_char *p; - u_short pos; + unsigned char *p; + unsigned short pos; int len; int cmp; if (!StudyExist()) return; - if ((pos = ClStudyIdx[(short) *cnvstart / ClStudyStep]) != (u_short)-1) { + if ((pos = ClStudyIdx[(short) *cnvstart / ClStudyStep]) != (unsigned short)-1) { for (p = ClStudyDict + pos ; !iseocl(p) ; p = ClNextTag(p)) { - cmp = strncmp(cnvstart, (u_char*)ClYomiPos(p), + cmp = strncmp(cnvstart, (unsigned char*)ClYomiPos(p), len = ClYomiLen(p)); if (cmp == MATCH) { diff --git a/mkkouho.c b/mkkouho.c index b5670ef..cec2e46 100644 --- a/mkkouho.c +++ b/mkkouho.c @@ -46,8 +46,8 @@ static void getkhtbl(CLREC* clrec); static void cl_kanji(JREC* jrec, CLREC* clrec); -static u_char* makekan(u_char* s, u_char* d, int flg); -static int diffknj(JREC* jrec, u_char* ptr, int num); +static unsigned char* makekan(unsigned char* s, unsigned char* d, int flg); +static int diffknj(JREC* jrec, unsigned char* ptr, int num); static void cl_numcmn(JREC* jrec, CLREC* clrec); @@ -114,7 +114,7 @@ getkhtbl(CLREC* clrec) static void cl_kanji(JREC* jrec, CLREC* clrec) { - u_char *ptr; + unsigned char *ptr; int kcount = khcount; @@ -144,15 +144,15 @@ cl_kanji(JREC* jrec, CLREC* clrec) } -u_char* -makekan_none(u_char* s, u_char* d, int flg) +unsigned char* +makekan_none(unsigned char* s, unsigned char* d, int flg) { return d; } -u_char* -makekan_1byte(u_char* s, u_char* d, int flg) +unsigned char* +makekan_1byte(unsigned char* s, unsigned char* d, int flg) { if ((*s & KanjiModeMask) == ZenHiraAssyuku) *d++ = 0x10 | (*s & KnjAssyukuMask); @@ -164,16 +164,16 @@ makekan_1byte(u_char* s, u_char* d, int flg) } -u_char* -makekan_knj(u_char* s, u_char* d, int flg) +unsigned char* +makekan_knj(unsigned char* s, unsigned char* d, int flg) { return makekan(askknj[*s & KnjAssyukuMask], d, flg); } -u_char* -makekan_ofs(u_char* s, u_char* d, int flg) +unsigned char* +makekan_ofs(unsigned char* s, unsigned char* d, int flg) { return makekan(dicbuf + ((*s & KanjiCodeMask) << 8) + *(s + 1), @@ -181,10 +181,10 @@ makekan_ofs(u_char* s, u_char* d, int flg) } -u_char* -makekan_norm(u_char* s, u_char* d, int flg) +unsigned char* +makekan_norm(unsigned char* s, unsigned char* d, int flg) { - u_char c; + unsigned char c; if (*s != 0) { c = s[1]; @@ -201,10 +201,10 @@ makekan_norm(u_char* s, u_char* d, int flg) } -u_char* -makekan_ascii(u_char* s, u_char* d, int flg) +unsigned char* +makekan_ascii(unsigned char* s, unsigned char* d, int flg) { - u_char c; + unsigned char c; c = s[1]; if (c & 0x80) @@ -217,8 +217,8 @@ makekan_ascii(u_char* s, u_char* d, int flg) } -static u_char* -makekan(u_char* s, u_char* d, int flg) +static unsigned char* +makekan(unsigned char* s, unsigned char* d, int flg) { int csize; @@ -283,7 +283,7 @@ makekan(u_char* s, u_char* d, int flg) #define PEND 2 #define QEND 1 static int -sameknj(u_char* p, int plen, u_char* q, int qlen) +sameknj(unsigned char* p, int plen, unsigned char* q, int qlen) { int i; int j; @@ -343,13 +343,13 @@ sameknj(u_char* p, int plen, u_char* q, int qlen) static int -diffknj(JREC* jrec, u_char* ptr, int num) +diffknj(JREC* jrec, unsigned char* ptr, int num) { KHREC *kptr; JREC *jptr; int i; - u_char kbuf1[MaxWdKanjiLen]; - u_char kbuf2[MaxWdKanjiLen]; + unsigned char kbuf1[MaxWdKanjiLen]; + unsigned char kbuf2[MaxWdKanjiLen]; if (jrec -> hinsi == TANKANJI) return TRUE; @@ -382,9 +382,9 @@ diffknj(JREC* jrec, u_char* ptr, int num) static int -chrck_numtbl(u_short flg, u_short cond) +chrck_numtbl(unsigned short flg, unsigned short cond) { - u_short must; + unsigned short must; if ((cond = SelNumCond(cond)) != 0) { if ((must = (cond & SelNumMust)) != 0) { @@ -401,9 +401,9 @@ chrck_numtbl(u_short flg, u_short cond) int sel_sjmode(JREC* jrec) { - u_short i; - u_short *p; - u_short *q; + unsigned short i; + unsigned short *p; + unsigned short *q; switch (jrec -> class) { case C_N_ARABIA: @@ -438,10 +438,10 @@ sel_sjmode(JREC* jrec) static void cl_numcmn(JREC* jrec, CLREC* clrec) { - u_char *p; + unsigned char *p; int i; - u_short j; - u_short *tbl; + unsigned short j; + unsigned short *tbl; p = cnvstart; diff --git a/mknumber.c b/mknumber.c index ae333c5..0125cbf 100644 --- a/mknumber.c +++ b/mknumber.c @@ -44,11 +44,11 @@ static int -word2char(u_short wd, u_char* tbl, int keta, int flg) +word2char(unsigned short wd, unsigned char* tbl, int keta, int flg) { int mask; int num; - u_char* src; + unsigned char* src; for (mask = 0x1000 ; mask ; mask >>= 4) { @@ -83,12 +83,12 @@ word2char(u_short wd, u_char* tbl, int keta, int flg) static void -words2num(u_short* wd, u_char* tbl, int flgc) +words2num(unsigned short* wd, unsigned char* tbl, int flgc) { int i; int keta; int flg; - u_char *kp = kanjitmp; + unsigned char *kp = kanjitmp; if (flgc) { keta = NumKetaLength - 1; @@ -114,9 +114,9 @@ words2num(u_short* wd, u_char* tbl, int flgc) void -num_type00(u_char* s1, u_char* s2, JREC* jrec) +num_type00(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -127,9 +127,9 @@ num_type00(u_char* s1, u_char* s2, JREC* jrec) void -num_type01(u_char* s1, u_char* s2, JREC* jrec) +num_type01(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -140,9 +140,9 @@ num_type01(u_char* s1, u_char* s2, JREC* jrec) void -num_type02(u_char* s1, u_char* s2, JREC* jrec) +num_type02(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -153,9 +153,9 @@ num_type02(u_char* s1, u_char* s2, JREC* jrec) void -num_type03(u_char* s1, u_char* s2, JREC* jrec) +num_type03(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -166,9 +166,9 @@ num_type03(u_char* s1, u_char* s2, JREC* jrec) void -num_type04(u_char* s1, u_char* s2, JREC* jrec) +num_type04(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -179,9 +179,9 @@ num_type04(u_char* s1, u_char* s2, JREC* jrec) void -num_type05(u_char* s1, u_char* s2, JREC* jrec) +num_type05(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -192,9 +192,9 @@ num_type05(u_char* s1, u_char* s2, JREC* jrec) void -num_type06(u_char* s1, u_char* s2, JREC* jrec) +num_type06(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -205,9 +205,9 @@ num_type06(u_char* s1, u_char* s2, JREC* jrec) void -num_type07(u_char* s1, u_char* s2, JREC* jrec) +num_type07(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -218,17 +218,17 @@ num_type07(u_char* s1, u_char* s2, JREC* jrec) static void -kan_num(u_short* wd, u_char* tbl1, u_char* tbl2) +kan_num(unsigned short* wd, unsigned char* tbl1, unsigned char* tbl2) { int ii; - u_short tmp; + unsigned short tmp; int mask; int num; int flg; - u_char* kurai1; - u_char* kurai2; - u_char* src; - u_char* keep = kanjitmp; + unsigned char* kurai1; + unsigned char* kurai2; + unsigned char* src; + unsigned char* keep = kanjitmp; kurai2 = Num6tbl - 2; @@ -288,9 +288,9 @@ kan_num(u_short* wd, u_char* tbl1, u_char* tbl2) void -num_type08(u_char* s1, u_char* s2, JREC* jrec) +num_type08(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -301,9 +301,9 @@ num_type08(u_char* s1, u_char* s2, JREC* jrec) void -num_type09(u_char* s1, u_char* s2, JREC* jrec) +num_type09(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_short num[NumWordBuf]; + unsigned short num[NumWordBuf]; setwdnum(s1, (int)jrec -> numlen, num); @@ -314,7 +314,7 @@ num_type09(u_char* s1, u_char* s2, JREC* jrec) void -num_type10(u_char* s1, u_char* s2, JREC* jrec) +num_type10(unsigned char* s1, unsigned char* s2, JREC* jrec) { int i; @@ -333,7 +333,7 @@ num_type10(u_char* s1, u_char* s2, JREC* jrec) void -num_type11(u_char* s1, u_char* s2, JREC* jrec) +num_type11(unsigned char* s1, unsigned char* s2, JREC* jrec) { int i; int j; @@ -363,7 +363,7 @@ num_type11(u_char* s1, u_char* s2, JREC* jrec) void -num_type12(u_char* s1, u_char* s2, JREC* jrec) +num_type12(unsigned char* s1, unsigned char* s2, JREC* jrec) { int i; int j; @@ -381,11 +381,11 @@ num_type12(u_char* s1, u_char* s2, JREC* jrec) static void -num_kurai(u_char* p, int len, u_char* tbl) +num_kurai(unsigned char* p, int len, unsigned char* tbl) { int i; int j; - u_char tmp; + unsigned char tmp; for (i = 0 ; i < len ; i++) { tmp = *p++; @@ -405,9 +405,9 @@ num_kurai(u_char* p, int len, u_char* tbl) void -num_type13(u_char* s1, u_char* s2, JREC* jrec) +num_type13(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_char num[NumKetaLength]; + unsigned char num[NumKetaLength]; int len; @@ -419,9 +419,9 @@ num_type13(u_char* s1, u_char* s2, JREC* jrec) void -num_type14(u_char* s1, u_char* s2, JREC* jrec) +num_type14(unsigned char* s1, unsigned char* s2, JREC* jrec) { - u_char num[NumKetaLength]; + unsigned char num[NumKetaLength]; int len; diff --git a/mvmemd.c b/mvmemd.c index 801ef56..2b8c1aa 100644 --- a/mvmemd.c +++ b/mvmemd.c @@ -39,8 +39,8 @@ #include "sj_typedef.h" void mvmemd(src, dest, len) -u_char *src; -u_char *dest; +unsigned char *src; +unsigned char *dest; int len; { while (len-- > 0) *(--dest) = *(--src); diff --git a/mvmemi.c b/mvmemi.c index 5defd08..b956b01 100644 --- a/mvmemi.c +++ b/mvmemi.c @@ -39,8 +39,8 @@ #include "sj_typedef.h" void mvmemi(src, dest, len) -u_char *src; -u_char *dest; +unsigned char *src; +unsigned char *dest; int len; { while (len-- > 0) *dest++ = *src++; diff --git a/offset.c b/offset.c index 16bbebc..a2100be 100644 --- a/offset.c +++ b/offset.c @@ -49,16 +49,16 @@ extern int ofsrec_num; static OffsetRec* -makeoffset(u_char* ptr, int len, int ofs) +makeoffset(unsigned char* ptr, int len, int ofs) { OffsetRec *orec; - u_char *p; + unsigned char *p; orec = (OffsetRec *)Malloc(sizeof(OffsetRec)); - p = (u_char *)Malloc(len); + p = (unsigned char *)Malloc(len); memcpy(p, ptr, len); @@ -74,7 +74,7 @@ makeoffset(u_char* ptr, int len, int ofs) void -set_ofsrec(u_char* ptr, int len, int ofs) +set_ofsrec(unsigned char* ptr, int len, int ofs) { OffsetRec *orec; int low, high, mid; @@ -121,7 +121,7 @@ set_ofsrec(u_char* ptr, int len, int ofs) int -isknjexist(u_char* knj, int len) +isknjexist(unsigned char* knj, int len) { int low, high, mid; int i; @@ -162,7 +162,7 @@ clear_ofsrec(void) OffsetRec* -real_ofsrec(u_char* ptr) +real_ofsrec(unsigned char* ptr) { int ofs; int i; diff --git a/peepdic.c b/peepdic.c index e3dcdeb..be1a29e 100644 --- a/peepdic.c +++ b/peepdic.c @@ -41,24 +41,24 @@ #include "kanakan.h" -u_char *skiphblk(); +unsigned char *skiphblk(); static void add_yomi (void); -static void cd2sjh_chr (u_char ch, u_char *dst); +static void cd2sjh_chr (unsigned char ch, unsigned char *dst); static int next_douon (void); static int next_hinsi (void); static int next_kanji (void); static int prev_douon (void); static int prev_hinsi (void); static int prev_kanji (void); -static void set_buf (u_char *buf); +static void set_buf (unsigned char *buf); static void set_idxyomi (void); static void set_kanji (void); int -getusr (u_char *buf) +getusr (unsigned char *buf) { int nlen; @@ -90,7 +90,7 @@ getusr (u_char *buf) int -nextusr (u_char *buf) +nextusr (unsigned char *buf) { (*curdict->getdic)(curdict, peepidx); get_askknj(); @@ -107,7 +107,7 @@ nextusr (u_char *buf) int -prevusr (u_char *buf) +prevusr (unsigned char *buf) { (*curdict->getdic)(curdict, peepidx); get_askknj(); @@ -136,9 +136,9 @@ set_kanji (void) static void -set_buf (u_char *buf) +set_buf (unsigned char *buf) { - u_char *p; + unsigned char *p; int i, csize; for (p = peepyomi ; *p ; ) *buf++ = *p++; @@ -159,8 +159,8 @@ set_buf (u_char *buf) static int prev_kanji (void) { - u_char *p1; - u_char *p2; + unsigned char *p1; + unsigned char *p2; p1 = peephptr + 1; if (peepkptr <= p1) return prev_hinsi(); @@ -179,8 +179,8 @@ prev_kanji (void) static int prev_hinsi (void) { - u_char *p1; - u_char *p2; + unsigned char *p1; + unsigned char *p2; int nlen; nlen = getnlen(peepdptr); @@ -210,8 +210,8 @@ prev_hinsi (void) static int prev_douon (void) { - u_char *p1; - u_char *p2; + unsigned char *p1; + unsigned char *p2; int nlen; if (peepdptr <= segtop()) { @@ -266,7 +266,7 @@ prev_douon (void) static int next_kanji (void) { - u_char *p1; + unsigned char *p1; p1 = skipkstr(peepkptr); if (*p1 == HinsiBlkTerm) return next_hinsi(); @@ -279,7 +279,7 @@ next_kanji (void) static int next_hinsi (void) { - u_char *p1; + unsigned char *p1; p1 = skiphblk(peephptr); if (p1 >= getntag(peepdptr)) return next_douon(); @@ -294,7 +294,7 @@ next_hinsi (void) static int next_douon (void) { - u_char *p1; + unsigned char *p1; int nlen; p1 = getntag(peepdptr); @@ -331,7 +331,7 @@ next_douon (void) static void set_idxyomi (void) { - u_char *p1, *p2; + unsigned char *p1, *p2; if ((p2 = get_idxptr(peepidx)) != NULL) { p1 = peepyomi; @@ -349,7 +349,7 @@ static void add_yomi (void) { int nlen; - u_char *p1, *p2; + unsigned char *p1, *p2; nlen = getnlen(peepdptr); p1 = peepyomi + getplen(peepdptr) * 2; @@ -366,7 +366,7 @@ add_yomi (void) static void -cd2sjh_chr (u_char ch, u_char *dst) +cd2sjh_chr (unsigned char ch, unsigned char *dst) { if (ch == _TYOUON) { *dst++ = 0xa1; diff --git a/ph2knj.c b/ph2knj.c index a09d6bf..244da88 100644 --- a/ph2knj.c +++ b/ph2knj.c @@ -52,10 +52,10 @@ JREC *free_jlst(); int ph2knj -(u_char *zyomi, u_char *kanji, int knjlen) +(unsigned char *zyomi, unsigned char *kanji, int knjlen) { - u_char *ptr; - u_char *dst; + unsigned char *ptr; + unsigned char *dst; int i; for (ptr = zyomi, dst = hyomi, i = 0 ; *ptr ; ) { diff --git a/ph_khtbl.c b/ph_khtbl.c index e537455..c549c16 100644 --- a/ph_khtbl.c +++ b/ph_khtbl.c @@ -46,7 +46,7 @@ ph_setsty (CLREC *clrec) { JREC *jrec; TypeDicOfs offset; - u_char *ptr; + unsigned char *ptr; STDYIN *sptr; if (!seldict((jrec = clrec -> jnode) -> dicid)) { diff --git a/prtytbl.c b/prtytbl.c index b8a514c..9572afb 100644 --- a/prtytbl.c +++ b/prtytbl.c @@ -38,7 +38,7 @@ #include "sj_rename.h" #include "sj_typedef.h" -u_char taipri[7][45] = { +unsigned char taipri[7][45] = { { 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 0, 0, @@ -78,7 +78,7 @@ u_char taipri[7][45] = { -u_char sttpri[5][31] = { +unsigned char sttpri[5][31] = { { 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 4, 4, 4, 4, 4, 0, 0, diff --git a/rk.h b/rk.h index 0ea755d..2b570e8 100644 --- a/rk.h +++ b/rk.h @@ -68,15 +68,15 @@ typedef struct rktable_w16 { wchar16_t *r_key; - u_short *k_yomi; + unsigned short *k_yomi; wchar16_t *r_str; struct rktable_w16 *next; } RkTablW16; typedef struct rktable { - u_char *r_key; - u_short *k_yomi; - u_char *r_str; + unsigned char *r_key; + unsigned short *k_yomi; + unsigned char *r_str; struct rktable *next; } RkTabl; diff --git a/rk_conv.c b/rk_conv.c index e2fb7df..799254c 100644 --- a/rk_conv.c +++ b/rk_conv.c @@ -108,7 +108,7 @@ wchar16_t rline[MAXLLEN]; wchar16_t lstr[MAXLLEN]; static wchar16_t intmp[MAXLLEN]; static wchar16_t outtmp[MAXLLEN]; -static u_char mtmp[MAXLLEN]; +static unsigned char mtmp[MAXLLEN]; static int rk_erase; static int rk_errin = 0; static int rk_cflag; @@ -121,7 +121,7 @@ static RkTablW16 *rkhp; static StrbufRec strpbuf, *strpp; static wchar16_t *shp; static YmibufRec ymipbuf, *ymipp; -static u_short *yhp; +static unsigned short *yhp; sj3_rkcode(code) @@ -146,8 +146,8 @@ rcode_sjis_init() { int i, rkeylen = 0, ryomilen = 0, rstrlen = 0; int klen, ylen, slen, tablnum = 0, tablsize; - u_char *mbstr, *mptr, mtmp[BUFSIZ], mtmp2[BUFSIZ]; - u_short *wcstr, *wcptr; + unsigned char *mbstr, *mptr, mtmp[BUFSIZ], mtmp2[BUFSIZ]; + unsigned short *wcstr, *wcptr; RkTabl *tabl, *tabl_next, *tabl_prev; RkTablW16 *tabl_w16; @@ -176,19 +176,19 @@ rcode_sjis_init() return 0; } memset(tabl, '\0', tablnum * tablsize); - mbstr = (u_char *) malloc(rkeylen + rstrlen); + mbstr = (unsigned char *) malloc(rkeylen + rstrlen); if (!mbstr) { free(tabl); return 0; } memset(mbstr, '\0', rkeylen + rstrlen); - wcptr = wcstr = (u_short *) malloc(ryomilen * sizeof(u_short)); + wcptr = wcstr = (unsigned short *) malloc(ryomilen * sizeof(unsigned short)); if (!wcstr) { free(tabl); free(mbstr); return 0; } - memset(wcptr, '\0', ryomilen * sizeof(u_short)); + memset(wcptr, '\0', ryomilen * sizeof(unsigned short)); rkeylen *= 2; rstrlen *= 2; @@ -307,8 +307,8 @@ rcode_euc_init() { int i, rkeylen = 0, ryomilen = 0, rstrlen = 0; int klen, ylen, slen, tablnum = 0, tablsize; - u_char *mbstr, *mptr, mtmp[BUFSIZ], mtmp2[BUFSIZ]; - u_short *wcstr, *wcptr; + unsigned char *mbstr, *mptr, mtmp[BUFSIZ], mtmp2[BUFSIZ]; + unsigned short *wcstr, *wcptr; RkTabl *tabl, *tabl_next, *tabl_prev; RkTablW16 *tabl_w16; @@ -337,19 +337,19 @@ rcode_euc_init() return 0; } memset(tabl, '\0', tablnum * tablsize); - mbstr = (u_char *) malloc(rkeylen + rstrlen); + mbstr = (unsigned char *) malloc(rkeylen + rstrlen); if (!mbstr) { free(tabl); return 0; } memset(mbstr, '\0', rkeylen + rstrlen); - wcptr = wcstr = (u_short *) malloc(ryomilen * sizeof(u_short)); + wcptr = wcstr = (unsigned short *) malloc(ryomilen * sizeof(unsigned short)); if (!wcstr) { free(tabl); free(mbstr); return 0; } - memset(wcptr, '\0', ryomilen * sizeof(u_short)); + memset(wcptr, '\0', ryomilen * sizeof(unsigned short)); rkeylen *= 2; rstrlen *= 2; @@ -494,7 +494,7 @@ int (*mbfunc)(); FILE *fp, *fopen(); char line[MAXLEN + 1]; wchar16_t rkey[MAXWLEN + 1], rstr[MAXWLEN + 1]; - u_short kstr[MAXWLEN + 1]; + unsigned short kstr[MAXWLEN + 1]; char *strcpy(), *getkey(), *rkgetyomi(); RkTablW16 *rktp, *mktable(); @@ -620,15 +620,15 @@ char *istr; wchar16_t *ostr; int *len; { - u_char c; - u_char *p; + unsigned char c; + unsigned char *p; int i; - u_short cc; + unsigned short cc; while (ENDMARK(*istr)) istr++; - p = (u_char *)istr; + p = (unsigned char *)istr; i = 0; while (!ENDMARK(*p)) { if (SKLINE(*p)) @@ -839,7 +839,7 @@ int len; int i; RkTablW16 *nrktp, *orktp; RkTablW16 *rktp; - u_int code; + unsigned int code; nrktp = NULL; orktp = NULL; @@ -906,13 +906,13 @@ sj3_rkreset() sj3_rkconvc(c, rkstr) wchar16_t c; -u_int *rkstr; +unsigned int *rkstr; { int i; wchar16_t *p, *q; int len; wchar16_t wstr[MAXLLEN]; - u_int kstr[MAXLLEN], *kp; + unsigned int kstr[MAXLLEN], *kp; len = wslen(rline); if (c == rk_erase) { @@ -979,7 +979,7 @@ u_int *rkstr; sj3_rkconv2(wstr, kstr, wlen) wchar16_t *wstr; -u_int *kstr; +unsigned int *kstr; int wlen; { @@ -988,7 +988,7 @@ int wlen; int rlen, len; wchar16_t svstr[MAXLLEN]; RkTablW16 *rktp; - u_short *kp; + unsigned short *kp; len = 0; if ((rktp = rktblp) == NULL) @@ -1079,8 +1079,8 @@ int wlen; int sj3_rkconv_w16(wchar16_t *, wchar16_t *); sj3_rkconv(romaji, kana) -u_char *romaji; -u_char *kana; +unsigned char *romaji; +unsigned char *kana; { wchar16_t *wstr; int len, mflag = 0, ret; @@ -1125,8 +1125,8 @@ u_char *kana; } sj3_rkconv_euc(romaji, kana) -u_char *romaji; -u_char *kana; +unsigned char *romaji; +unsigned char *kana; { wchar16_t *wstr; int len, mflag = 0, ret; @@ -1171,8 +1171,8 @@ u_char *kana; } sj3_rkconv_mb(romaji, kana) -u_char *romaji; -u_char *kana; +unsigned char *romaji; +unsigned char *kana; { if (current_locale == LC_CTYPE_EUC) return sj3_rkconv_euc(romaji, kana); @@ -1187,11 +1187,11 @@ wchar16_t *kstr; int i; wchar16_t *p, *q, *s; - u_short cc; + unsigned short cc; int rlen, len; wchar16_t svstr[MAXLLEN]; RkTablW16 *rktp; - u_short *kp; + unsigned short *kp; len = wslen(wstr); rktp = sj3_rcode_w16[WTOUPPER(*wstr)]; diff --git a/romaji.c b/romaji.c index a660458..048cb9c 100644 --- a/romaji.c +++ b/romaji.c @@ -48,12 +48,12 @@ wchar16_t c; { Conversion *cv; wchar16_t *p; - u_short c1, cc; - u_int c2; - u_short op; - u_char mode; + unsigned short c1, cc; + unsigned int c2; + unsigned short op; + unsigned char mode; int len, i; - u_int rkstr[MAXLLEN], *rkp; + unsigned int rkstr[MAXLLEN], *rkp; extern char erase_str[]; cv = GetConversion (); @@ -253,9 +253,9 @@ int kval; } addten(pos, c) -u_short pos, c; +unsigned short pos, c; { - u_short prefix; + unsigned short prefix; Conversion *cv; cv = GetConversion(); @@ -264,7 +264,7 @@ u_short pos, c; } getipos(pos) -u_short pos; +unsigned short pos; { Conversion *cv; @@ -273,10 +273,10 @@ u_short pos; } getipos2(omode, pos) -u_short *omode; -u_short pos; +unsigned short *omode; +unsigned short pos; { - u_short ipos; + unsigned short ipos; int i; ipos = 0; @@ -291,10 +291,10 @@ wchar16_t *s1, *s2; int len; { int i, rlen; - u_int *kp; + unsigned int *kp; int res, klen; wchar16_t roma[SHORTBUFFSIZE + 1]; - u_int kstr[MAXLLEN]; + unsigned int kstr[MAXLLEN]; sj3_rkebell(0); klen = 0; @@ -344,15 +344,15 @@ int len; sj_rkconv2(s1, s2, omode, len) wchar16_t *s1, *s2; -u_short *omode; +unsigned short *omode; int len; { int i, rlen; - u_int *kp; + unsigned int *kp; int res, klen, mlen; - u_short cc, c, prefix; + unsigned short cc, c, prefix; wchar16_t roma[SHORTBUFFSIZE + 1]; - u_int kstr[BUFFLENGTH]; + unsigned int kstr[BUFFLENGTH]; sj3_rkebell(0); klen = 0; @@ -461,14 +461,14 @@ int len; exec_romaji2(c, hbuf, kbuf, omode, cur, hcur) wchar16_t c, *hbuf, *kbuf; -u_short *omode; +unsigned short *omode; int cur, hcur; { - u_short c1, cc; - u_int c2; + unsigned short c1, cc; + unsigned int c2; int i; int ocur, len, retv; - u_int rkstr[MAXLLEN], *rkp; + unsigned int rkstr[MAXLLEN], *rkp; retv = 1; ocur = cur; diff --git a/s2ctbl.c b/s2ctbl.c index 16a3e57..745d549 100644 --- a/s2ctbl.c +++ b/s2ctbl.c @@ -39,7 +39,7 @@ #include "sj_typedef.h" #include "sj_yomi.h" -u_char kigou[] = { +unsigned char kigou[] = { Y_L_KAKKO, Y_KUTEN, Y_TOUTEN, diff --git a/screen.c b/screen.c index f89b92b..3a6024b 100644 --- a/screen.c +++ b/screen.c @@ -153,7 +153,7 @@ char mod; { Conversion *cv; int i, col, oldcol, len; - u_short *p; + unsigned short *p; cv = GetConversion (); printU (s); @@ -190,7 +190,7 @@ char mod; { Conversion *cv; int i, col, oldcol, len; - u_short *p; + unsigned short *p; cv = GetConversion (); printR (s); @@ -297,7 +297,7 @@ int redraw; { Conversion *cv; int spaces; - u_short row, col; + unsigned short row, col; if (redraw) { cv = GetConversion (); @@ -377,7 +377,7 @@ wchar16_t *s; clear_guide_line () { - u_short row, col; + unsigned short row, col; StartGuide (&row, &col); Clear_EOL (); @@ -387,7 +387,7 @@ clear_guide_line () print_guide_line () { - u_short row, col; + unsigned short row, col; StartGuide (&row, &col); spaceR (Guide); @@ -486,7 +486,7 @@ disp_mode () TopGuide () { - u_short row, col; + unsigned short row, col; StartGuide (&row, &col); } @@ -494,7 +494,7 @@ TopGuide () guide_print (s1, s2) wchar16_t *s1, *s2; { - u_short row, col; + unsigned short row, col; StartGuide (&row, &col); if (s1) diff --git a/selclrec.c b/selclrec.c index 51f87e1..a5d7af9 100644 --- a/selclrec.c +++ b/selclrec.c @@ -97,7 +97,7 @@ void selclrec() if (rec == NULL) { int klen; - u_char ch; + unsigned char ch; free_clall(clt1st); diff --git a/selsuuji.c b/selsuuji.c index f9c6666..ca23c7b 100644 --- a/selsuuji.c +++ b/selsuuji.c @@ -32,7 +32,7 @@ #include "const.h" #include "sj_suuji.h" -static u_short selsjAR[] = { +static unsigned short selsjAR[] = { SelArb0, SelArbCma | JFLAG_NK4 | JFLAG_NN0, SelKanSjYm | JFLAG_NN0, @@ -41,7 +41,7 @@ static u_short selsjAR[] = { SelNumTerm }; -static u_short selsjARCM[] = { +static unsigned short selsjARCM[] = { SelArbCma | JFLAG_NK4 | JFLAG_NN0, SelArb0, SelKanSjYm | JFLAG_NN0, @@ -50,7 +50,7 @@ static u_short selsjARCM[] = { SelNumTerm }; -static u_short selsjKAZU[] = { +static unsigned short selsjKAZU[] = { SelKanSjYm | JFLAG_NN0, SelKanSjYm2 | SelNum1_23_10_1 | JFLAG_NN0, SelKanSj0 | JFLAG_NK2, @@ -59,49 +59,49 @@ static u_short selsjKAZU[] = { SelNumTerm }; -static u_short selsjSUUJI[] = { +static unsigned short selsjSUUJI[] = { SelKanSj0, SelArb0, SelNumTerm }; -static u_short selsjNANSUU[] = { +static unsigned short selsjNANSUU[] = { SelKanSjYm, SelNumTerm }; -static u_short selsjAR17[] = { +static unsigned short selsjAR17[] = { SelLongArb, SelLongArbCma, SelNumTerm }; -static u_short selsjAR17CM[] = { +static unsigned short selsjAR17CM[] = { SelLongArbCma, SelLongArb, SelNumTerm }; -static u_short selsjAR17SJ[] = { +static unsigned short selsjAR17SJ[] = { SelLongArb, SelLongSj, SelNumTerm }; -static u_short selsjKANKURA[] = { +static unsigned short selsjKANKURA[] = { SelKanSjKr, SelArbKr, SelNumTerm }; -static u_short selsjARAKURA[] = { +static unsigned short selsjARAKURA[] = { SelArbKr, SelKanSjKr | JFLAG_NSN, SelNumTerm }; -u_short *selsjadrs[] = { +unsigned short *selsjadrs[] = { selsjAR, selsjARCM, selsjKAZU, diff --git a/server.h b/server.h index f2fcd23..aea4da9 100644 --- a/server.h +++ b/server.h @@ -45,16 +45,16 @@ void put_flush(void); void put_byte(int c); void put_work(int c); void put_int(int c); -u_char *put_string(u_char *p); -u_char *put_ndata(u_char *p, int n); +unsigned char *put_string(unsigned char *p); +unsigned char *put_ndata(unsigned char *p, int n); void get_buf(void); int get_byte(void); int get_word(void); #ifndef NO_GET_INT int get_int(void); #endif -int get_nstring(u_char *p, int n); -u_char *get_ndata(u_char *p, int n); +int get_nstring(unsigned char *p, int n); +unsigned char *get_ndata(unsigned char *p, int n); /* error.c */ int open_debug(void); diff --git a/setconj.c b/setconj.c index 07591f4..0a623e1 100644 --- a/setconj.c +++ b/setconj.c @@ -43,7 +43,7 @@ #include "kanakan.h" static int -cnjstrcmp (u_char *yptr, u_char *cnjp, int *saml) +cnjstrcmp (unsigned char *yptr, unsigned char *cnjp, int *saml) { int asklen; int nkrlen; @@ -114,13 +114,13 @@ cnvrow (JREC *rec, TypeCnct row) int setconj (TypeGram hinsi, JREC *jrec, CREC *crec) { - u_char *yptr; + unsigned char *yptr; int cmp; TypeCnct right; int saml; int ofslen; int count = 0; - u_char *cnj; + unsigned char *cnj; if ((cnj = Conjadr(hinsi)) != NULL) { saml = ofslen = 0; @@ -146,7 +146,7 @@ setconj (TypeGram hinsi, JREC *jrec, CREC *crec) if (isdpnd(*(yptr + saml))) continue; if ((right = cnvrow(jrec, (TypeCnct)CnjRight(cnj))) != '\0') { - crec -> len = (u_char)(ofslen + saml); + crec -> len = (unsigned char)(ofslen + saml); crec -> right = right; count++; crec++; diff --git a/setjrec.c b/setjrec.c index a53d654..3ca585a 100644 --- a/setjrec.c +++ b/setjrec.c @@ -43,14 +43,14 @@ int -setj_atrb(u_char* p) +setj_atrb(unsigned char* p) { return 2; } int -setj_ofs(u_char* p) +setj_ofs(unsigned char* p) { int contf = TRUE; @@ -92,7 +92,7 @@ setj_ofs(u_char* p) int -setj_knj(u_char* p) +setj_knj(unsigned char* p) { int contf = TRUE; @@ -134,21 +134,21 @@ setj_knj(u_char* p) int -setj_norm1(u_char* p) +setj_norm1(unsigned char* p) { return 1; } int -setj_norm2(u_char* p) +setj_norm2(unsigned char* p) { return 2; } int -setj_norm3(u_char* p) +setj_norm3(unsigned char* p) { return 3; } @@ -179,12 +179,12 @@ chkhead(TypeGram gram) void -setjrec(u_char* tagp, int mode) +setjrec(unsigned char* tagp, int mode) { TypeGram gram; - u_char *ptr; - u_char *endp; - u_char *tmp; + unsigned char *ptr; + unsigned char *endp; + unsigned char *tmp; JREC *rec; int plen; int nlen; @@ -260,11 +260,11 @@ setjrec(u_char* tagp, int mode) void -setnumrec(u_char* tagp, JREC* rec, TypeGram gram) +setnumrec(unsigned char* tagp, JREC* rec, TypeGram gram) { - u_char *ptr; - u_char *endp; - u_char *tmp; + unsigned char *ptr; + unsigned char *endp; + unsigned char *tmp; int plen, nlen, len; JREC *jrec; @@ -329,7 +329,7 @@ setnumrec(u_char* tagp, JREC* rec, TypeGram gram) void -setcrec(u_char* tagp) +setcrec(unsigned char* tagp) { JREC *rec; diff --git a/setkouho.c b/setkouho.c index e2c72e5..d20c75e 100644 --- a/setkouho.c +++ b/setkouho.c @@ -41,7 +41,7 @@ #include "sj_hinsi.h" #include "kanakan.h" -static int hiraknj(u_char *p); +static int hiraknj(unsigned char *p); void @@ -49,7 +49,7 @@ setkouho(CLREC* clrec, TypeDicOfs offs, int mode) { JREC *jrec; KHREC *kptr; - u_char *fptr; + unsigned char *fptr; int flg; int i; @@ -68,7 +68,7 @@ setkouho(CLREC* clrec, TypeDicOfs offs, int mode) kptr -> offs = offs; kptr -> rank = 0; kptr -> styno = 0; - kptr -> mode = (u_char)mode; + kptr -> mode = (unsigned char)mode; if (jrec -> flags & JFLAG_KA) { @@ -122,7 +122,7 @@ setkouho(CLREC* clrec, TypeDicOfs offs, int mode) kptr -> offs = offs; kptr -> rank = 0; kptr -> styno = 0; - kptr -> mode = (u_char)mode; + kptr -> mode = (unsigned char)mode; kptr -> sttfg = 1; kptr -> sttkj = 1; @@ -140,7 +140,7 @@ void ph_setkouho(CLREC* clrec, TypeDicOfs offs, STDYIN* sptr) { JREC *jrec; - u_char *p; + unsigned char *p; if (sptr) { @@ -163,7 +163,7 @@ ph_setkouho(CLREC* clrec, TypeDicOfs offs, STDYIN* sptr) kouhotbl[0].mode = sel_sjmode(jrec = clrec -> jnode); - kouhotbl[0].sttfg = (u_char) + kouhotbl[0].sttfg = (unsigned char) ((p = Settou_ptr(jrec->sttofs)) ? (SttHiraKnj(p)?1:0) : 0); @@ -187,7 +187,7 @@ ph_setkouho(CLREC* clrec, TypeDicOfs offs, STDYIN* sptr) static int -hiraknj(u_char *p) +hiraknj(unsigned char *p) { char flg = TRUE; int i; @@ -228,7 +228,7 @@ hiraknj(u_char *p) int -hiraknj_atrb(u_char* p, int* len) +hiraknj_atrb(unsigned char* p, int* len) { *len = 2; return 0; @@ -236,7 +236,7 @@ hiraknj_atrb(u_char* p, int* len) int -hiraknj_ofs(u_char* p, int* len) +hiraknj_ofs(unsigned char* p, int* len) { *len = 2; return hiraknj(dicbuf + ((*p & KanjiCodeMask) << 8) + *(p + 1)); @@ -244,7 +244,7 @@ hiraknj_ofs(u_char* p, int* len) int -hiraknj_knj(u_char* p, int* len) +hiraknj_knj(unsigned char* p, int* len) { *len = 1; return hiraknj(askknj[*p & KnjAssyukuMask]); @@ -252,7 +252,7 @@ hiraknj_knj(u_char* p, int* len) int -hiraknj_hask(u_char* p, int* len) +hiraknj_hask(unsigned char* p, int* len) { *len = 1; return 2; @@ -260,7 +260,7 @@ hiraknj_hask(u_char* p, int* len) int -hiraknj_kask(u_char* p, int* len) +hiraknj_kask(unsigned char* p, int* len) { *len = 1; return 3; @@ -268,7 +268,7 @@ hiraknj_kask(u_char* p, int* len) int -hiraknj_norm(u_char* p, int* len) +hiraknj_norm(unsigned char* p, int* len) { *len = codesize(*p); return 1; @@ -276,9 +276,9 @@ hiraknj_norm(u_char* p, int* len) int -hiraknj_hira(u_char* p, int* len) +hiraknj_hira(unsigned char* p, int* len) { - u_char ch; + unsigned char ch; *len = codesize(*p); ch = *(p + 1); diff --git a/setubi.c b/setubi.c index 7047beb..598fcd3 100644 --- a/setubi.c +++ b/setubi.c @@ -41,7 +41,7 @@ #include "sj_hinsi.h" #include "kanakan.h" -u_char* +unsigned char* getstb(TypeGram hinsi) { if (hinsi < MEISI_1 || hinsi > TIMEI) return NULL; @@ -51,11 +51,11 @@ getstb(TypeGram hinsi) void -setubi(JREC *rec, u_char *stbtbl) +setubi(JREC *rec, unsigned char *stbtbl) { - u_char *stb; - u_char *yptr; - u_char *sptr; + unsigned char *stb; + unsigned char *yptr; + unsigned char *sptr; int slen; JREC *new; int cmp; @@ -77,7 +77,7 @@ setubi(JREC *rec, u_char *stbtbl) if (!(new = argjrec((int)(rec -> jlen + slen), rec))) continue; - new -> stbofs = (u_char)(stb - stbtbl); + new -> stbofs = (unsigned char)(stb - stbtbl); new -> flags |= StbBakeru(stb) ? JFLAG_KA : 0; } } diff --git a/setup.c b/setup.c index b70399e..f449715 100644 --- a/setup.c +++ b/setup.c @@ -61,8 +61,8 @@ #include "server.h" typedef struct strlist { - u_char *str1; - u_char *str2; + unsigned char *str1; + unsigned char *str2; struct strlist *link; } StrList; @@ -121,7 +121,7 @@ RcWarning(char* p) static int -cmpstr(u_char* src, u_char* dst) +cmpstr(unsigned char* src, unsigned char* dst) { int flg; int c; @@ -139,8 +139,8 @@ cmpstr(u_char* src, u_char* dst) -static u_char *get_str(p, pv_dst) -u_char *p; +static unsigned char *get_str(p, pv_dst) +unsigned char *p; void *pv_dst; { char **dst; @@ -154,8 +154,8 @@ void *pv_dst; while (*p++) ; return p; } -static u_char *get_int(p, pv_dst) -u_char *p; +static unsigned char *get_int(p, pv_dst) +unsigned char *p; void *pv_dst; { char *fmt; @@ -167,8 +167,8 @@ void *pv_dst; while (*p++) ; return p; } -static u_char *get_flag(p, pv_dst) -u_char *p; +static unsigned char *get_flag(p, pv_dst) +unsigned char *p; void *pv_dst; { int *dst; @@ -187,8 +187,8 @@ void *pv_dst; } -static u_char* -get_list(u_char* p, StrList** dst) +static unsigned char* +get_list(unsigned char* p, StrList** dst) { StrList *s1, *s2; @@ -197,13 +197,13 @@ get_list(u_char* p, StrList** dst) if (!s1) RcError("no more memory"); s1 -> link = NULL; - s1 -> str1 = (u_char *)malloc(strlen((char *)p) + 1); + s1 -> str1 = (unsigned char *)malloc(strlen((char *)p) + 1); if (!(s1 -> str1)) RcError("no more memory"); strcpy((char *)s1 -> str1, (char *)p); while (*p++) ; if (*p) { - s1 -> str2 = (u_char *)malloc(strlen((char *)p) + 1); + s1 -> str2 = (unsigned char *)malloc(strlen((char *)p) + 1); if (!(s1 -> str2)) RcError("no more memory"); strcpy((char *)s1 -> str2, (char *)p); while (*p++) ; @@ -227,7 +227,7 @@ get_list(u_char* p, StrList** dst) struct optlist { char *optname; - u_char *(*optfunc)(); + unsigned char *(*optfunc)(); void *optarg; } option[] = { /* @@ -378,9 +378,9 @@ void read_runcmd(void) { FILE *fp; - u_char buf[BUFSIZ]; + unsigned char buf[BUFSIZ]; struct optlist *opt; - u_char *p; + unsigned char *p; if (!(fp = fopen(runcmd_file, "r"))) { warning_out("Can't open run-command file \"%s\"", runcmd_file); @@ -388,7 +388,7 @@ read_runcmd(void) } line_number = 0; while (read_line(fp, buf, sizeof(buf)) != EOF) { - for (opt = option ; (p = (u_char *)opt -> optname) != NULL ; opt++) + for (opt = option ; (p = (unsigned char *)opt -> optname) != NULL ; opt++) if (!cmpstr(p, buf)) break; if (p) { p = buf; while (*p++) ; diff --git a/sj2code.c b/sj2code.c index ce22b85..1423c03 100644 --- a/sj2code.c +++ b/sj2code.c @@ -41,10 +41,10 @@ #include "sj_yomi.h" int sj2cd_chr(euc, yomi) -u_char *euc; -u_char *yomi; +unsigned char *euc; +unsigned char *yomi; { - u_char chr; + unsigned char chr; if ((chr = *euc++) == EUC_a1) { chr = *euc; @@ -118,8 +118,8 @@ u_char *yomi; int sj2cd_str(euc, yomi, len) -u_char *euc; -u_char *yomi; +unsigned char *euc; +unsigned char *yomi; int len; { diff --git a/sj3_rkcv.c b/sj3_rkcv.c index c5c0ec5..8074d62 100644 --- a/sj3_rkcv.c +++ b/sj3_rkcv.c @@ -57,9 +57,9 @@ extern int current_locale; #define sj_ishira(c) (c >= 0xa4a1 && c <= 0xa4f3) static wchar16_t intmp[MAXLLEN]; static wchar16_t outtmp[MAXLLEN]; -static u_char mtmp[MAXLLEN]; +static unsigned char mtmp[MAXLLEN]; -static u_short HKtable[ZKATAn] = { +static unsigned short HKtable[ZKATAn] = { KANA_XA, KANA_A, KANA_XA + 1, KANA_A + 1, KANA_XA + 2, KANA_A + 2, @@ -124,8 +124,8 @@ static u_short HKtable[ZKATAn] = { }; static struct ztohkktbl { - u_short zen; - u_short han; + unsigned short zen; + unsigned short han; } HKKtbl[8] = { {ZEN_KTEN, KANA_KTEN}, {ZEN_FKAKKO, KANA_FKAKKO}, @@ -140,7 +140,7 @@ static struct ztohkktbl { static struct hzkigoutbl { wchar16_t han; - u_short zen; + unsigned short zen; } HZKtbl[6] = { {',', ZEN_TTEN}, {'.', ZEN_KTEN}, @@ -150,7 +150,7 @@ static struct hzkigoutbl { {']', ZEN_EKAKKO} }; -static u_short HZtbl[95] = { +static unsigned short HZtbl[95] = { 0xa1a1, 0xa1aa, 0xa1c9, 0xa1f4, 0xa1f0, 0xa1f3, 0xa1f5, 0xa1c7, 0xa1ca, 0xa1cb, 0xa1f6, 0xa1dc, 0xa1a4, 0xa1dd, 0xa1a5, 0xa1bf, 0xa3b0, 0xa3b1, 0xa3b2, 0xa3b3, 0xa3b4, 0xa3b5, 0xa3b6, 0xa3b7, @@ -169,7 +169,7 @@ static u_short HZtbl[95] = { setl_hktozh() { int i; - u_short c, zen1; + unsigned short c, zen1; wchar16_t rstr[2]; wchar16_t kstr[2]; RkTablW16 *rktp, *mktable(); @@ -226,9 +226,9 @@ mkkigou() } sj_addten(prefix, c) -u_short prefix, c; +unsigned short prefix, c; { - u_short c1, cc; + unsigned short c1, cc; cc = 0; if ((c == ZEN_DTEN || c == ZEN_HDTEN) && @@ -247,10 +247,10 @@ u_short prefix, c; } sj_han2zen(c) -u_short c; +unsigned short c; { int i; - u_short cc; + unsigned short cc; if (WcIsHANKAKU(c) && iskana2(c)) { for (i = 0; i < ZKATAn; i++) { @@ -289,16 +289,16 @@ u_short c; int sj3_hantozen_w16(wchar16_t *, wchar16_t *); sj3_hantozen(out, in) -u_char *out, *in; +unsigned char *out, *in; { wchar16_t *winstr, *woutstr; - u_char *mstr; + unsigned char *mstr; int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret; inlen = strlen(in) + 1; if (current_locale == LC_CTYPE_EUC) { if (inlen > sizeof(mtmp)) { - mstr = (u_char *) malloc(inlen); + mstr = (unsigned char *) malloc(inlen); mmflag = 1; } else { mstr = mtmp; @@ -349,7 +349,7 @@ u_char *out, *in; } outlen = ret * 3; if (outlen > sizeof(mtmp)) { - mstr = (u_char *) malloc(outlen); + mstr = (unsigned char *) malloc(outlen); if (!mstr) { if (imflag) free(winstr); if (omflag) free(woutstr); @@ -382,10 +382,10 @@ u_char *out, *in; } sj3_hantozen_euc(out, in) -u_char *out, *in; +unsigned char *out, *in; { wchar16_t *winstr, *woutstr; - u_char *mstr; + unsigned char *mstr; int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret; inlen = strlen(in) + 1; @@ -393,7 +393,7 @@ u_char *out, *in; mstr = in; } else { if (inlen > sizeof(mtmp)) { - mstr = (u_char *) malloc(inlen); + mstr = (unsigned char *) malloc(inlen); mmflag = 1; } else { mstr = mtmp; @@ -442,7 +442,7 @@ u_char *out, *in; } outlen = ret * 3; if (outlen > sizeof(mtmp)) { - mstr = (u_char *) malloc(outlen); + mstr = (unsigned char *) malloc(outlen); if (!mstr) { if (imflag) free(winstr); if (omflag) free(woutstr); @@ -475,7 +475,7 @@ u_char *out, *in; } sj3_hantozen_mb(s1, s2) -u_char *s1, *s2; +unsigned char *s1, *s2; { if (current_locale == LC_CTYPE_EUC) return sj3_hantozen_euc(s1, s2); @@ -494,7 +494,7 @@ sj_hantozen(s1, s2, len) wchar16_t *s1, *s2; int len; { - u_short c1, cc, prefix; + unsigned short c1, cc, prefix; wchar16_t c; int i; int rlen; @@ -525,10 +525,10 @@ int len; } sj_zen2han(c) -u_short c; +unsigned short c; { int i; - u_short cc; + unsigned short cc; i = ZKATAn; cc = c & MASK; @@ -562,15 +562,15 @@ u_short c; int sj3_zentohan_w16(wchar16_t *, wchar16_t *); sj3_zentohan(out, in) -u_char *out, *in; +unsigned char *out, *in; { wchar16_t *winstr, *woutstr; - u_char *mstr; + unsigned char *mstr; int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret; inlen = strlen(in) + 1; if (inlen > sizeof(mtmp)) { - mstr = (u_char *) malloc(inlen); + mstr = (unsigned char *) malloc(inlen); if (!mstr) { return -1; } @@ -622,7 +622,7 @@ u_char *out, *in; outlen = ret * 3; if (current_locale == LC_CTYPE_EUC) { if (outlen > sizeof(mtmp)) { - mstr = (u_char *) malloc(outlen); + mstr = (unsigned char *) malloc(outlen); mmflag = 1; } else { mstr = mtmp; @@ -652,15 +652,15 @@ u_char *out, *in; } sj3_zentohan_euc(out, in) -u_char *out, *in; +unsigned char *out, *in; { wchar16_t *winstr, *woutstr; - u_char *mstr; + unsigned char *mstr; int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret; inlen = strlen(in) + 1; if (inlen > sizeof(mtmp)) { - mstr = (u_char *) malloc(inlen); + mstr = (unsigned char *) malloc(inlen); if (!mstr) { return -1; } @@ -716,7 +716,7 @@ u_char *out, *in; mstr = out; } else { if (outlen > sizeof(mtmp)) { - mstr = (u_char *) malloc(outlen); + mstr = (unsigned char *) malloc(outlen); mmflag = 1; } else { mstr = mtmp; @@ -743,7 +743,7 @@ u_char *out, *in; } sj3_zentohan_mb(s1, s2) -u_char *s1, *s2; +unsigned char *s1, *s2; { if (current_locale == LC_CTYPE_EUC) return sj3_zentohan_euc(s1, s2); @@ -761,7 +761,7 @@ sj_zentohan(s1, s2, len) wchar16_t *s1, *s2; int len; { - u_short cc; + unsigned short cc; wchar16_t c; int i, rlen; diff --git a/sj3lib.c b/sj3lib.c index 5341b0f..337d525 100644 --- a/sj3lib.c +++ b/sj3lib.c @@ -62,9 +62,9 @@ static int defuse = 0; static long *dicid_list = NULL; static int dicid_num = 0; -static u_char buf1[YomiBufSize]; -static u_char buf2[YomiBufSize]; -static u_char kbuf[KanjiBufSize]; +static unsigned char buf1[YomiBufSize]; +static unsigned char buf2[YomiBufSize]; +static unsigned char kbuf[KanjiBufSize]; static int set_sys_code(void) @@ -382,9 +382,9 @@ server_dead: } int -sj3_getkan(u_char *yomi, SJ3_BUNSETU *bun, u_char *knj, int knjsiz) +sj3_getkan(unsigned char *yomi, SJ3_BUNSETU *bun, unsigned char *knj, int knjsiz) { - u_char *src; + unsigned char *src; int buncnt = 0; int len; int stysiz = client.stdy_size; @@ -437,9 +437,9 @@ sj3_getkan(u_char *yomi, SJ3_BUNSETU *bun, u_char *knj, int knjsiz) } int -sj3_getkan_euc(u_char *yomi, SJ3_BUNSETU *bun, u_char *knj, int knjsiz) +sj3_getkan_euc(unsigned char *yomi, SJ3_BUNSETU *bun, unsigned char *knj, int knjsiz) { - u_char *src, *yp, *kp, *khp; + unsigned char *src, *yp, *kp, *khp; int buncnt = 0, i; int len, flag, mflag = 0; int stysiz = client.stdy_size; @@ -458,7 +458,7 @@ sj3_getkan_euc(u_char *yomi, SJ3_BUNSETU *bun, u_char *knj, int knjsiz) yp = buf1; if (knjsiz > sizeof(kbuf)) { mflag = 1; - kp = khp = (u_char *)malloc(knjsiz); + kp = khp = (unsigned char *)malloc(knjsiz); } else { kp = khp = kbuf; } @@ -539,7 +539,7 @@ sj3_getkan_euc(u_char *yomi, SJ3_BUNSETU *bun, u_char *knj, int knjsiz) } int -sj3_getkan_mb(u_char *yomi, SJ3_BUNSETU *bun, u_char *knj, int knjsiz) +sj3_getkan_mb(unsigned char *yomi, SJ3_BUNSETU *bun, unsigned char *knj, int knjsiz) { if (_sys_code == SYS_NOTDEF) _sys_code = set_sys_code(); @@ -550,7 +550,7 @@ sj3_getkan_mb(u_char *yomi, SJ3_BUNSETU *bun, u_char *knj, int knjsiz) } int -sj3_douoncnt(u_char *yomi) +sj3_douoncnt(unsigned char *yomi) { int i; @@ -571,10 +571,10 @@ sj3_douoncnt(u_char *yomi) } int -sj3_douoncnt_euc(u_char *yomi) +sj3_douoncnt_euc(unsigned char *yomi) { int i, l, flag; - u_char *yp; + unsigned char *yp; if ((i = strlen(yomi)) > SJ3_BUNSETU_YOMI) return 0; @@ -605,7 +605,7 @@ sj3_douoncnt_euc(u_char *yomi) } int -sj3_douoncnt_mb(u_char *yomi) +sj3_douoncnt_mb(unsigned char *yomi) { if (_sys_code == SYS_NOTDEF) _sys_code = set_sys_code(); @@ -616,7 +616,7 @@ sj3_douoncnt_mb(u_char *yomi) } int -sj3_getdouon(u_char *yomi, SJ3_DOUON *dou) +sj3_getdouon(unsigned char *yomi, SJ3_DOUON *dou) { int i; @@ -636,7 +636,7 @@ sj3_getdouon(u_char *yomi, SJ3_DOUON *dou) } int -sj3_getdouon_euc(u_char *yomi, SJ3_DOUON *dou) +sj3_getdouon_euc(unsigned char *yomi, SJ3_DOUON *dou) { int i, j, l; @@ -680,7 +680,7 @@ sj3_getdouon_euc(u_char *yomi, SJ3_DOUON *dou) } int -sj3_getdouon_mb(u_char *yomi, SJ3_DOUON *dou) +sj3_getdouon_mb(unsigned char *yomi, SJ3_DOUON *dou) { if (_sys_code == SYS_NOTDEF) _sys_code = set_sys_code(); @@ -704,7 +704,7 @@ sj3_gakusyuu(SJ3_STUDYREC *dcid) } int -sj3_gakusyuu2(u_char *yomi1, u_char *yomi2, SJ3_STUDYREC *dcid) +sj3_gakusyuu2(unsigned char *yomi1, unsigned char *yomi2, SJ3_STUDYREC *dcid) { if (sj3_bunsetu_gakusyuu(&client, yomi1, yomi2, dcid, MBCODE_SJIS) == ERROR) { @@ -718,10 +718,10 @@ sj3_gakusyuu2(u_char *yomi1, u_char *yomi2, SJ3_STUDYREC *dcid) } int -sj3_gakusyuu2_euc(u_char *yomi1, u_char *yomi2, SJ3_STUDYREC *dcid) +sj3_gakusyuu2_euc(unsigned char *yomi1, unsigned char *yomi2, SJ3_STUDYREC *dcid) { int l, flag; - u_char *y1p, *y2p; + unsigned char *y1p, *y2p; if (client.svr_version == 1) { defuse = 0; @@ -753,7 +753,7 @@ sj3_gakusyuu2_euc(u_char *yomi1, u_char *yomi2, SJ3_STUDYREC *dcid) } int -sj3_gakusyuu2_mb(u_char *yomi1, u_char *yomi2, SJ3_STUDYREC *dcid) +sj3_gakusyuu2_mb(unsigned char *yomi1, unsigned char *yomi2, SJ3_STUDYREC *dcid) { if (_sys_code == SYS_NOTDEF) _sys_code = set_sys_code(); @@ -764,7 +764,7 @@ sj3_gakusyuu2_mb(u_char *yomi1, u_char *yomi2, SJ3_STUDYREC *dcid) } int -sj3_touroku(u_char *yomi, u_char *kanji, int code) +sj3_touroku(unsigned char *yomi, unsigned char *kanji, int code) { if (sj3_tango_touroku(&client, udicid, yomi, kanji, code, MBCODE_SJIS)) { @@ -791,11 +791,11 @@ sj3_touroku(u_char *yomi, u_char *kanji, int code) } int -sj3_touroku_euc(u_char *yomi, u_char *kanji, int code) +sj3_touroku_euc(unsigned char *yomi, unsigned char *kanji, int code) { int l, flag; - u_char *yp; - u_char *kp; + unsigned char *yp; + unsigned char *kp; if (client.svr_version == 1) { defuse = 0; l = sj3_str_euctosjis(buf1, sizeof(buf1), yomi, @@ -839,7 +839,7 @@ sj3_touroku_euc(u_char *yomi, u_char *kanji, int code) } int -sj3_touroku_mb(u_char *yomi, u_char *kanji, int code) +sj3_touroku_mb(unsigned char *yomi, unsigned char *kanji, int code) { if (_sys_code == SYS_NOTDEF) _sys_code = set_sys_code(); @@ -850,7 +850,7 @@ sj3_touroku_mb(u_char *yomi, u_char *kanji, int code) } int -sj3_syoukyo(u_char *yomi, u_char *kanji, int code) +sj3_syoukyo(unsigned char *yomi, unsigned char *kanji, int code) { if (sj3_tango_sakujo(&client, udicid, yomi, kanji, code, MBCODE_SJIS)) { if (client.fd < 0) { @@ -872,11 +872,11 @@ sj3_syoukyo(u_char *yomi, u_char *kanji, int code) } int -sj3_syoukyo_euc(u_char *yomi, u_char *kanji, int code) +sj3_syoukyo_euc(unsigned char *yomi, unsigned char *kanji, int code) { int l, flag; - u_char *yp; - u_char *kp; + unsigned char *yp; + unsigned char *kp; if (client.svr_version == 1) { defuse = 0; l = sj3_str_euctosjis(buf1, sizeof(buf1), yomi, @@ -916,7 +916,7 @@ sj3_syoukyo_euc(u_char *yomi, u_char *kanji, int code) } int -sj3_syoukyo_mb(u_char *yomi, u_char *kanji, int code) +sj3_syoukyo_mb(unsigned char *yomi, unsigned char *kanji, int code) { if (_sys_code == SYS_NOTDEF) _sys_code = set_sys_code(); @@ -927,7 +927,7 @@ sj3_syoukyo_mb(u_char *yomi, u_char *kanji, int code) } int -sj3_getdict(u_char *buf) +sj3_getdict(unsigned char *buf) { if (sj3_tango_syutoku(&client, udicid, buf, MBCODE_SJIS)) { if (client.fd < 0) { @@ -940,7 +940,7 @@ sj3_getdict(u_char *buf) } int -sj3_getdict_euc(u_char *buf) +sj3_getdict_euc(unsigned char *buf) { int l, ll, slen; @@ -982,7 +982,7 @@ sj3_getdict_euc(u_char *buf) } int -sj3_getdict_mb(u_char *buf) +sj3_getdict_mb(unsigned char *buf) { if (_sys_code == SYS_NOTDEF) _sys_code = set_sys_code(); @@ -993,7 +993,7 @@ sj3_getdict_mb(u_char *buf) } int -sj3_nextdict(u_char *buf) +sj3_nextdict(unsigned char *buf) { if (sj3_tango_jikouho(&client, udicid, buf, MBCODE_SJIS)) { if (client.fd < 0) { @@ -1006,7 +1006,7 @@ sj3_nextdict(u_char *buf) } int -sj3_nextdict_euc(u_char *buf) +sj3_nextdict_euc(unsigned char *buf) { int l, ll, slen; @@ -1048,7 +1048,7 @@ sj3_nextdict_euc(u_char *buf) } int -sj3_nextdict_mb(u_char *buf) +sj3_nextdict_mb(unsigned char *buf) { if (_sys_code == SYS_NOTDEF) _sys_code = set_sys_code(); @@ -1059,7 +1059,7 @@ sj3_nextdict_mb(u_char *buf) } int -sj3_prevdict(u_char *buf) +sj3_prevdict(unsigned char *buf) { if (sj3_tango_maekouho(&client, udicid, buf, MBCODE_SJIS)) { if (client.fd < 0) { @@ -1072,7 +1072,7 @@ sj3_prevdict(u_char *buf) } int -sj3_prevdict_euc(u_char *buf) +sj3_prevdict_euc(unsigned char *buf) { int l, ll, slen; @@ -1114,7 +1114,7 @@ sj3_prevdict_euc(u_char *buf) } int -sj3_prevdict_mb(u_char *buf) +sj3_prevdict_mb(unsigned char *buf) { if (_sys_code == SYS_NOTDEF) _sys_code = set_sys_code(); diff --git a/sj3lib.h b/sj3lib.h index 67bd2e3..5e65f56 100644 --- a/sj3lib.h +++ b/sj3lib.h @@ -157,20 +157,20 @@ int sj3_close_study_file(SJ3_CLIENT_ENV *); int sj3_get_id_size(SJ3_CLIENT_ENV *); int sj3_lock_server(SJ3_CLIENT_ENV *); int sj3_unlock_server(SJ3_CLIENT_ENV *); -int sj3_ikkatu_henkan(SJ3_CLIENT_ENV *, u_char *, u_char *, int, int); -int sj3_bunsetu_henkan(SJ3_CLIENT_ENV *, u_char *, int, u_char *, int); -int sj3_bunsetu_jikouho(SJ3_CLIENT_ENV *, u_char *, int, int); -int sj3_bunsetu_maekouho(SJ3_CLIENT_ENV *, u_char *, int, int); -int sj3_bunsetu_kouhosuu(SJ3_CLIENT_ENV *, u_char *, int, int); -int sj3_bunsetu_zenkouho(SJ3_CLIENT_ENV *, u_char *, int, SJ3_DOUON *, int); +int sj3_ikkatu_henkan(SJ3_CLIENT_ENV *, unsigned char *, unsigned char *, int, int); +int sj3_bunsetu_henkan(SJ3_CLIENT_ENV *, unsigned char *, int, unsigned char *, int); +int sj3_bunsetu_jikouho(SJ3_CLIENT_ENV *, unsigned char *, int, int); +int sj3_bunsetu_maekouho(SJ3_CLIENT_ENV *, unsigned char *, int, int); +int sj3_bunsetu_kouhosuu(SJ3_CLIENT_ENV *, unsigned char *, int, int); +int sj3_bunsetu_zenkouho(SJ3_CLIENT_ENV *, unsigned char *, int, SJ3_DOUON *, int); int sj3_tango_gakusyuu(SJ3_CLIENT_ENV *, SJ3_STUDYREC *); -int sj3_bunsetu_gakusyuu(SJ3_CLIENT_ENV *, u_char *, u_char *, SJ3_STUDYREC *, +int sj3_bunsetu_gakusyuu(SJ3_CLIENT_ENV *, unsigned char *, unsigned char *, SJ3_STUDYREC *, int); -int sj3_tango_touroku(SJ3_CLIENT_ENV *, long, u_char *, u_char *, int, int); -int sj3_tango_sakujo(SJ3_CLIENT_ENV *, long, u_char *, u_char *, int, int); -int sj3_tango_syutoku(SJ3_CLIENT_ENV *, int, u_char *, int); -int sj3_tango_jikouho(SJ3_CLIENT_ENV *, int, u_char *, int); -int sj3_tango_maekouho(SJ3_CLIENT_ENV *, int, u_char *, int); +int sj3_tango_touroku(SJ3_CLIENT_ENV *, long, unsigned char *, unsigned char *, int, int); +int sj3_tango_sakujo(SJ3_CLIENT_ENV *, long, unsigned char *, unsigned char *, int, int); +int sj3_tango_syutoku(SJ3_CLIENT_ENV *, int, unsigned char *, int); +int sj3_tango_jikouho(SJ3_CLIENT_ENV *, int, unsigned char *, int); +int sj3_tango_maekouho(SJ3_CLIENT_ENV *, int, unsigned char *, int); int sj3_make_dict_file(SJ3_CLIENT_ENV *, char *, int, int, int); int sj3_make_study_file(SJ3_CLIENT_ENV *, char *, int, int, int); int sj3_make_directory(SJ3_CLIENT_ENV *, char *); @@ -184,34 +184,34 @@ int sj3_version(SJ3_CLIENT_ENV *, char *, int); int sj3_open(char *, char *); int sj3_open_with_list(char *, char *, int, char **, int *, int **); int sj3_close(void); -int sj3_getkan(u_char *, SJ3_BUNSETU *, u_char *, int); -int sj3_getkan_euc(u_char *, SJ3_BUNSETU *, u_char *, int); -int sj3_getkan_mb(u_char *, SJ3_BUNSETU *, u_char *, int); -int sj3_douoncnt(u_char *); -int sj3_douoncnt_euc(u_char *); -int sj3_douoncnt_mb(u_char *); -int sj3_getdouon(u_char *, SJ3_DOUON *); -int sj3_getdouon_euc(u_char *, SJ3_DOUON *); -int sj3_getdouon_mb(u_char *, SJ3_DOUON *); +int sj3_getkan(unsigned char *, SJ3_BUNSETU *, unsigned char *, int); +int sj3_getkan_euc(unsigned char *, SJ3_BUNSETU *, unsigned char *, int); +int sj3_getkan_mb(unsigned char *, SJ3_BUNSETU *, unsigned char *, int); +int sj3_douoncnt(unsigned char *); +int sj3_douoncnt_euc(unsigned char *); +int sj3_douoncnt_mb(unsigned char *); +int sj3_getdouon(unsigned char *, SJ3_DOUON *); +int sj3_getdouon_euc(unsigned char *, SJ3_DOUON *); +int sj3_getdouon_mb(unsigned char *, SJ3_DOUON *); int sj3_gakusyuu(SJ3_STUDYREC *); -int sj3_gakusyuu2(u_char *, u_char *, SJ3_STUDYREC *); -int sj3_gakusyuu2_euc(u_char *, u_char *, SJ3_STUDYREC *); -int sj3_gakusyuu2_mb(u_char *, u_char *, SJ3_STUDYREC *); -int sj3_touroku(u_char *, u_char *, int); -int sj3_touroku_euc(u_char *, u_char *, int); -int sj3_touroku_mb(u_char *, u_char *, int); -int sj3_syoukyo(u_char *, u_char *, int); -int sj3_syoukyo_euc(u_char *, u_char *, int); -int sj3_syoukyo_mb(u_char *, u_char *, int); -int sj3_getdict(u_char *); -int sj3_getdict_euc(u_char *); -int sj3_getdict_mb(u_char *); -int sj3_nextdict(u_char *); -int sj3_nextdict_euc(u_char *); -int sj3_nextdict_mb(u_char *); -int sj3_prevdict(u_char *); -int sj3_prevdict_euc(u_char *); -int sj3_prevdict_mb(u_char *); +int sj3_gakusyuu2(unsigned char *, unsigned char *, SJ3_STUDYREC *); +int sj3_gakusyuu2_euc(unsigned char *, unsigned char *, SJ3_STUDYREC *); +int sj3_gakusyuu2_mb(unsigned char *, unsigned char *, SJ3_STUDYREC *); +int sj3_touroku(unsigned char *, unsigned char *, int); +int sj3_touroku_euc(unsigned char *, unsigned char *, int); +int sj3_touroku_mb(unsigned char *, unsigned char *, int); +int sj3_syoukyo(unsigned char *, unsigned char *, int); +int sj3_syoukyo_euc(unsigned char *, unsigned char *, int); +int sj3_syoukyo_mb(unsigned char *, unsigned char *, int); +int sj3_getdict(unsigned char *); +int sj3_getdict_euc(unsigned char *); +int sj3_getdict_mb(unsigned char *); +int sj3_nextdict(unsigned char *); +int sj3_nextdict_euc(unsigned char *); +int sj3_nextdict_mb(unsigned char *); +int sj3_prevdict(unsigned char *); +int sj3_prevdict_euc(unsigned char *); +int sj3_prevdict_mb(unsigned char *); int sj3_lockserv(void); int sj3_unlockserv(void); diff --git a/sj_func.h b/sj_func.h index 6873d84..318b57d 100644 --- a/sj_func.h +++ b/sj_func.h @@ -40,11 +40,11 @@ #include "sj_struct.h" #include "Struct.h" -typedef void (*VFuncNT)(u_char*, u_char*, JREC*); -typedef int (*IFuncSetj)(u_char*); -typedef int (*IFuncHira)(u_char*, int*); -typedef u_char* (*UCPFuncGK)(u_char*, u_char*, u_char*, int, int); -typedef u_char* (*UCPFuncMK)(u_char*, u_char*, int); +typedef void (*VFuncNT)(unsigned char*, unsigned char*, JREC*); +typedef int (*IFuncSetj)(unsigned char*); +typedef int (*IFuncHira)(unsigned char*, int*); +typedef unsigned char* (*UCPFuncGK)(unsigned char*, unsigned char*, unsigned char*, int, int); +typedef unsigned char* (*UCPFuncMK)(unsigned char*, unsigned char*, int); #endif /* _SJ_FUNC */ diff --git a/sj_struct.h b/sj_struct.h index 7555267..8815441 100644 --- a/sj_struct.h +++ b/sj_struct.h @@ -47,15 +47,15 @@ typedef struct jiritu { TypeDicSeg jseg; TypeDicOfs jofsst; TypeDicOfs jofsed; - u_short flags; + unsigned short flags; TypeClass class; TypeDicID dicid; - u_char jlen; + unsigned char jlen; TypeGram hinsi; - u_char sttofs; - u_char stbofs; - u_char count; - u_char numlen; + unsigned char sttofs; + unsigned char stbofs; + unsigned char count; + unsigned char numlen; } JREC; @@ -64,16 +64,16 @@ typedef struct jiritu { typedef struct bunsetu { JREC *jnode; struct bunsetu *clsort; - u_char gobiln; - u_char cllen; + unsigned char gobiln; + unsigned char cllen; TypeCnct right; - u_char cl2len; - u_char kubun; + unsigned char cl2len; + unsigned char kubun; #if __STDC__ - u_int fzk_ka : 1; + unsigned int fzk_ka : 1; #else - u_char fzk_ka : 1; + unsigned char fzk_ka : 1; #endif } CLREC; @@ -84,19 +84,19 @@ typedef struct kouho { CLREC *clrec; TypeDicOfs offs; TypeStyNum styno; - u_char rank; + unsigned char rank; #if __STDC__ - u_int sttfg : 1; - u_int sttkj : 1; - u_int ka_fg : 1; - u_int ka_kj : 1; - u_int mode : 4; + unsigned int sttfg : 1; + unsigned int sttkj : 1; + unsigned int ka_fg : 1; + unsigned int ka_kj : 1; + unsigned int mode : 4; #else - u_char sttfg : 1; - u_char sttkj : 1; - u_char ka_fg : 1; - u_char ka_kj : 1; - u_char mode : 4; + unsigned char sttfg : 1; + unsigned char sttkj : 1; + unsigned char ka_fg : 1; + unsigned char ka_kj : 1; + unsigned char mode : 4; #endif } KHREC; @@ -104,7 +104,7 @@ typedef struct kouho { typedef struct conj { - u_char len; + unsigned char len; TypeCnct right; } CREC; @@ -112,8 +112,8 @@ typedef struct conj { typedef struct fuzoku { - u_char *yomip; - u_char *fzkp; + unsigned char *yomip; + unsigned char *fzkp; } FREC; @@ -125,13 +125,13 @@ typedef struct study_in { TypeStyNum styno; TypeDicID dicid; #if __STDC__ - u_int sttkj : 1; - u_int ka_kj : 1; - u_int nmflg : 1; + unsigned int sttkj : 1; + unsigned int ka_kj : 1; + unsigned int nmflg : 1; #else - u_char sttkj : 1; - u_char ka_kj : 1; - u_char nmflg : 1; + unsigned char sttkj : 1; + unsigned char ka_kj : 1; + unsigned char nmflg : 1; #endif } STDYIN; @@ -141,15 +141,15 @@ typedef struct study_in { typedef struct study_out { STDYIN stdy1; TypeGram hinshi; - u_char len; + unsigned char len; #if __STDC__ - u_int sttlen : 2; - u_int sttfg : 1; - u_int ka_fg : 1; + unsigned int sttlen : 2; + unsigned int sttfg : 1; + unsigned int ka_fg : 1; #else - u_char sttlen : 2; - u_char sttfg : 1; - u_char ka_fg : 1; + unsigned char sttlen : 2; + unsigned char sttfg : 1; + unsigned char ka_fg : 1; #endif } STDYOUT; @@ -192,10 +192,10 @@ typedef struct stdy { STDYIN *stdydic; short clstdystep; - u_short *clstdyidx; + unsigned short *clstdyidx; short clstdylen; - u_char *clstdydic; + unsigned char *clstdydic; } STDY; #endif diff --git a/sj_struct2.h b/sj_struct2.h index 2d83c59..ed4775c 100644 --- a/sj_struct2.h +++ b/sj_struct2.h @@ -45,9 +45,9 @@ typedef struct kanji_rec { int klen; - u_char *kptr; + unsigned char *kptr; int alen; - u_char *aptr; + unsigned char *aptr; struct kanji_rec *knext; } KanjiRec; @@ -62,7 +62,7 @@ typedef struct hinsi_rec { typedef struct douon_rec { - u_char *yptr; + unsigned char *yptr; int dlen; int hrec_num; HinsiRec *hrec; @@ -73,7 +73,7 @@ typedef struct douon_rec { typedef struct hindo_rec { int klen; - u_char *kptr; + unsigned char *kptr; int exist; int hindo; @@ -95,7 +95,7 @@ typedef struct assyuku_rec { typedef struct offset_rec { int klen; - u_char *kptr; + unsigned char *kptr; int offset; } OffsetRec; diff --git a/sj_study.h b/sj_study.h index abe00bd..6c4ec37 100644 --- a/sj_study.h +++ b/sj_study.h @@ -85,7 +85,7 @@ -#define iseocl(p) ( !ClYomiLen(p) || (u_char *)(p) >= ClStudyTail ) +#define iseocl(p) ( !ClYomiLen(p) || (unsigned char *)(p) >= ClStudyTail ) @@ -104,7 +104,7 @@ #define ClHighNum(p) *(p + CL_NUMH) #define ClLowNum(p) *(p + CL_NUML) #define ClGetNum(p) (ClHighNum(p) * 0x100 + ClLowNum(p)) -#define ClSetNum(p, n) (ClHighNum(p)=(u_char)((n) >> 8), ClLowNum(p)=(u_char)(n)) +#define ClSetNum(p, n) (ClHighNum(p)=(unsigned char)((n) >> 8), ClLowNum(p)=(unsigned char)(n)) diff --git a/sj_table.h b/sj_table.h index 3cae86e..660dad4 100644 --- a/sj_table.h +++ b/sj_table.h @@ -78,13 +78,13 @@ #define StbHinsi(p) (*((p) + 1)) -extern u_char charsize[], chrtbl[], *conjadr[], connadr[]; -extern u_char *fzkadr[], kigou[], kurai1_tbl[], kurai2_tbl[]; -extern u_char num1tbl[], num2tbl[], num3tbl[], num4tbl[]; -extern u_char num5tbl[], num6tbl[], *rigtadr[], scncttbl[2][24]; -extern u_char *settou_ptr[], *stbadr[], sttpri[5][31]; -extern u_char suuji_tbl[], taipri[7][45], termtbl[]; -extern u_short *selsjadrs[]; +extern unsigned char charsize[], chrtbl[], *conjadr[], connadr[]; +extern unsigned char *fzkadr[], kigou[], kurai1_tbl[], kurai2_tbl[]; +extern unsigned char num1tbl[], num2tbl[], num3tbl[], num4tbl[]; +extern unsigned char num5tbl[], num6tbl[], *rigtadr[], scncttbl[2][24]; +extern unsigned char *settou_ptr[], *stbadr[], sttpri[5][31]; +extern unsigned char suuji_tbl[], taipri[7][45], termtbl[]; +extern unsigned short *selsjadrs[]; extern UCPFuncGK getkan_func[]; extern UCPFuncMK makekan_func[]; extern VFuncNT cvtnum_func[]; diff --git a/sj_typedef.h b/sj_typedef.h index 8f6f648..55d79e0 100644 --- a/sj_typedef.h +++ b/sj_typedef.h @@ -41,16 +41,16 @@ #include -typedef u_char TypeGroup; -typedef u_char TypeGram; -typedef u_short TypeIdxOfs; +typedef unsigned char TypeGroup; +typedef unsigned char TypeGram; +typedef unsigned short TypeIdxOfs; typedef short TypeDicSeg; -typedef u_short TypeDicOfs; +typedef unsigned short TypeDicOfs; typedef ino_t TypeDicID; -typedef u_char TypeCnct; -typedef u_short TypeStyNum; -typedef u_char TypeClass; -typedef u_char TypeBunNum; +typedef unsigned char TypeCnct; +typedef unsigned short TypeStyNum; +typedef unsigned char TypeClass; +typedef unsigned char TypeBunNum; #ifndef NULL # define NULL 0 diff --git a/sjgetchar.c b/sjgetchar.c index 3b6b2a3..6ed9988 100644 --- a/sjgetchar.c +++ b/sjgetchar.c @@ -123,7 +123,7 @@ output_master() struct strbuf ctlbuf; struct strbuf databuf; int flags = 0; - u_char ctlstuff; + unsigned char ctlstuff; int f, stop, ixon, ret; struct iocblk *ioc; struct termios *tp; @@ -158,13 +158,13 @@ output_master() switch (ctlstuff) { case M_DATA: - write_stdout((u_char *)&outbuf[0], databuf.len); + write_stdout((unsigned char *)&outbuf[0], databuf.len); fflush (stdout); while (ret & MOREDATA) { if ((ret = getmsg(master, &ctlbuf, &databuf, &flags)) == -1) { return; } - write_stdout((u_char *)&outbuf[0], databuf.len); + write_stdout((unsigned char *)&outbuf[0], databuf.len); fflush (stdout); } return; @@ -270,7 +270,7 @@ output_master() m = outbuf[0]; if (m == TIOCPKT_DATA) { - write_stdout((u_char *)&outbuf[1], n - 1); + write_stdout((unsigned char *)&outbuf[1], n - 1); fflush (stdout); return; @@ -332,7 +332,7 @@ int n; { int val; wchar16_t wb[BUFFLENGTH]; - u_char buff[BUFFLENGTH * 3]; + unsigned char buff[BUFFLENGTH * 3]; wsncpy(wb, s, n); wb[n] = 0; @@ -349,10 +349,10 @@ int n; } write_stdout(s, n) -u_char *s; +unsigned char *s; int n; { - static u_char knj1st = 0, knj2nd = 0; + static unsigned char knj1st = 0, knj2nd = 0; while (n-- > 0) { if (knj1st) { @@ -383,7 +383,7 @@ SJ_read (s, n) wchar16_t *s; int n; { - u_char buff[BUFFLENGTH]; + unsigned char buff[BUFFLENGTH]; wchar16_t wcbuff[BUFFLENGTH]; int i, count, remain, c; size_t wnum; @@ -470,7 +470,7 @@ wchar16_t *s; SJ_print (s) wchar16_t *s; { - u_char buff[BUFFLENGTH * 3]; + unsigned char buff[BUFFLENGTH * 3]; size_t num; num = wcstombs((char *) buff, s, (size_t ) (BUFFLENGTH * 3)); diff --git a/sjrc.c b/sjrc.c index d51dcd8..197c8cf 100644 --- a/sjrc.c +++ b/sjrc.c @@ -193,7 +193,7 @@ getword (s, word) char *s; struct wordent word[]; { - u_char c, cc; + unsigned char c, cc; char *p; int i, wcount; @@ -280,28 +280,28 @@ struct wordent word[]; int IsTerminator (c) -u_char c; +unsigned char c; { return (c == '\n') ? 1 : 0; } int isTerminator (c) -u_char c; +unsigned char c; { return (c == '#') ? 1 : 0; } int IsEscape (c) -u_char c; +unsigned char c; { return (c == '\\') ? 1 : 0; } int IsDelimitor (c) -u_char c; +unsigned char c; { return (c == ' ' || c == '\t' || c == '.') ? 1 : 0; } diff --git a/sjrc2.c b/sjrc2.c index b935e5a..e6b9912 100644 --- a/sjrc2.c +++ b/sjrc2.c @@ -291,17 +291,17 @@ wchar16_t *s1, *s2; getword (s, word) -u_char *s; +unsigned char *s; struct wordent word[]; { - u_char c; + unsigned char c; wchar16_t *w; wchar16_t wcbuf[MAXLINE*2]; wchar16_t ttmp[MAXLINE]; - u_char buf[MAXLINE*2]; - u_char *p; + unsigned char buf[MAXLINE*2]; + unsigned char *p; int i, wcount; - u_short cc; + unsigned short cc; if (IsDelimitor(*s)) { s++; @@ -317,9 +317,9 @@ struct wordent word[]; (void) mbstowcs(wcbuf, (char *)p, MAXLINE*2); } else { if (file_code == SJ3_SJIS) { - (void) sjistoeuc(buf, MAXLINE*2, (u_char *)p, MAXLINE); + (void) sjistoeuc(buf, MAXLINE*2, (unsigned char *)p, MAXLINE); } else if (file_code == SJ3_EUC) { - (void) euctosjis(buf, MAXLINE*2, (u_char *)p, MAXLINE); + (void) euctosjis(buf, MAXLINE*2, (unsigned char *)p, MAXLINE); } else { (void) strcpy(buf, p); } @@ -402,7 +402,7 @@ struct wordent word[]; } IsTerminator (c) -u_char c; +unsigned char c; { if (c == '\n') return (1); @@ -411,7 +411,7 @@ u_char c; } isTerminator (c) -u_char c; +unsigned char c; { if (c == '#') return (1); @@ -420,7 +420,7 @@ u_char c; } IsEscape (c) -u_char c; +unsigned char c; { if (c == '\\') return (1); @@ -429,7 +429,7 @@ u_char c; } IsDelimitor (c) -u_char c; +unsigned char c; { if (c == ' ' || c == '\t' || c == '.') return (1); @@ -471,7 +471,7 @@ struct wordent word[]; } isintr (c) -u_char c; +unsigned char c; { if (c == intr_code) return (1); @@ -490,7 +490,7 @@ struct wordent word[]; } IsGoto (c) -u_char c; +unsigned char c; { int i; @@ -512,7 +512,7 @@ struct wordent word[]; } IsTrap (c) -u_char c; +unsigned char c; { int i; diff --git a/skiphblk.c b/skiphblk.c index 8384ebf..e7f5fb7 100644 --- a/skiphblk.c +++ b/skiphblk.c @@ -39,10 +39,10 @@ #include "sj_typedef.h" #include "sj_dict.h" -u_char *skipkstr(); +unsigned char *skipkstr(); -u_char *skiphblk(ptr) -u_char *ptr; +unsigned char *skiphblk(ptr) +unsigned char *ptr; { ptr++; diff --git a/skipkstr.c b/skipkstr.c index a210036..591efda 100644 --- a/skipkstr.c +++ b/skipkstr.c @@ -36,8 +36,8 @@ #include "kanakan.h" -u_char* -skipkstr(u_char* ptr) +unsigned char* +skipkstr(unsigned char* ptr) { int contf = TRUE, csize; diff --git a/srchdict.c b/srchdict.c index 5e39cba..8627829 100644 --- a/srchdict.c +++ b/srchdict.c @@ -43,7 +43,7 @@ int -yomicmp(u_char* ptr1, u_char* ptr2, u_char* saml) +yomicmp(unsigned char* ptr1, unsigned char* ptr2, unsigned char* saml) { int i, j; int same; @@ -87,8 +87,8 @@ yomicmp(u_char* ptr1, u_char* ptr2, u_char* saml) } -u_char* -srchdict(u_char* tagp) +unsigned char* +srchdict(unsigned char* tagp) { TypeDicSeg segno; int cmp; diff --git a/srchidx.c b/srchidx.c index fb4a505..9b79569 100644 --- a/srchidx.c +++ b/srchidx.c @@ -49,7 +49,7 @@ srchidx(TypeDicSeg low, int len) TypeDicSeg high; TypeDicSeg mid; int cmp; - u_char *target; + unsigned char *target; if ((high = curdict->segunit - 1) < 1) return 0; diff --git a/srchnum.c b/srchnum.c index c211015..b93f850 100644 --- a/srchnum.c +++ b/srchnum.c @@ -45,13 +45,13 @@ #include "kanakan.h" -static void srch_kurai1(u_char* ptr, u_char* cnct); -static void srch_kurai2(u_char* ptr, u_char* cnct); +static void srch_kurai1(unsigned char* ptr, unsigned char* cnct); +static void srch_kurai2(unsigned char* ptr, unsigned char* cnct); static void srch_josuu_sub(JREC *jrec, TypeGram gram) { - u_char *tagp; + unsigned char *tagp; DICTL *dp; for (dp = dictlist ; dp ; dp = dp -> next) { @@ -67,7 +67,7 @@ srch_josuu_sub(JREC *jrec, TypeGram gram) static void srch_josuu(JREC *jrec) { - u_char *kp; + unsigned char *kp; int klen; int len; @@ -88,7 +88,7 @@ srch_josuu(JREC *jrec) } static void -setnrec_sub(u_char* p, u_short flag, int stb) +setnrec_sub(unsigned char* p, unsigned short flag, int stb) { JREC *rec; int len1; @@ -100,7 +100,7 @@ setnrec_sub(u_char* p, u_short flag, int stb) if ((int)suuji_len == len2) { if (suuji_wkeep) { - memcpy((u_char*)suuji_wbuf, (u_char*)suuji_wkeep, + memcpy((unsigned char*)suuji_wbuf, (unsigned char*)suuji_wkeep, sizeof(suuji_wbuf[0]) * NumWordBuf); } if (suuji_ukeep) { @@ -114,16 +114,16 @@ setnrec_sub(u_char* p, u_short flag, int stb) rec -> class = suuji_class; rec -> hinsi = SUUSI; rec -> sttofs = headcode; - rec -> stbofs = (u_char)stb; + rec -> stbofs = (unsigned char)stb; rec -> flags = flag; - rec -> numlen = (u_char)len2; + rec -> numlen = (unsigned char)len2; if (!stb) srch_josuu(rec); } } static void -setnrec(u_char* p, u_short flag) +setnrec(unsigned char* p, unsigned short flag) { setnrec_sub(p, flag, 0); @@ -132,11 +132,11 @@ setnrec(u_char* p, u_short flag) } } -static u_char* -srchtbl(u_char ch, u_char* tbl, int rec, int n) +static unsigned char* +srchtbl(unsigned char ch, unsigned char* tbl, int rec, int n) { int high, low, mid; - u_char *p; + unsigned char *p; if (!ch) return NULL; @@ -165,15 +165,15 @@ srchtbl(u_char ch, u_char* tbl, int rec, int n) } static int -isconnect(u_char* cnct, int num) +isconnect(unsigned char* cnct, int num) { return (cnct[num / 8] & (0x80 >> (num % 8))); } static int -string_cmp(u_char* s, int l, u_char* d) +string_cmp(unsigned char* s, int l, unsigned char* d) { - u_char *p; + unsigned char *p; p = s; @@ -187,7 +187,7 @@ string_cmp(u_char* s, int l, u_char* d) } static int -check_num(u_char* ptr) +check_num(unsigned char* ptr) { int i; int j; @@ -197,9 +197,9 @@ check_num(u_char* ptr) int lketa; int flg = FALSE; int cnt; - u_short flag; + unsigned short flag; - memset((u_char*)suuji_wbuf, 0, sizeof(u_short) * NumWordBuf); + memset((unsigned char*)suuji_wbuf, 0, sizeof(unsigned short) * NumWordBuf); flag = 0; hketa = lketa = cnt = 0; @@ -276,15 +276,15 @@ check_num(u_char* ptr) } static void -srch_number1(u_char* ptr) +srch_number1(unsigned char* ptr) { - u_char ch; - u_char mode; - u_char *p; + unsigned char ch; + unsigned char mode; + unsigned char *p; int l; TypeClass cls; int len; - u_char *tptr; + unsigned char *tptr; if (suuji_keta >= NumKetaLength) return; @@ -308,7 +308,7 @@ srch_number1(u_char* ptr) check_num(tptr); srch_number1(tptr); - srch_kurai2(tptr, (u_char*)NULL); + srch_kurai2(tptr, (unsigned char*)NULL); break; @@ -317,8 +317,8 @@ srch_number1(u_char* ptr) check_num(tptr); srch_number1(tptr); - srch_kurai1(tptr, (u_char*)NULL); - srch_kurai2(tptr, (u_char*)NULL); + srch_kurai1(tptr, (unsigned char*)NULL); + srch_kurai2(tptr, (unsigned char*)NULL); break; @@ -342,7 +342,7 @@ srch_number1(u_char* ptr) suuji_class = C_N_ARABIA; check_num(tptr); srch_number1(tptr); - srch_kurai2(tptr, (u_char*)NULL); + srch_kurai2(tptr, (unsigned char*)NULL); suuji_class = C_N_KAZU; } @@ -376,16 +376,16 @@ srch_number1(u_char* ptr) } static void -srch_kurai1(u_char* ptr, u_char* cnct) +srch_kurai1(unsigned char* ptr, unsigned char* cnct) { - u_char ch; - u_char *p; + unsigned char ch; + unsigned char *p; int l; int keta; int mode; TypeClass cls; int len; - u_char *tptr; + unsigned char *tptr; if (!(p = srchtbl((ch = *ptr), Kurai1_tbl, Kr1TblRecLen, Kr1TblRecNum))) return; @@ -425,7 +425,7 @@ srch_kurai1(u_char* ptr, u_char* cnct) check_num(tptr); srch_number1(tptr); - srch_kurai1(tptr, (u_char*)NULL); + srch_kurai1(tptr, (unsigned char*)NULL); srch_kurai2(tptr, Kr1TblCnctP(p)); if (cnct) @@ -436,16 +436,16 @@ srch_kurai1(u_char* ptr, u_char* cnct) } static void -srch_kurai2(u_char* ptr, u_char* cnct) +srch_kurai2(unsigned char* ptr, unsigned char* cnct) { - u_char ch; - u_char *p; + unsigned char ch; + unsigned char *p; int l; int keta; int mode; TypeClass cls; int len; - u_char *tptr; + unsigned char *tptr; if ((suuji_ubuf[0] & 0x0f) == _Num0) return; @@ -486,7 +486,7 @@ srch_kurai2(u_char* ptr, u_char* cnct) check_num(tptr); srch_number1(tptr); - srch_kurai1(tptr, (u_char*)NULL); + srch_kurai1(tptr, (unsigned char*)NULL); if (cnct) suuji_ubuf[suuji_keta - 1] &= 0x3f; @@ -496,9 +496,9 @@ srch_kurai2(u_char* ptr, u_char* cnct) } static void -srch_number2(u_char* p) +srch_number2(unsigned char* p) { - u_char ch; + unsigned char ch; int i; suuji_class = (*p == N_0) ? C_N_SUUJILONG : C_N_KAZULONG; @@ -551,7 +551,7 @@ srch_number2(u_char* p) } static void -srchnum_sub(u_char* p) +srchnum_sub(unsigned char* p) { suuji_yptr = p; @@ -561,7 +561,7 @@ srchnum_sub(u_char* p) suuji_keta = 0; suuji_class = C_N_KAZU; - srch_kurai1(p, (u_char*)NULL); + srch_kurai1(p, (unsigned char*)NULL); if (suuji_exit) return; srch_number2(p); @@ -585,9 +585,9 @@ srchnum(void) } void -setwdnum(u_char* p, int len, u_short* wd) +setwdnum(unsigned char* p, int len, unsigned short* wd) { - suuji_len = (u_char)len; + suuji_len = (unsigned char)len; suuji_wkeep = wd; suuji_ukeep = NULL; headcode = headlen = 0; @@ -597,9 +597,9 @@ setwdnum(u_char* p, int len, u_short* wd) } int -setucnum(u_char* p, int len, u_char* ud) +setucnum(unsigned char* p, int len, unsigned char* ud) { - suuji_len = (u_char)len; + suuji_len = (unsigned char)len; suuji_wkeep = NULL; suuji_ukeep = ud; headcode = headlen = 0; diff --git a/stat_conv.c b/stat_conv.c index 98627ec..e27f29c 100644 --- a/stat_conv.c +++ b/stat_conv.c @@ -126,11 +126,11 @@ pointer_clear () typedef struct _SaveSet { wchar16_t out_buf[BUFFLENGTH * 2]; - u_short out_mode[BUFFLENGTH * 2]; - u_short out_point; - u_short ha_point; + unsigned short out_mode[BUFFLENGTH * 2]; + unsigned short out_point; + unsigned short ha_point; wchar16_t Halpha[BUFFLENGTH]; - u_char in_mode[BUFFLENGTH * 2]; + unsigned char in_mode[BUFFLENGTH * 2]; } SaveSet; static SaveSet save_set0; @@ -146,9 +146,9 @@ StoreSaveSet () sv->out_point = cv->out_point; sv->ha_point = cv->ha_point; memcpy (sv->out_mode, cv->out_mode, - cv->out_point * sizeof(u_short)); + cv->out_point * sizeof(unsigned short)); memcpy (sv->in_mode, cv->in_mode, - cv->out_point * sizeof(u_char)); + cv->out_point * sizeof(unsigned char)); wscpy (sv->Halpha, cv->Halpha); wscpy (sv->out_buf, cv->out_buf); } @@ -165,9 +165,9 @@ RestoreSaveSet () cv->out_point = sv->out_point; cv->ha_point = sv->ha_point; memcpy (cv->out_mode, sv->out_mode, - sv->out_point * sizeof(u_short)); + sv->out_point * sizeof(unsigned short)); memcpy (cv->in_mode, sv->in_mode, - sv->out_point * sizeof(u_char)); + sv->out_point * sizeof(unsigned char)); wscpy (cv->Halpha, sv->Halpha); wscpy (cv->out_buf, sv->out_buf); } @@ -390,7 +390,7 @@ stat_conv () extern int allways_buff; int inc; int i; - u_short svlen; + unsigned short svlen; cv = GetConversion (); cv->word_regist = 0; diff --git a/stbtbl.c b/stbtbl.c index 588d16f..f3e4b79 100644 --- a/stbtbl.c +++ b/stbtbl.c @@ -40,7 +40,7 @@ #include "sj_typedef.h" #include "sj_yomi.h" #include "sj_hinsi.h" -static u_char name_stb[] = { +static unsigned char name_stb[] = { 0x22, MEISI_1, _KU, _NN, 0xb7, 0xaf, 0x22, MEISI_1, _SA, _MA, @@ -56,7 +56,7 @@ static u_char name_stb[] = { 0x00 }; -static u_char timei_stb[] = { +static unsigned char timei_stb[] = { 0x22, MEISI_1, _E, _KI, 0xb1, 0xd8, 0x44, MEISI_1, _E, _KI, _HA, _TU, @@ -78,7 +78,7 @@ static u_char timei_stb[] = { 0x00 }; -static u_char meisi_stb[] = { +static unsigned char meisi_stb[] = { 0x44, MEISI_6, _A, _TU, _KA, _I, 0xb0, 0xb7, 0xa4, 0xa4, 0x1a, MEISI_6, _KA, @@ -94,7 +94,7 @@ static u_char meisi_stb[] = { 0x00 }; -static u_char sahen_stb[] = { +static unsigned char sahen_stb[] = { 0x44, MEISI_6, _A, _TU, _KA, _I, 0xb0, 0xb7, 0xa4, 0xa4, 0x1a, MEISI_6, _KA, @@ -120,13 +120,13 @@ static u_char sahen_stb[] = { 0x00 }; -static u_char human_stb[] = { +static unsigned char human_stb[] = { 0x24, MEISI_1, _SA, _NN, 0xa4, 0xb5, 0xa4, 0xf3, 0x00 }; -static u_char ippan_stb[] = { +static unsigned char ippan_stb[] = { 0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _I, 0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa4, 0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _U, @@ -134,7 +134,7 @@ static u_char ippan_stb[] = { 0x00 }; -u_char *stbadr[] = { +unsigned char *stbadr[] = { 0, ippan_stb, ippan_stb, ippan_stb, meisi_stb, sahen_stb, sahen_stb, sahen_stb, meisi_stb, meisi_stb, meisi_stb, diff --git a/string2.c b/string2.c index 0871bfb..84a0cd3 100644 --- a/string2.c +++ b/string2.c @@ -34,9 +34,9 @@ int -bubun_str(u_char* p1, int l1, u_char* p2, int l2) +bubun_str(unsigned char* p1, int l1, unsigned char* p2, int l2) { - u_char *p; + unsigned char *p; int l; int i; @@ -74,13 +74,13 @@ bubun_str(u_char* p1, int l1, u_char* p2, int l2) int -overlap_str(u_char *p1, int l1, u_char* p2, int l2) +overlap_str(unsigned char *p1, int l1, unsigned char* p2, int l2) { - u_char *p; + unsigned char *p; int l; int i; int j; - u_char tmp[MaxKanjiLength * 2 + MaxAtrNumber * 2]; + unsigned char tmp[MaxKanjiLength * 2 + MaxAtrNumber * 2]; for (p = p1, l = l1 ; l > 0 ; ) { @@ -194,7 +194,7 @@ last_strcmp(int* src, int* dst) int -string_cmp(u_char* p1, int l1, u_char* p2, int l2) +string_cmp(unsigned char* p1, int l1, unsigned char* p2, int l2) { while (l1 > 0 && l2 > 0) { if (*p1 != *p2) return (*p1 - *p2); diff --git a/stttbl.c b/stttbl.c index 22c0ecd..8f30706 100644 --- a/stttbl.c +++ b/stttbl.c @@ -41,31 +41,31 @@ -static u_char o_settou[] = { +static unsigned char o_settou[] = { 0xA1, 0xb8, 0xe6, 0xa4, 0xaa }; -static u_char go_settou[] = { +static unsigned char go_settou[] = { 0xA1, 0xb8, 0xe6, 0xa4, 0xb4 }; -static u_char dai_settou[] = { +static unsigned char dai_settou[] = { 0x22, 0xc2, 0xe8, 0xc2, 0xe8 }; -static u_char kigou_settou[] = { +static unsigned char kigou_settou[] = { 0x01 }; -u_char *settou_ptr[] = { +unsigned char *settou_ptr[] = { NULL, o_settou, go_settou, dai_settou, kigou_settou }; -u_char scncttbl[2][24] = { +unsigned char scncttbl[2][24] = { { 0x48, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/study.c b/study.c index 6399d1e..1c3378b 100644 --- a/study.c +++ b/study.c @@ -57,7 +57,7 @@ study(STDYOUT *stdy) if (!StudyExist()) return StudyNoDict; - memcpy((u_char *)stdy, (u_char *)&outp, sizeof(outp)); + memcpy((unsigned char *)stdy, (unsigned char *)&outp, sizeof(outp)); if (outp.stdy1.offset == 0) return StudyNotStudy; @@ -95,7 +95,7 @@ study(STDYOUT *stdy) } if (p2) { - mvmemi((u_char *)(p2 + 1), (u_char *)p2, + mvmemi((unsigned char *)(p2 + 1), (unsigned char *)p2, (StudyTail - p2) * StudyRecSize); StudyCount -= 1; } @@ -123,8 +123,8 @@ study(STDYOUT *stdy) p1++; } - mvmemd((u_char *)(StudyTail - 1), (u_char *)StudyTail, - (u_char *)(StudyTail - 1) - (u_char *)p1); + mvmemd((unsigned char *)(StudyTail - 1), (unsigned char *)StudyTail, + (unsigned char *)(StudyTail - 1) - (unsigned char *)p1); p1 -> offset = outp.stdy1.offset; p1 -> seg = outp.stdy1.seg; p1 -> dicid = outp.stdy1.dicid; diff --git a/suujitbl.c b/suujitbl.c index 7eff209..97ed0b7 100644 --- a/suujitbl.c +++ b/suujitbl.c @@ -40,7 +40,7 @@ -u_char suuji_tbl[] = { +unsigned char suuji_tbl[] = { N_0,_NIL,_NIL, _Num0 | NA, 0x00, 0x00, N_1,_NIL,_NIL, _Num1 | NA, 0xec, 0x07, N_2,_NIL,_NIL, _Num2 | NA, 0xec, 0x07, @@ -80,7 +80,7 @@ u_char suuji_tbl[] = { -u_char kurai1_tbl[] = { +unsigned char kurai1_tbl[] = { _ZI,_XYU,_U, (1<<4)+0+Kr1TblTopF, 0x05, _ZI,_XYU,_XTU, (1<<4)+1+Kr1TblTopF, 0x02, _SE,_NN, _NIL, (3<<4)+2+Kr1TblTopF, 0x07, @@ -96,7 +96,7 @@ u_char kurai1_tbl[] = { -u_char kurai2_tbl[] = { +unsigned char kurai2_tbl[] = { _O, _KU, _NIL, (2<<4)+13, _TI,_XYO,_U, (3<<4)+14, _MA,_NN, _NIL, (1<<4)+15, @@ -105,7 +105,7 @@ u_char kurai2_tbl[] = { -u_char num1tbl[] = { +unsigned char num1tbl[] = { 0xa3, 0xb0, 0xa3, 0xb1, 0xa3, 0xb2, @@ -123,7 +123,7 @@ u_char num1tbl[] = { -u_char num2tbl[] = { +unsigned char num2tbl[] = { 0xa1, 0xbb, 0xb0, 0xec, 0xc6, 0xf3, @@ -141,7 +141,7 @@ u_char num2tbl[] = { -u_char num3tbl[] = { +unsigned char num3tbl[] = { 0xce, 0xed, 0xb0, 0xed, 0xc6, 0xf5, @@ -159,7 +159,7 @@ u_char num3tbl[] = { -u_char num4tbl[] = { +unsigned char num4tbl[] = { 0xc0, 0xe9, 0xc9, 0xb4, 0xbd, 0xbd, @@ -168,7 +168,7 @@ u_char num4tbl[] = { -u_char num5tbl[] = { +unsigned char num5tbl[] = { 0xc0, 0xe9, 0xc9, 0xb4, 0xbd, 0xa6, @@ -177,7 +177,7 @@ u_char num5tbl[] = { -u_char num6tbl[] = { +unsigned char num6tbl[] = { 0xc3, 0xfb, 0xb2, 0xaf, 0xcb, 0xfc, diff --git a/terminat.c b/terminat.c index 3e42c4f..3a5dc84 100644 --- a/terminat.c +++ b/terminat.c @@ -40,9 +40,9 @@ int terminate(right, yomi) TypeCnct right; -u_char *yomi; +unsigned char *yomi; { - u_char ch; + unsigned char ch; if ((yomi > cnvstart) && (Chrtbl[*(yomi - 1)] & NUMBER)) diff --git a/termtbl.c b/termtbl.c index 1b7c555..9b258b1 100644 --- a/termtbl.c +++ b/termtbl.c @@ -33,7 +33,7 @@ #include "sj_prty.h" -u_char termtbl[] = { +unsigned char termtbl[] = { 0, T_KANOU + P_JOSHI_B, T_KANOU + P_JOSHI_A, diff --git a/toroku.c b/toroku.c index e581e70..f07ab3f 100644 --- a/toroku.c +++ b/toroku.c @@ -124,7 +124,7 @@ int lim; Conversion *cv; int len; wchar16_t wtmp[BUFFLENGTH], ytmp[YOMILEN+1], ktmp[KLEN+1]; - u_char tmp[BUFFLENGTH]; + unsigned char tmp[BUFFLENGTH]; cv = GetConversion(); TopGuide (); @@ -212,10 +212,10 @@ getcheck (yomi, kanji, hinshi, prompt) wchar16_t *yomi, *kanji, *hinshi, *prompt; { int c; - u_char tmp[BUFFLENGTH + KLEN]; + unsigned char tmp[BUFFLENGTH + KLEN]; extern wchar16_t *Y; wchar16_t wtmp[BUFFLENGTH + KLEN]; - u_char ktmp[KLEN+1], ytmp[YOMILEN+1], htmp[YOMILEN+1], + unsigned char ktmp[KLEN+1], ytmp[YOMILEN+1], htmp[YOMILEN+1], ttmp[BUFFLENGTH]; TopGuide (); @@ -305,7 +305,7 @@ wchar16_t *kanji, *guide; int c; int bstart, bend; int i; - u_short row, col; + unsigned short row, col; wchar16_t *p; int plen, len; @@ -405,7 +405,7 @@ exec_syoukyo () int i; wchar16_t yomi[YOMILEN+1], kanji[KLEN+1]; wchar16_t tmp[BUFFLENGTH], tmp2[BUFFLENGTH * 2]; - u_char ytmp[YOMILEN+1], ktmp[KLEN+1], + unsigned char ytmp[YOMILEN+1], ktmp[KLEN+1], mtmp[BUFFLENGTH], mtmp2[BUFFLENGTH * 2], ttmp[BUFFLENGTH]; int inc; diff --git a/wakachi.c b/wakachi.c index 39a49d8..aef9e26 100644 --- a/wakachi.c +++ b/wakachi.c @@ -52,7 +52,7 @@ wakachi (void) CREC crec[4]; int count; - u_char *next; + unsigned char *next; TypeCnct right; int i; int maxlen;