From 2f1cc2607e4e2f5ec0b081053c0caf89acfdf407 Mon Sep 17 00:00:00 2001
From: Nishi <nishi@nishi.boats>
Date: Wed, 23 Sep 2026 20:18:46 +0900
Subject: [PATCH] formatting change

---
 lib/sj4common/bsd-snprintf.c |  3 +-
 lib/sj4common/sj_string.c    | 15 +++-----
 lib/sj4common/strlcpy.c      |  3 +-
 lib/sj4core/adddic.c         | 18 ++++------
 lib/sj4core/addelcmn.c       | 21 ++++--------
 lib/sj4core/alloc.c          |  3 +-
 lib/sj4core/cl2knj.c         |  9 ++---
 lib/sj4core/clstudy.c        |  9 ++---
 lib/sj4core/cvtdict.c        | 24 ++++---------
 lib/sj4core/cvtkanji.c       |  4 +--
 lib/sj4core/deldic.c         | 12 +++----
 lib/sj4core/dict.c           |  3 +-
 lib/sj4core/fuzoku.c         | 20 ++++-------
 lib/sj4core/getkanji.c       | 24 +++++--------
 lib/sj4core/getrank.c        | 32 +++++------------
 lib/sj4core/memory.c         | 11 ++----
 lib/sj4core/mk2claus.c       |  4 +--
 lib/sj4core/mkbunset.c       | 10 ++----
 lib/sj4core/mkjiritu.c       | 10 ++----
 lib/sj4core/mkkouho.c        | 36 +++++++-------------
 lib/sj4core/mknumber.c       | 12 +++----
 lib/sj4core/peepdic.c        | 33 ++++++------------
 lib/sj4core/ph_khtbl.c       |  7 ++--
 lib/sj4core/priority.c       | 46 +++++++------------------
 lib/sj4core/sdepend.c        | 66 ++++++++++++------------------------
 lib/sj4core/selclrec.c       |  4 +--
 lib/sj4core/setconj.c        | 14 +++-----
 lib/sj4core/setjrec.c        |  4 +--
 lib/sj4core/setkouho.c       |  3 +-
 lib/sj4core/setubi.c         |  3 +-
 lib/sj4core/skiphblk.c       |  3 +-
 lib/sj4core/skipkstr.c       |  3 +-
 lib/sj4core/srchdict.c       | 34 +++++--------------
 lib/sj4core/srchhead.c       |  8 ++---
 lib/sj4core/srchidx.c        | 11 ++----
 lib/sj4core/srchnum.c        | 39 +++++++--------------
 lib/sj4core/study.c          |  3 +-
 lib/sj4core/wakachi.c        |  4 +--
 lib/sj4rkcv/rk_conv.c        |  3 +-
 lib/sj4rkcv/sj4_rkcv.c       |  6 ++--
 lib/sj4rkcv/wc16_str.c       | 21 ++++--------
 src/sj4mkdic/cnvhinsi.c      |  8 ++---
 src/sj4mkdic/file.c          |  9 ++---
 src/sj4mkdic/hindo.c         | 27 +++++----------
 src/sj4mkdic/knjcvt.c        | 12 +++----
 src/sj4mkdic/makelist.c      | 33 ++++++------------
 src/sj4mkdic/makeseg.c       |  3 +-
 src/sj4mkdic/offset.c        |  6 ++--
 48 files changed, 217 insertions(+), 479 deletions(-)

diff --git a/lib/sj4common/bsd-snprintf.c b/lib/sj4common/bsd-snprintf.c
index 2414c15..6538b5f 100644
--- a/lib/sj4common/bsd-snprintf.c
+++ b/lib/sj4common/bsd-snprintf.c
@@ -531,8 +531,7 @@ static void fmtint(char* buffer, size_t* currlen, size_t maxlen,
 	while(place > 0)
 		dopr_outch(buffer, currlen, maxlen, convert[--place]);
 
-	/* Left Justified spaces */
-	while(spadlen < 0) {
+	/* Left Justified spaces */ while(spadlen < 0) {
 		dopr_outch(buffer, currlen, maxlen, ' ');
 		++spadlen;
 	}
diff --git a/lib/sj4common/sj_string.c b/lib/sj4common/sj_string.c
index 14dd44c..ae0a159 100644
--- a/lib/sj4common/sj_string.c
+++ b/lib/sj4common/sj_string.c
@@ -227,8 +227,7 @@ void sj_sjis2jis(unsigned char* s) {
 	}
 }
 
-unsigned short
-sj4_jis2sjis(unsigned short code) {
+unsigned short sj4_jis2sjis(unsigned short code) {
 	unsigned char tmp[3];
 
 	tmp[0] = (code >> 8) & 0xff;
@@ -242,8 +241,7 @@ sj4_jis2sjis(unsigned short code) {
 	return (code);
 }
 
-unsigned short
-sj4_jis2euc(unsigned short code) {
+unsigned short sj4_jis2euc(unsigned short code) {
 	unsigned char tmp[3];
 
 	tmp[0] = (code >> 8) & 0xff;
@@ -255,8 +253,7 @@ sj4_jis2euc(unsigned short code) {
 	return (code);
 }
 
-unsigned short
-sj4_sjis2jis(unsigned short code) {
+unsigned short sj4_sjis2jis(unsigned short code) {
 	unsigned char tmp[3];
 
 	tmp[0] = (code >> 8) & 0xff;
@@ -270,8 +267,7 @@ sj4_sjis2jis(unsigned short code) {
 	return (code);
 }
 
-unsigned short
-sj4_euc2sjis(unsigned short code) {
+unsigned short sj4_euc2sjis(unsigned short code) {
 	unsigned char tmp[3];
 
 	tmp[0] = (code >> 8) & 0xff;
@@ -285,8 +281,7 @@ sj4_euc2sjis(unsigned short code) {
 	return (code);
 }
 
-unsigned short
-sj4_sjis2euc(unsigned short code) {
+unsigned short sj4_sjis2euc(unsigned short code) {
 	unsigned char tmp[3];
 
 	tmp[0] = (code >> 8) & 0xff;
diff --git a/lib/sj4common/strlcpy.c b/lib/sj4common/strlcpy.c
index e39d201..6e964e0 100644
--- a/lib/sj4common/strlcpy.c
+++ b/lib/sj4common/strlcpy.c
@@ -27,8 +27,7 @@
  * will be copied.  Always NUL terminates (unless siz == 0).
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
-size_t
-sj4_strlcpy(char* dst, const char* src, size_t siz) {
+size_t sj4_strlcpy(char* dst, const char* src, size_t siz) {
 	char*	    d = dst;
 	const char* s = src;
 	size_t	    n = siz;
diff --git a/lib/sj4core/adddic.c b/lib/sj4core/adddic.c
index e883a47..3e5696d 100644
--- a/lib/sj4core/adddic.c
+++ b/lib/sj4core/adddic.c
@@ -294,8 +294,7 @@ u_int adddic(SJ4_CONTEXT u_char* yomi, u_char* kanji, TypeGram hinsi) {
 	return AD_DONE;
 }
 
-static int
-checksub(SJ4_CONTEXT u_char* kanji, TypeGram grm) {
+static int checksub(SJ4_CONTEXT u_char* kanji, TypeGram grm) {
 	u_char* tagp = NULL;
 	u_char* ptr;
 	u_char* endp;
@@ -338,8 +337,7 @@ checksub(SJ4_CONTEXT u_char* kanji, TypeGram grm) {
 	return dounum;
 }
 
-static u_int
-checkdict(SJ4_CONTEXT u_char* kanji, TypeGram grm) {
+static u_int checkdict(SJ4_CONTEXT u_char* kanji, TypeGram grm) {
 	DICTL* dp;
 	int    dounum = 0;
 	int    tmp;
@@ -365,8 +363,7 @@ checkdict(SJ4_CONTEXT u_char* kanji, TypeGram grm) {
 	return 0;
 }
 
-static int
-cal_nextym(SJ4_CONTEXT u_char* ptr) {
+static int cal_nextym(SJ4_CONTEXT u_char* ptr) {
 	int	count = 0;
 	u_char* src;
 	int	len;
@@ -387,8 +384,7 @@ cal_nextym(SJ4_CONTEXT u_char* ptr) {
 	return count;
 }
 
-static int
-usr_freelen(SJ4_CONTEXT2) {
+static int usr_freelen(SJ4_CONTEXT2) {
 	u_char* ptr;
 
 	ptr = segtop();
@@ -398,8 +394,7 @@ usr_freelen(SJ4_CONTEXT2) {
 	return curdict->seglen - (ptr - dicbuf);
 }
 
-static void
-sprt_seg(SJ4_CONTEXT TypeDicSeg seg, TypeDicOfs ofs) {
+static void sprt_seg(SJ4_CONTEXT TypeDicSeg seg, TypeDicOfs ofs) {
 	TypeDicSeg s;
 	u_char*	   pos;
 	u_char*	   p;
@@ -472,8 +467,7 @@ sprt_seg(SJ4_CONTEXT TypeDicSeg seg, TypeDicOfs ofs) {
 	(*curdict->putdic)(SJ4_CONTEXT_PASS curdict, seg);
 }
 
-static void
-apnd_uidx(SJ4_CONTEXT TypeDicSeg seg, u_char* yomi, int len) {
+static void apnd_uidx(SJ4_CONTEXT TypeDicSeg seg, u_char* yomi, int len) {
 	u_char* p;
 	u_char* q;
 
diff --git a/lib/sj4core/addelcmn.c b/lib/sj4core/addelcmn.c
index 6b16422..eb5998f 100644
--- a/lib/sj4core/addelcmn.c
+++ b/lib/sj4core/addelcmn.c
@@ -42,8 +42,7 @@ void set_size(u_char* p, int size, int plen, int nlen) {
 	*(p + 2) = (u_char)((nlen & 0x0f) | ((plen & 0x0f) << 4));
 }
 
-static int
-isvyomi(u_char* yp) {
+static int isvyomi(u_char* yp) {
 	int len;
 
 	if(!*yp) return FALSE;
@@ -59,8 +58,7 @@ isvyomi(u_char* yp) {
 	return TRUE;
 }
 
-static int
-isvknj(u_char* kanji) {
+static int isvknj(u_char* kanji) {
 	int len;
 
 	if(!*kanji) return FALSE;
@@ -87,8 +85,7 @@ isvknj(u_char* kanji) {
 	return TRUE;
 }
 
-static int
-isgrm(TypeGram gram) {
+static int isgrm(TypeGram gram) {
 	int grm = gram;
 
 	if(MEISI_1 <= grm && grm <= D_MEISI_6) return TRUE;
@@ -120,8 +117,7 @@ u_int addel_arg(SJ4_CONTEXT u_char* yp, u_char* kp, TypeGram grm, u_char* nyp, i
 	return err;
 }
 
-static void
-yomi2kata(u_char* src, u_char* dst) {
+static void yomi2kata(u_char* src, u_char* dst) {
 	int first;
 	int second;
 
@@ -142,8 +138,7 @@ yomi2kata(u_char* src, u_char* dst) {
 	*dst = 0;
 }
 
-static int
-top_strcmp(u_char* src, u_char* dst) {
+static int top_strcmp(u_char* src, u_char* dst) {
 	int i;
 
 	for(i = 0; *src && (*src == *dst); src++, dst++) i++;
@@ -153,8 +148,7 @@ top_strcmp(u_char* src, u_char* dst) {
 	return (i > MAXYOMIASKNUMBER) ? MAXYOMIASKNUMBER : i;
 }
 
-static int
-last_strcmp(u_char* src, u_char* dst) {
+static int last_strcmp(u_char* src, u_char* dst) {
 	int slen;
 	int dlen;
 
@@ -314,8 +308,7 @@ int srchkanji(u_char** dst, u_char* knj, int klen) {
 	return cnt;
 }
 
-TypeIdxOfs
-count_uidx(SJ4_CONTEXT2) {
+TypeIdxOfs count_uidx(SJ4_CONTEXT2) {
 	u_char* p;
 
 	p = get_idxptr(SJ4_CONTEXT_PASS curdict->segunit - 1);
diff --git a/lib/sj4core/alloc.c b/lib/sj4core/alloc.c
index 9af1f56..979e298 100644
--- a/lib/sj4core/alloc.c
+++ b/lib/sj4core/alloc.c
@@ -76,8 +76,7 @@ void free_jrec(SJ4_CONTEXT JREC* p) {
 	}
 }
 
-CLREC*
-alloc_clrec(SJ4_CONTEXT2) {
+CLREC* alloc_clrec(SJ4_CONTEXT2) {
 	CLREC* p;
 	int    i;
 
diff --git a/lib/sj4core/cl2knj.c b/lib/sj4core/cl2knj.c
index 4710e52..2e2ada4 100644
--- a/lib/sj4core/cl2knj.c
+++ b/lib/sj4core/cl2knj.c
@@ -111,8 +111,7 @@ int nextcl(SJ4_CONTEXT u_char* kouho, int mode) {
 	return hzstrlen(inputyomi, (int)clt1st->cllen);
 }
 
-static CLREC*
-nextrecblk(SJ4_CONTEXT2) {
+static CLREC* nextrecblk(SJ4_CONTEXT2) {
 	CLREC* clptr;
 	int    keeplen;
 
@@ -151,8 +150,7 @@ int prevcl(SJ4_CONTEXT u_char* kouho, int mode) {
 	return hzstrlen(inputyomi, (int)clt1st->cllen);
 }
 
-static CLREC*
-prevrecblk(SJ4_CONTEXT2) {
+static CLREC* prevrecblk(SJ4_CONTEXT2) {
 	CLREC* clptr;
 	CLREC* keepptr;
 	int    keeplen;
@@ -175,8 +173,7 @@ prevrecblk(SJ4_CONTEXT2) {
 	return keepptr;
 }
 
-static void
-initkbuf(SJ4_CONTEXT u_char* kouho) {
+static void initkbuf(SJ4_CONTEXT u_char* kouho) {
 	kanjitmp = kouho;
 	memset(kanjitmp, 0, sizeof(STDYOUT) + 1);
 }
diff --git a/lib/sj4core/clstudy.c b/lib/sj4core/clstudy.c
index 9a69357..72f9ad0 100644
--- a/lib/sj4core/clstudy.c
+++ b/lib/sj4core/clstudy.c
@@ -99,8 +99,7 @@ int clstudy(SJ4_CONTEXT u_char* yomi1, u_char* yomi2, STDYOUT* stdy) {
 	return ret;
 }
 
-static u_char*
-delcldata(SJ4_CONTEXT u_char* ycode) {
+static u_char* delcldata(SJ4_CONTEXT u_char* ycode) {
 	u_char* tagptr;
 	u_char* ptr1;
 	u_char* ptr2;
@@ -157,8 +156,7 @@ void delclsub(SJ4_CONTEXT u_char* target) {
 	}
 }
 
-static int
-delclold(SJ4_CONTEXT2) {
+static int delclold(SJ4_CONTEXT2) {
 	u_char* tagptr;
 	u_char* target;
 	int	num;
@@ -187,8 +185,7 @@ delclold(SJ4_CONTEXT2) {
 	return num;
 }
 
-static u_char*
-srchclpos(SJ4_CONTEXT u_char* ycode) {
+static u_char* srchclpos(SJ4_CONTEXT u_char* ycode) {
 	u_char* tagptr;
 	u_char* target;
 	u_char* ptr1;
diff --git a/lib/sj4core/cvtdict.c b/lib/sj4core/cvtdict.c
index 867b7ab..0182c11 100644
--- a/lib/sj4core/cvtdict.c
+++ b/lib/sj4core/cvtdict.c
@@ -56,9 +56,7 @@ void cvtdict(SJ4_CONTEXT KHREC* krec, CLREC* clrec, int flg) {
 		if(i == SETTOU_KIGOU) {
 			sttlen = 1;
 			fptr   = yptr;
-		}
-
-		else {
+		} else {
 			fptr   = Settou_ptr(i);
 			sttlen = SttYomiLen(fptr);
 			fptr++;
@@ -69,9 +67,7 @@ void cvtdict(SJ4_CONTEXT KHREC* krec, CLREC* clrec, int flg) {
 		*kanjitmp++ = *fptr++;
 		jlen -= sttlen;
 		yptr += sttlen * 2;
-	}
-
-	else
+	} else
 		sttlen = 0;
 
 	if(flg) {
@@ -88,15 +84,11 @@ void cvtdict(SJ4_CONTEXT KHREC* krec, CLREC* clrec, int flg) {
 		}
 
 		stblen = 0;
-	}
-
-	else if((i = jrec->stbofs) && (fptr = getstb(jrec->hinsi))) {
+	} else if((i = jrec->stbofs) && (fptr = getstb(jrec->hinsi))) {
 		fptr += i - 1;
 		stblen = StbYomiLen(fptr);
 		jlen -= stblen;
-	}
-
-	else {
+	} else {
 		stblen = 0;
 	}
 
@@ -141,9 +133,7 @@ void cvtminasi(SJ4_CONTEXT int len) {
 		if(isknj1(*ptr)) {
 			*kanjitmp++ = *ptr++;
 			*kanjitmp++ = *ptr++;
-		}
-
-		else if(*ptr == SS3) {
+		} else if(*ptr == SS3) {
 			*kanjitmp++ = *ptr++;
 			*kanjitmp++ = *ptr++;
 			*kanjitmp++ = *ptr++;
@@ -193,9 +183,7 @@ void cvtwakachi(SJ4_CONTEXT CLREC* clrec) {
 		if(isknj1(*ym)) {
 			*kanjitmp++ = *ym++;
 			*kanjitmp++ = *ym++;
-		}
-
-		else if(*ym == SS3) {
+		} else if(*ym == SS3) {
 			*kanjitmp++ = *ym++;
 			*kanjitmp++ = *ym++;
 			*kanjitmp++ = *ym++;
diff --git a/lib/sj4core/cvtkanji.c b/lib/sj4core/cvtkanji.c
index 0755286..d514a8d 100644
--- a/lib/sj4core/cvtkanji.c
+++ b/lib/sj4core/cvtkanji.c
@@ -140,9 +140,7 @@ void setstyrec(SJ4_CONTEXT KHREC* krec) {
 		stdy.stdy1.styno  = kptr->styno;
 		stdy.stdy1.dicid  = kptr->clrec->jnode->dicid;
 		stdy.stdy1.nmflg  = 1;
-	}
-
-	else {
+	} else {
 		stdy.stdy1.offset = krec->offs;
 		stdy.stdy1.seg	  = jrec->jseg;
 		stdy.stdy1.styno  = krec->styno;
diff --git a/lib/sj4core/deldic.c b/lib/sj4core/deldic.c
index b71ef70..22d2e9a 100644
--- a/lib/sj4core/deldic.c
+++ b/lib/sj4core/deldic.c
@@ -109,8 +109,7 @@ u_int deldic(SJ4_CONTEXT u_char* yomi, u_char* kanji, TypeGram hinsi) {
 	return AD_DONE;
 }
 
-static int
-del_douon(SJ4_CONTEXT TypeDicSeg seg, u_char* ptr, TypeDicOfs ofs) {
+static int del_douon(SJ4_CONTEXT TypeDicSeg seg, u_char* ptr, TypeDicOfs ofs) {
 	u_char *nxt, *p1, *p2;
 	int	size;
 	int	nlen, plen, len;
@@ -155,8 +154,7 @@ del_douon(SJ4_CONTEXT TypeDicSeg seg, u_char* ptr, TypeDicOfs ofs) {
 	return AD_DONE;
 }
 
-static int
-del_segment(SJ4_CONTEXT TypeDicSeg seg) {
+static int del_segment(SJ4_CONTEXT TypeDicSeg seg) {
 	int	   i;
 	STDYIN*	   styp;
 	TypeDicID  dicid;
@@ -208,8 +206,7 @@ del_segment(SJ4_CONTEXT TypeDicSeg seg) {
 	return AD_DONE;
 }
 
-static void
-del_uidx(SJ4_CONTEXT TypeDicSeg seg) {
+static void del_uidx(SJ4_CONTEXT TypeDicSeg seg) {
 	u_char *p, *q;
 	int	len;
 
@@ -226,8 +223,7 @@ del_uidx(SJ4_CONTEXT TypeDicSeg seg) {
 	mkidxtbl(SJ4_CONTEXT_PASS curdict);
 }
 
-static void
-del_stdy(SJ4_CONTEXT TypeDicSeg seg, TypeDicOfs ofs, int size) {
+static void del_stdy(SJ4_CONTEXT TypeDicSeg seg, TypeDicOfs ofs, int size) {
 	int	   i;
 	TypeStyNum stdynum;
 	STDYIN*	   stdy;
diff --git a/lib/sj4core/dict.c b/lib/sj4core/dict.c
index e45c2df..405bb0a 100644
--- a/lib/sj4core/dict.c
+++ b/lib/sj4core/dict.c
@@ -76,8 +76,7 @@ int seldict(SJ4_CONTEXT TypeDicID id) {
 	return FALSE;
 }
 
-u_char*
-get_idxptr(SJ4_CONTEXT TypeDicSeg seg) {
+u_char* get_idxptr(SJ4_CONTEXT TypeDicSeg seg) {
 	(*curdict->getofs)(SJ4_CONTEXT_PASS curdict);
 	(*curdict->getidx)(SJ4_CONTEXT_PASS curdict);
 
diff --git a/lib/sj4core/fuzoku.c b/lib/sj4core/fuzoku.c
index aca755f..64ac176 100644
--- a/lib/sj4core/fuzoku.c
+++ b/lib/sj4core/fuzoku.c
@@ -34,8 +34,7 @@
 
 #include "sj_kanakan.h"
 
-static int
-fzkstrcmp(u_char* yptr, u_char* fzkp, int* saml) {
+static int fzkstrcmp(u_char* yptr, u_char* fzkp, int* saml) {
 	int asklen, nkrlen;
 
 	asklen = FzkAskLen(fzkp);
@@ -56,9 +55,7 @@ fzkstrcmp(u_char* yptr, u_char* fzkp, int* saml) {
 		else if(*yptr < *fzkp) {
 			if(!*yptr) return PARTLY;
 			return OVER;
-		}
-
-		else {
+		} else {
 			yptr++;
 			fzkp++;
 			(*saml)++;
@@ -90,15 +87,12 @@ void setclrec(SJ4_CONTEXT JREC* jrec, u_char* yptr, TypeCnct right) {
 	if(hinsi >= DO_SAHEN && hinsi <= SP_KA_ONB)
 		new->kubun = K_DOUSHI;
 
-	else if((hinsi >= KEIYOUSI_1 && hinsi <= KE_DOUSI_9) ||
-		(hinsi == SP_KEIYOUSI)) {
+	else if((hinsi >= KEIYOUSI_1 && hinsi <= KE_DOUSI_9) || (hinsi == SP_KEIYOUSI)) {
 		if(right == R_FZKMEISI)
 			new->kubun = K_TAIGEN;
 		else
 			new->kubun = K_YOUGEN;
-	}
-
-	else if(hinsi == RENTAISI)
+	} else if(hinsi == RENTAISI)
 		new->kubun = K_RENTAISI;
 
 	else if((hinsi >= FUKUSI_1 && hinsi <= FUKUSI_9) ||
@@ -144,8 +138,7 @@ void setclrec(SJ4_CONTEXT JREC* jrec, u_char* yptr, TypeCnct right) {
 		new->kubun = K_TAIGEN;
 }
 
-static int
-fzkcnct(TypeCnct right, TypeCnct left) {
+static int fzkcnct(TypeCnct right, TypeCnct left) {
 	u_char* cncttbl;
 
 	if(right && left) {
@@ -158,8 +151,7 @@ fzkcnct(TypeCnct right, TypeCnct left) {
 	return FALSE;
 }
 
-RECURS
-void srchfzk(SJ4_CONTEXT JREC* jrec, u_char* yptr, TypeCnct right, int level) {
+RECURS void srchfzk(SJ4_CONTEXT JREC* jrec, u_char* yptr, TypeCnct right, int level) {
 	u_char*	 fzk;
 	int	 len = 0;
 	int	 cmp;
diff --git a/lib/sj4core/getkanji.c b/lib/sj4core/getkanji.c
index acbe6cd..6856138 100644
--- a/lib/sj4core/getkanji.c
+++ b/lib/sj4core/getkanji.c
@@ -34,13 +34,11 @@
 
 static u_char* code2kanji(SJ4_CONTEXT u_char* s, u_char* d, u_char* ym, int yl, int flg);
 
-u_char*
-getkan_none(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
+u_char* getkan_none(u_char* s, u_char* d, u_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) {
+u_char* getkan_hira(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
 	int cnt, csize;
 
 	csize = codesize(*s);
@@ -55,8 +53,7 @@ getkan_hira(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
 	return d;
 }
 
-u_char*
-getkan_kata(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) {
 	int    cnt, csize;
 	u_char ch;
 
@@ -85,19 +82,16 @@ getkan_kata(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
 	return d;
 }
 
-u_char*
-getkan_knj(SJ4_CONTEXT u_char* s, u_char* d, u_char* ym, int yl, int flg) {
+u_char* getkan_knj(SJ4_CONTEXT u_char* s, u_char* d, u_char* ym, int yl, int flg) {
 	return code2kanji(SJ4_CONTEXT_PASS askknj[*s & KNJASSYUKUMASK], d, ym, yl, flg);
 }
 
-u_char*
-getkan_ofs(SJ4_CONTEXT u_char* s, u_char* d, u_char* ym, int yl, int flg) {
+u_char* getkan_ofs(SJ4_CONTEXT u_char* s, u_char* d, u_char* ym, int yl, int flg) {
 	return code2kanji(SJ4_CONTEXT_PASS dicbuf + ((*s & KANJICODEMASK) << 8) + *(s + 1),
 			  d, ym, yl, flg);
 }
 
-u_char*
-getkan_norm(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 c;
 
 	if(*s != 0) {
@@ -112,8 +106,7 @@ getkan_norm(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
 	return d;
 }
 
-u_char*
-getkan_ascii(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) {
 	u_char c;
 
 	c = s[1];
@@ -124,8 +117,7 @@ getkan_ascii(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
 	return d;
 }
 
-static u_char*
-code2kanji(SJ4_CONTEXT u_char* s, u_char* d, u_char* ym, int yl, int flg) {
+static u_char* code2kanji(SJ4_CONTEXT u_char* s, u_char* d, u_char* ym, int yl, int flg) {
 	int csize;
 
 	for(;;) {
diff --git a/lib/sj4core/getrank.c b/lib/sj4core/getrank.c
index 0f4cc3d..933e600 100644
--- a/lib/sj4core/getrank.c
+++ b/lib/sj4core/getrank.c
@@ -42,8 +42,7 @@ void getrank(SJ4_CONTEXT2) {
 	regetrank(SJ4_CONTEXT_PASS2);
 }
 
-static void
-setstynum(SJ4_CONTEXT2) {
+static void setstynum(SJ4_CONTEXT2) {
 	KHREC*	kptr;
 	STDYIN* sptr;
 	int	count;
@@ -59,8 +58,7 @@ setstynum(SJ4_CONTEXT2) {
 	}
 }
 
-static void
-setnspr(SJ4_CONTEXT KHREC* kptr, STDYIN* sptr) {
+static void setnspr(SJ4_CONTEXT KHREC* kptr, STDYIN* sptr) {
 	KHREC*	   ptr;
 	int	   keepnm;
 	TypeStyNum styno;
@@ -76,28 +74,21 @@ setnspr(SJ4_CONTEXT KHREC* kptr, STDYIN* sptr) {
 			ptr->rank++;
 
 			keepnm--;
-		}
-
-		else if(styno == ptr->styno) {
+		} else if(styno == ptr->styno) {
 
 			if(kptr->sttfg && kptr->ka_fg) {
 
-				if((sptr->sttkj == kptr->sttkj) &&
-				   (sptr->ka_kj == kptr->ka_kj)) {
+				if((sptr->sttkj == kptr->sttkj) && (sptr->ka_kj == kptr->ka_kj)) {
 					ptr->rank++;
 					keepnm--;
 				}
-			}
-
-			else if(kptr->sttfg) {
+			} else if(kptr->sttfg) {
 
 				if(sptr->sttkj == kptr->sttkj) {
 					ptr->rank++;
 					keepnm--;
 				}
-			}
-
-			else if(kptr->ka_fg) {
+			} else if(kptr->ka_fg) {
 
 				if(sptr->ka_kj == kptr->ka_kj) {
 					ptr->rank++;
@@ -115,8 +106,7 @@ setnspr(SJ4_CONTEXT KHREC* kptr, STDYIN* sptr) {
 	if(sptr->nmflg && (nrank > keepnm)) nrank = keepnm;
 }
 
-static void
-regetrank(SJ4_CONTEXT2) {
+static void regetrank(SJ4_CONTEXT2) {
 	KHREC* kptr;
 	int    count;
 	int    tmp;
@@ -126,9 +116,7 @@ regetrank(SJ4_CONTEXT2) {
 		tmp = nrank;
 
 		trank += nkhcount;
-	}
-
-	else {
+	} else {
 		nkhcount = tmp = 0;
 	}
 
@@ -138,9 +126,7 @@ regetrank(SJ4_CONTEXT2) {
 			if(tmp && kptr->mode && !(kptr->offs)) {
 				kptr->rank = (u_char)tmp++;
 			}
-		}
-
-		else if((short)kptr->rank >= nrank)
+		} else if((short)kptr->rank >= nrank)
 			kptr->rank += (u_char)nkhcount;
 	}
 
diff --git a/lib/sj4core/memory.c b/lib/sj4core/memory.c
index b312bc9..a8c92b5 100644
--- a/lib/sj4core/memory.c
+++ b/lib/sj4core/memory.c
@@ -48,9 +48,7 @@ JREC* free_jlst(SJ4_CONTEXT JREC* p) {
 			else
 				jpk = p;
 			jp = p;
-		}
-
-		else {
+		} else {
 			free_jrec(SJ4_CONTEXT_PASS p);
 		}
 	}
@@ -60,8 +58,7 @@ JREC* free_jlst(SJ4_CONTEXT JREC* p) {
 	return jpk;
 }
 
-CLREC*
-free_clst(SJ4_CONTEXT CLREC* p, int l) {
+CLREC* free_clst(SJ4_CONTEXT CLREC* p, int l) {
 	CLREC* cpk;
 	CLREC* cp;
 	CLREC* cn;
@@ -86,9 +83,7 @@ free_clst(SJ4_CONTEXT CLREC* p, int l) {
 					cpk = p;
 				cp = p;
 			}
-		}
-
-		else {
+		} else {
 			(p->jnode->count)--;
 
 			free_clrec(SJ4_CONTEXT_PASS p);
diff --git a/lib/sj4core/mk2claus.c b/lib/sj4core/mk2claus.c
index 6e3cf9d..33aab30 100644
--- a/lib/sj4core/mk2claus.c
+++ b/lib/sj4core/mk2claus.c
@@ -131,9 +131,7 @@ void mk2claus(SJ4_CONTEXT2) {
 					;
 				else if(prty <= maxprty)
 					continue;
-			}
-
-			else if(prty <= maxprty)
+			} else if(prty <= maxprty)
 				continue;
 		}
 
diff --git a/lib/sj4core/mkbunset.c b/lib/sj4core/mkbunset.c
index c86daa7..cfd3a68 100644
--- a/lib/sj4core/mkbunset.c
+++ b/lib/sj4core/mkbunset.c
@@ -65,9 +65,7 @@ void mkbunsetu(SJ4_CONTEXT2) {
 			}
 
 			srchfzk(SJ4_CONTEXT_PASS jrec, next, right, 0);
-		}
-
-		else if((count = setconj(SJ4_CONTEXT_PASS hinsi, jrec, crec))) {
+		} else if((count = setconj(SJ4_CONTEXT_PASS hinsi, jrec, crec))) {
 
 			for(i = count; i-- > 0;) {
 
@@ -88,8 +86,7 @@ void mkbunsetu(SJ4_CONTEXT2) {
 	}
 }
 
-CLREC*
-argclrec(SJ4_CONTEXT int len) {
+CLREC* argclrec(SJ4_CONTEXT int len) {
 	CLREC* ptr;
 	CLREC* rec;
 	CLREC* child;
@@ -128,8 +125,7 @@ argclrec(SJ4_CONTEXT int len) {
 	ptr = maxclptr;
 
 	if(((int)ptr->cllen < len) ||
-	   (((int)ptr->cllen == len) &&
-	    (ptr->jnode->hinsi == TANKANJI))) {
+	   (((int)ptr->cllen == len) && (ptr->jnode->hinsi == TANKANJI))) {
 		rec->clsort = maxclptr;
 		maxclptr    = rec;
 		return rec;
diff --git a/lib/sj4core/mkjiritu.c b/lib/sj4core/mkjiritu.c
index 41f35f0..b67b286 100644
--- a/lib/sj4core/mkjiritu.c
+++ b/lib/sj4core/mkjiritu.c
@@ -78,8 +78,7 @@ void mkjiritu(SJ4_CONTEXT int mode) {
 	}
 }
 
-static void
-dic_mu(SJ4_CONTEXT int mode) {
+static void dic_mu(SJ4_CONTEXT int mode) {
 	u_char* tagp = NULL;
 	DICTL*	dp;
 
@@ -151,8 +150,7 @@ JREC* argjrec(SJ4_CONTEXT int len, JREC* rec) {
 	return jrec;
 }
 
-static void
-dic_cl(SJ4_CONTEXT2) {
+static void dic_cl(SJ4_CONTEXT2) {
 	u_char* p;
 	u_short pos;
 	int	len;
@@ -170,9 +168,7 @@ dic_cl(SJ4_CONTEXT2) {
 				if(!isdpnd(*(cnvstart + len))) {
 					setcrec(SJ4_CONTEXT_PASS p);
 				}
-			}
-
-			else if(cmp == OVER)
+			} else if(cmp == OVER)
 				break;
 		}
 	}
diff --git a/lib/sj4core/mkkouho.c b/lib/sj4core/mkkouho.c
index 84dac10..4e6e319 100644
--- a/lib/sj4core/mkkouho.c
+++ b/lib/sj4core/mkkouho.c
@@ -62,8 +62,7 @@ void mkkouho(SJ4_CONTEXT2) {
 	} while(clrec && (keeplen == clrec->cllen));
 }
 
-static void
-getkhtbl(SJ4_CONTEXT CLREC* clrec, u_char kcache[][MAXWDKANJILEN], int* kvalid) {
+static void getkhtbl(SJ4_CONTEXT CLREC* clrec, u_char kcache[][MAXWDKANJILEN], int* kvalid) {
 	JREC* jrec;
 
 	jrec = clrec->jnode;
@@ -93,8 +92,7 @@ getkhtbl(SJ4_CONTEXT CLREC* clrec, u_char kcache[][MAXWDKANJILEN], int* kvalid)
 	}
 }
 
-static void
-cl_kanji(SJ4_CONTEXT JREC* jrec, CLREC* clrec, u_char kcache[][MAXWDKANJILEN], int* kvalid) {
+static void cl_kanji(SJ4_CONTEXT JREC* jrec, CLREC* clrec, u_char kcache[][MAXWDKANJILEN], int* kvalid) {
 	u_char* ptr;
 	int	kcount = khcount;
 
@@ -115,13 +113,11 @@ cl_kanji(SJ4_CONTEXT JREC* jrec, CLREC* clrec, u_char kcache[][MAXWDKANJILEN], i
 	}
 }
 
-u_char*
-makekan_none(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
+u_char* makekan_none(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 	return d;
 }
 
-u_char*
-makekan_1byte(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
+u_char* makekan_1byte(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 	if((*s & KANJIMODEMASK) == ZENHIRAASSYUKU)
 		*d++ = 0x10 | (*s & KNJASSYUKUMASK);
 	else
@@ -131,8 +127,7 @@ makekan_1byte(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 	return d;
 }
 
-u_char*
-makekan_knj(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
+u_char* makekan_knj(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 	return makekan(SJ4_CONTEXT_PASS askknj[*s & KNJASSYUKUMASK], d, flg);
 }
 
@@ -141,8 +136,7 @@ u_char* makekan_ofs(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 		       d, flg);
 }
 
-u_char*
-makekan_norm(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
+u_char* makekan_norm(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 	u_char c;
 
 	if(*s != 0) {
@@ -158,8 +152,7 @@ makekan_norm(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 	return d;
 }
 
-u_char*
-makekan_ascii(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
+u_char* makekan_ascii(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 	u_char c;
 
 	c = s[1];
@@ -172,8 +165,7 @@ makekan_ascii(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 	return d;
 }
 
-static u_char*
-makekan(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
+static u_char* makekan(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 	int csize;
 
 	for(;;) {
@@ -247,8 +239,7 @@ makekan(SJ4_CONTEXT u_char* s, u_char* d, int flg) {
 
 #define PEND 2
 #define QEND 1
-static int
-sameknj(u_char* p, u_char plen, u_char* q, u_char qlen) {
+static int sameknj(u_char* p, u_char plen, u_char* q, u_char qlen) {
 	int i;
 	int j;
 	int endf = 0;
@@ -305,8 +296,7 @@ sameknj(u_char* p, u_char plen, u_char* q, u_char qlen) {
 #undef PEND
 #undef QEND
 
-static int
-diffknj(SJ4_CONTEXT JREC* jrec, u_char* ptr, int num, u_char kcache[][MAXWDKANJILEN], int* kvalid) {
+static int diffknj(SJ4_CONTEXT JREC* jrec, u_char* ptr, int num, u_char kcache[][MAXWDKANJILEN], int* kvalid) {
 	KHREC* kptr;
 	JREC*  jptr;
 	int    i;
@@ -348,8 +338,7 @@ diffknj(SJ4_CONTEXT JREC* jrec, u_char* ptr, int num, u_char kcache[][MAXWDKANJI
 	return TRUE;
 }
 
-static int
-chrck_numtbl(u_short flg, u_short cond) {
+static int chrck_numtbl(u_short flg, u_short cond) {
 	u_short must;
 
 	if((cond = SelNumCond(cond))) {
@@ -395,8 +384,7 @@ int sel_sjmode(JREC* jrec) {
 	return SelNumFunc(i);
 }
 
-static void
-cl_numcmn(SJ4_CONTEXT JREC* jrec, CLREC* clrec) {
+static void cl_numcmn(SJ4_CONTEXT JREC* jrec, CLREC* clrec) {
 	u_char*	 p;
 	int	 i;
 	u_short	 j;
diff --git a/lib/sj4core/mknumber.c b/lib/sj4core/mknumber.c
index 68ef67a..9255724 100644
--- a/lib/sj4core/mknumber.c
+++ b/lib/sj4core/mknumber.c
@@ -33,8 +33,7 @@
 
 #include "sj_kanakan.h"
 
-static int
-word2char(SJ4_CONTEXT u_short wd, u_char* tbl, int keta, int flg) {
+static int word2char(SJ4_CONTEXT u_short wd, u_char* tbl, int keta, int flg) {
 	int	mask;
 	int	num;
 	u_char* src;
@@ -65,8 +64,7 @@ word2char(SJ4_CONTEXT u_short wd, u_char* tbl, int keta, int flg) {
 	return flg;
 }
 
-static void
-words2num(SJ4_CONTEXT u_short* wd, u_char* tbl, int flgc) {
+static void words2num(SJ4_CONTEXT u_short* wd, u_char* tbl, int flgc) {
 	int	i;
 	int	keta;
 	int	flg;
@@ -155,8 +153,7 @@ void num_type07(SJ4_CONTEXT u_char* s1, u_char* s2, JREC* jrec) {
 	words2num(SJ4_CONTEXT_PASS num, Num3tbl, FALSE);
 }
 
-static void
-kan_num(SJ4_CONTEXT u_short* wd, u_char* tbl1, u_char* tbl2) {
+static void kan_num(SJ4_CONTEXT u_short* wd, u_char* tbl1, u_char* tbl2) {
 	int	ii;
 	u_short tmp;
 	int	mask;
@@ -274,8 +271,7 @@ void num_type12(SJ4_CONTEXT u_char* s1, u_char* s2, JREC* jrec) {
 	}
 }
 
-static void
-num_kurai(SJ4_CONTEXT u_char* p, int len, u_char* tbl) {
+static void num_kurai(SJ4_CONTEXT u_char* p, int len, u_char* tbl) {
 	int    i;
 	int    j;
 	u_char tmp;
diff --git a/lib/sj4core/peepdic.c b/lib/sj4core/peepdic.c
index bdd6d84..08bc2c1 100644
--- a/lib/sj4core/peepdic.c
+++ b/lib/sj4core/peepdic.c
@@ -97,8 +97,7 @@ int prevusr(SJ4_CONTEXT u_char* buf) {
 	return 0;
 }
 
-static void
-set_kanji(SJ4_CONTEXT2) {
+static void set_kanji(SJ4_CONTEXT2) {
 	int len;
 
 	len		 = getkanji(SJ4_CONTEXT_PASS peepyomi, getnlen(peepdptr) + getplen(peepdptr),
@@ -106,8 +105,7 @@ set_kanji(SJ4_CONTEXT2) {
 	*(peepknj + len) = 0;
 }
 
-static void
-set_buf(SJ4_CONTEXT u_char* buf) {
+static void set_buf(SJ4_CONTEXT u_char* buf) {
 	u_char* p;
 	int	i, csize;
 
@@ -124,8 +122,7 @@ set_buf(SJ4_CONTEXT u_char* buf) {
 	*buf++ = 0;
 }
 
-static int
-prev_kanji(SJ4_CONTEXT2) {
+static int prev_kanji(SJ4_CONTEXT2) {
 	u_char* p1;
 	u_char* p2;
 
@@ -141,8 +138,7 @@ prev_kanji(SJ4_CONTEXT2) {
 	return -1;
 }
 
-static int
-prev_hinsi(SJ4_CONTEXT2) {
+static int prev_hinsi(SJ4_CONTEXT2) {
 	u_char* p1;
 	u_char* p2;
 	int	nlen;
@@ -170,8 +166,7 @@ prev_hinsi(SJ4_CONTEXT2) {
 	return -1;
 }
 
-static int
-prev_douon(SJ4_CONTEXT2) {
+static int prev_douon(SJ4_CONTEXT2) {
 	u_char* p1;
 	u_char* p2;
 	int	nlen;
@@ -227,8 +222,7 @@ prev_douon(SJ4_CONTEXT2) {
 	return -1;
 }
 
-static int
-next_kanji(SJ4_CONTEXT2) {
+static int next_kanji(SJ4_CONTEXT2) {
 	u_char* p1;
 
 	p1 = skipkstr(peepkptr);
@@ -240,8 +234,7 @@ next_kanji(SJ4_CONTEXT2) {
 	return -1;
 }
 
-static int
-next_hinsi(SJ4_CONTEXT2) {
+static int next_hinsi(SJ4_CONTEXT2) {
 	u_char* p1;
 
 	p1 = skiphblk(peephptr);
@@ -257,8 +250,7 @@ next_hinsi(SJ4_CONTEXT2) {
 	return -1;
 }
 
-static int
-next_douon(SJ4_CONTEXT2) {
+static int next_douon(SJ4_CONTEXT2) {
 	u_char* p1;
 	int	nlen;
 
@@ -289,8 +281,7 @@ next_douon(SJ4_CONTEXT2) {
 	return -1;
 }
 
-static void
-set_idxyomi(SJ4_CONTEXT2) {
+static void set_idxyomi(SJ4_CONTEXT2) {
 	u_char *p1, *p2;
 
 	if((p2 = get_idxptr(SJ4_CONTEXT_PASS peepidx))) {
@@ -303,8 +294,7 @@ set_idxyomi(SJ4_CONTEXT2) {
 	}
 }
 
-static void
-add_yomi(SJ4_CONTEXT2) {
+static void add_yomi(SJ4_CONTEXT2) {
 	int	nlen;
 	u_char *p1, *p2;
 
@@ -322,8 +312,7 @@ add_yomi(SJ4_CONTEXT2) {
 	*p1 = 0;
 }
 
-static void
-cd2sjh_chr(u_char ch, u_char* dst) {
+static void cd2sjh_chr(u_char ch, u_char* dst) {
 	if(ch == _TYOUON) {
 		*dst++ = 0xa1;
 		*dst++ = 0xbc;
diff --git a/lib/sj4core/ph_khtbl.c b/lib/sj4core/ph_khtbl.c
index 0986c87..a330131 100644
--- a/lib/sj4core/ph_khtbl.c
+++ b/lib/sj4core/ph_khtbl.c
@@ -31,8 +31,7 @@
 
 #include "sj_kanakan.h"
 
-static void
-ph_setsty(SJ4_CONTEXT CLREC* clrec) {
+static void ph_setsty(SJ4_CONTEXT CLREC* clrec) {
 	JREC*	   jrec;
 	TypeDicOfs offset;
 	u_char*	   ptr;
@@ -62,9 +61,7 @@ ph_setsty(SJ4_CONTEXT CLREC* clrec) {
 
 		if(sptr->styno < kouhotbl[0].styno) {
 			ph_setkouho(SJ4_CONTEXT_PASS clrec, offset, sptr);
-		}
-
-		else if(sptr->styno == kouhotbl->styno) {
+		} else if(sptr->styno == kouhotbl->styno) {
 			if(!(kouhotbl[0].ka_fg &&
 			     sptr->ka_kj == kouhotbl[0].ka_kj)) {
 				ph_setkouho(SJ4_CONTEXT_PASS clrec, offset, sptr);
diff --git a/lib/sj4core/priority.c b/lib/sj4core/priority.c
index b55fe4d..95eb894 100644
--- a/lib/sj4core/priority.c
+++ b/lib/sj4core/priority.c
@@ -34,8 +34,7 @@
 
 #include "sj_kanakan.h"
 
-static int
-isfukusi(TypeGram hinsi) {
+static int isfukusi(TypeGram hinsi) {
 	if(FUKUSI_1 <= hinsi && hinsi <= FUKUSI_7)
 		return TRUE;
 	else if(hinsi == MEISI_11 || hinsi == D_MEISI_6)
@@ -43,8 +42,7 @@ isfukusi(TypeGram hinsi) {
 	return FALSE;
 }
 
-static int
-istaigen(TypeCnct right) {
+static int istaigen(TypeCnct right) {
 	if(right == R_MEISI || right == R_DMEISI || right == R_SMEISI1)
 		return TRUE;
 	if(right == R_WO_MEISI || right == R_DAIMEISI || right == R_JOSUUSI)
@@ -54,8 +52,7 @@ istaigen(TypeCnct right) {
 	return FALSE;
 }
 
-static int
-taicnt(TypeGram hinsi1, TypeGram hinsi2) {
+static int taicnt(TypeGram hinsi1, TypeGram hinsi2) {
 	if(hinsi2 == TANKANJI) return 0;
 
 	if(MYOUJI <= hinsi1 && hinsi1 <= KEN_KU) {
@@ -69,9 +66,7 @@ taicnt(TypeGram hinsi1, TypeGram hinsi2) {
 			return Taipri(5, hinsi2);
 		} else
 			return 5;
-	}
-
-	else {
+	} else {
 		if(MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9)
 			return Taipri(6, hinsi2);
 		else
@@ -79,8 +74,7 @@ taicnt(TypeGram hinsi1, TypeGram hinsi2) {
 	}
 }
 
-static int
-sttcnt(TypeGram hinsi1, TypeGram hinsi2) {
+static int sttcnt(TypeGram hinsi1, TypeGram hinsi2) {
 	if(SETTOU_1 <= hinsi1 && hinsi1 <= SETTOU_5) {
 		if(MEISI_1 <= hinsi2 && hinsi2 <= SUUSI)
 			return Sttpri(hinsi1 - SETTOU_1, hinsi2);
@@ -109,18 +103,14 @@ int priority(SJ4_CONTEXT CLREC* clrec) {
 	   prevclrow == R_NI1 || prevclrow == R_DRENYOU2) {
 		if(clrec->kubun == K_DOUSHI || isfukusi(hinsi1))
 			prev = 5;
-	}
-
-	else if(istaigen(prevclrow)) {
+	} else if(istaigen(prevclrow)) {
 
 		if(clrec->kubun == K_TAIGEN)
 			prev = taicnt(prevclgrm, hinsi1);
 
 		else
 			prev = 0;
-	}
-
-	else if(prevclrow == R_SETTOU) {
+	} else if(prevclrow == R_SETTOU) {
 		if(clrec->jnode->sttofs)
 			prty = 2;
 		else
@@ -144,9 +134,7 @@ int priority(SJ4_CONTEXT CLREC* clrec) {
 			}
 			cl2rec = cl2rec->clsort;
 		}
-	}
-
-	else if(clrec->right == R_SETTOU) {
+	} else if(clrec->right == R_SETTOU) {
 		prty = 0;
 		while(cl2rec && (int)cl2rec->cllen == keeplen) {
 			if(cl2rec->jnode->sttofs)
@@ -159,9 +147,7 @@ int priority(SJ4_CONTEXT CLREC* clrec) {
 			cl2rec = cl2rec->clsort;
 		}
 		goto finish;
-	}
-
-	else if(istaigen(clrec->right)) {
+	} else if(istaigen(clrec->right)) {
 		prty = 0;
 		while(cl2rec && (int)cl2rec->cllen == keeplen) {
 			i = taicnt(hinsi1, cl2rec->jnode->hinsi);
@@ -186,14 +172,11 @@ int priority(SJ4_CONTEXT CLREC* clrec) {
 			cl2rec = cl2rec->clsort;
 		}
 		prty = 4;
-	}
-
-	else {
+	} else {
 		prty &= GETPRI;
 
 		if(prty == P_RENYOU_J || prty == P_RENYOU_M) {
-			while(clrec->cllen != 1 && cl2rec &&
-			      (int)cl2rec->cllen == keeplen) {
+			while(clrec->cllen != 1 && cl2rec && (int)cl2rec->cllen == keeplen) {
 				if(cl2rec->kubun == K_DOUSHI) {
 					prty = 6;
 					goto finish;
@@ -215,8 +198,7 @@ finish:
 
 	if(cl2rec->jnode->hinsi == SUUSI) prty -= 3;
 
-	if(cl2rec->jnode->jclass == C_DICT &&
-	   cl2rec->jnode->jlen == 1 && (cl2rec->kubun != K_DOUSHI)) {
+	if(cl2rec->jnode->jclass == C_DICT && cl2rec->jnode->jlen == 1 && (cl2rec->kubun != K_DOUSHI)) {
 		prty -= 2;
 	}
 
@@ -245,9 +227,7 @@ void pritiny(SJ4_CONTEXT2) {
 			}
 			clrec = clrec->clsort;
 		}
-	}
-
-	else {
+	} else {
 
 		while(clrec && (int)clrec->cllen == keeplen) {
 			if(clrec->jnode->hinsi >= MYOUJI &&
diff --git a/lib/sj4core/sdepend.c b/lib/sj4core/sdepend.c
index c47969c..0371038 100644
--- a/lib/sj4core/sdepend.c
+++ b/lib/sj4core/sdepend.c
@@ -58,8 +58,7 @@ StdyFile* stdylink = NULL;
 #define stdylink ctx->stdylink
 #endif
 
-static long
-get4byte(u_char* p) {
+static long get4byte(u_char* p) {
 	long i;
 
 	i = *p;
@@ -67,8 +66,7 @@ get4byte(u_char* p) {
 	i = (i << 8) + *++p;
 	return ((i << 8) + *++p);
 }
-static void
-Put4byte(u_char* p, long n) {
+static void Put4byte(u_char* p, long n) {
 	p += 3;
 	*p-- = n;
 	n >>= 8;
@@ -80,8 +78,7 @@ Put4byte(u_char* p, long n) {
 }
 #define put4byte(p, n) Put4byte((p), (long)(n))
 
-static int
-fgetfile(VFile* vfp, FILE* fp, long pos, long len, u_char* p) {
+static int fgetfile(VFile* vfp, FILE* fp, long pos, long len, u_char* p) {
 	if(vfp != NULL && vfp->buffer != NULL) {
 		if(pos >= vfp->size) {
 			serv_errno = SJ4_FileSeekError;
@@ -107,8 +104,7 @@ fgetfile(VFile* vfp, FILE* fp, long pos, long len, u_char* p) {
 	}
 	return SJ4_NormalEnd;
 }
-static int
-fputfile(FILE* fp, long pos, int len, u_char* p) {
+static int fputfile(FILE* fp, long pos, int len, u_char* p) {
 	if(fseek(fp, pos, 0) == ERROR) {
 		serv_errno = SJ4_FileSeekError;
 		return ERROR;
@@ -120,23 +116,19 @@ fputfile(FILE* fp, long pos, int len, u_char* p) {
 	return SJ4_NormalEnd;
 }
 
-static int
-check_passwd(u_char* buf, char* passwd) {
+static int check_passwd(u_char* buf, char* passwd) {
 	buf += PASSWDPOS;
 	return (*buf && strncmp(passwd, (char*)buf, PASSWDLEN)) ? FALSE : TRUE;
 }
-static void
-set_passwd(u_char* buf, char* passwd) {
+static void set_passwd(u_char* buf, char* passwd) {
 	strncpy((char*)buf + PASSWDPOS, passwd, PASSWDLEN);
 }
 
-static int
-check_dictfile(u_char* buf) {
+static int check_dictfile(u_char* buf) {
 	return (DICTVERSION != get4byte(buf + VERSIONPOS)) ? FALSE : TRUE;
 }
 
-static DictFile*
-search_same_dict(SJ4_CONTEXT ino_t ino) {
+static DictFile* search_same_dict(SJ4_CONTEXT ino_t ino) {
 	DictFile* p;
 
 	for(p = dictlink; p != NULL; p = p->link)
@@ -145,28 +137,23 @@ search_same_dict(SJ4_CONTEXT ino_t ino) {
 	return NULL;
 }
 
-static int
-getofs(SJ4_CONTEXT DictFile* dp) {
+static int getofs(SJ4_CONTEXT DictFile* dp) {
 	idxofs = dp->ofsptr;
 	return 0;
 }
-static int
-getidx(SJ4_CONTEXT DictFile* dp) {
+static int getidx(SJ4_CONTEXT DictFile* dp) {
 	idxbuf = dp->buffer + dp->idxstrt;
 	return 0;
 }
-static int
-getdic(SJ4_CONTEXT DictFile* dp, TypeDicSeg seg) {
+static int getdic(SJ4_CONTEXT DictFile* dp, TypeDicSeg seg) {
 	if(seg >= dp->dict.segunit) return -1;
 	dicbuf = dp->buffer + dp->segstrt + dp->dict.seglen * seg;
 	return 0;
 }
-static int
-putidx(SJ4_CONTEXT DictFile* dp, short dummy) {
+static int putidx(SJ4_CONTEXT DictFile* dp, short dummy) {
 	return fputfile(dp->fp, dp->idxstrt, dp->dict.idxlen, idxbuf);
 }
-static int
-putdic(SJ4_CONTEXT DictFile* dp, TypeDicSeg seg) {
+static int putdic(SJ4_CONTEXT DictFile* dp, TypeDicSeg seg) {
 	u_char* p;
 	long	i, j;
 
@@ -192,8 +179,7 @@ putdic(SJ4_CONTEXT DictFile* dp, TypeDicSeg seg) {
 
 	return fputfile(dp->fp, i, dp->dict.seglen, p);
 }
-static int
-rszdic(SJ4_CONTEXT DictFile* dp, TypeDicSeg seg) {
+static int rszdic(SJ4_CONTEXT DictFile* dp, TypeDicSeg seg) {
 	long	i;
 	u_char* p;
 
@@ -216,15 +202,13 @@ rszdic(SJ4_CONTEXT DictFile* dp, TypeDicSeg seg) {
 	put4byte(dp->buffer + DICTSEGNUM, seg);
 	return fputfile(dp->fp, 0, HEADERLENGTH, dp->buffer);
 }
-static void
-freedicskip(DictFile* dp) {
+static void freedicskip(DictFile* dp) {
 	free((char*)dp->skipent);
 	free((char*)dp->skipseg);
 	dp->skipent = NULL;
 	dp->skipseg = NULL;
 }
-static void
-mkdicskip(DictFile* dp) {
+static void mkdicskip(DictFile* dp) {
 	DictSkipSeg* segs;
 	DictSkipEnt* ents;
 	u_short*     stack;
@@ -284,8 +268,7 @@ mkdicskip(DictFile* dp) {
 	dp->skipent = ents;
 }
 
-static u_char*
-skipdic(SJ4_CONTEXT u_char* tagp, TypeDicSeg seg) {
+static u_char* skipdic(SJ4_CONTEXT u_char* tagp, TypeDicSeg seg) {
 	DictFile*    dp = (DictFile*)curdict;
 	DictSkipSeg* s;
 	TypeDicOfs   offset;
@@ -323,8 +306,7 @@ skipdic(SJ4_CONTEXT u_char* tagp, TypeDicSeg seg) {
 	return NULL;
 }
 
-DictFile*
-opendict(SJ4_CONTEXT char* name, char* passwd) {
+DictFile* opendict(SJ4_CONTEXT char* name, char* passwd) {
 	FILE*	    fp = NULL;
 	struct stat sbuf;
 	DictFile*   dfp;
@@ -462,13 +444,11 @@ int closedict(SJ4_CONTEXT DictFile* dfp) {
 	return 0;
 }
 
-static int
-check_stdyfile(u_char* buf) {
+static int check_stdyfile(u_char* buf) {
 	return (STDYVERSION != get4byte(buf + VERSIONPOS)) ? FALSE : TRUE;
 }
 
-static StdyFile*
-search_same_stdy(SJ4_CONTEXT ino_t ino) {
+static StdyFile* search_same_stdy(SJ4_CONTEXT ino_t ino) {
 	StdyFile* p;
 
 	for(p = stdylink; p != NULL; p = p->link)
@@ -477,8 +457,7 @@ search_same_stdy(SJ4_CONTEXT ino_t ino) {
 	return NULL;
 }
 
-StdyFile*
-openstdy(SJ4_CONTEXT char* name, char* passwd) {
+StdyFile* openstdy(SJ4_CONTEXT char* name, char* passwd) {
 	FILE*	    fp;
 	struct stat sbuf;
 	StdyFile*   sfp;
@@ -811,8 +790,7 @@ int set_stdypass(SJ4_CONTEXT char* pass) {
 	return fputfile(sp->fp, 0, HEADERLENGTH + COMMENTLENGTH, sp->header);
 }
 
-static void
-set_comment(u_char* buf, char* comment) {
+static void set_comment(u_char* buf, char* comment) {
 	sj4_strlcpy((char*)buf + HEADERLENGTH, comment, COMMENTLENGTH);
 }
 
diff --git a/lib/sj4core/selclrec.c b/lib/sj4core/selclrec.c
index ecbb2a5..3d079a7 100644
--- a/lib/sj4core/selclrec.c
+++ b/lib/sj4core/selclrec.c
@@ -58,9 +58,7 @@ void selclrec(SJ4_CONTEXT2) {
 		if(len == rec->cllen) {
 			selcl = rec;
 			break;
-		}
-
-		else if(len > (unsigned int)rec->cllen) {
+		} else if(len > (unsigned int)rec->cllen) {
 			rec = NULL;
 			break;
 		}
diff --git a/lib/sj4core/setconj.c b/lib/sj4core/setconj.c
index b4ec00a..9a2a6bd 100644
--- a/lib/sj4core/setconj.c
+++ b/lib/sj4core/setconj.c
@@ -34,8 +34,7 @@
 
 #include "sj_kanakan.h"
 
-static int
-cnjstrcmp(u_char* yptr, u_char* cnjp, int* saml) {
+static int cnjstrcmp(u_char* yptr, u_char* cnjp, int* saml) {
 	int asklen;
 	int nkrlen;
 
@@ -57,9 +56,7 @@ cnjstrcmp(u_char* yptr, u_char* cnjp, int* saml) {
 		else if(*yptr < *cnjp) {
 			if(!*yptr) return PARTLY;
 			return OVER;
-		}
-
-		else {
+		} else {
 			yptr++;
 			cnjp++;
 			(*saml)++;
@@ -69,8 +66,7 @@ cnjstrcmp(u_char* yptr, u_char* cnjp, int* saml) {
 	return MATCH;
 }
 
-static TypeCnct
-cnvrow(JREC* rec, TypeCnct row) {
+static TypeCnct cnvrow(JREC* rec, TypeCnct row) {
 	TypeGram hinsi;
 	int	 stt;
 
@@ -90,9 +86,7 @@ cnvrow(JREC* rec, TypeCnct row) {
 
 		else
 			row = 0;
-	}
-
-	else if(stt == SETTOU_GO) {
+	} else if(stt == SETTOU_GO) {
 
 		if(hinsi == MEISI_7 && row == R_SMEISI1)
 			row++;
diff --git a/lib/sj4core/setjrec.c b/lib/sj4core/setjrec.c
index 7efd144..c3653e6 100644
--- a/lib/sj4core/setjrec.c
+++ b/lib/sj4core/setjrec.c
@@ -152,9 +152,7 @@ chkhead(SJ4_CONTEXT TypeGram gram) {
 	if(headcode == SETTOU_DAI) {
 
 		if(gram == SUUSI) return TRUE;
-	}
-
-	else {
+	} else {
 		gram--;
 		if((Scncttbl(headcode - 1, gram >> 3) << (gram & 0x07)) & 0x80) {
 			return TRUE;
diff --git a/lib/sj4core/setkouho.c b/lib/sj4core/setkouho.c
index 4fff339..fd83c81 100644
--- a/lib/sj4core/setkouho.c
+++ b/lib/sj4core/setkouho.c
@@ -152,8 +152,7 @@ void ph_setkouho(SJ4_CONTEXT CLREC* clrec, TypeDicOfs offs, STDYIN* sptr) {
 	khcount = 1;
 }
 
-static int
-hiraknj(SJ4_CONTEXT u_char* p) {
+static int hiraknj(SJ4_CONTEXT u_char* p) {
 	char flg = TRUE;
 	int  i;
 	int  result;
diff --git a/lib/sj4core/setubi.c b/lib/sj4core/setubi.c
index fc11eab..2e4baf3 100644
--- a/lib/sj4core/setubi.c
+++ b/lib/sj4core/setubi.c
@@ -32,8 +32,7 @@
 
 #include "sj_kanakan.h"
 
-u_char*
-getstb(TypeGram hinsi) {
+u_char* getstb(TypeGram hinsi) {
 	if(hinsi < MEISI_1 || hinsi > TIMEI) return NULL;
 
 	return Stbadr(hinsi);
diff --git a/lib/sj4core/skiphblk.c b/lib/sj4core/skiphblk.c
index fecc87d..ad20291 100644
--- a/lib/sj4core/skiphblk.c
+++ b/lib/sj4core/skiphblk.c
@@ -33,8 +33,7 @@
 
 #include "sj_kanakan.h"
 
-u_char*
-skiphblk(u_char* ptr) {
+u_char* skiphblk(u_char* ptr) {
 	ptr++;
 
 	while(*ptr != HINSIBLKTERM) ptr = skipkstr(ptr);
diff --git a/lib/sj4core/skipkstr.c b/lib/sj4core/skipkstr.c
index 0fd8468..7c90304 100644
--- a/lib/sj4core/skipkstr.c
+++ b/lib/sj4core/skipkstr.c
@@ -36,8 +36,7 @@
 
 #include "sj_kanakan.h"
 
-u_char*
-skipkstr(u_char* ptr) {
+u_char* skipkstr(u_char* ptr) {
 	int contf = TRUE, csize;
 
 	do {
diff --git a/lib/sj4core/srchdict.c b/lib/sj4core/srchdict.c
index 3325ff7..310a3ce 100644
--- a/lib/sj4core/srchdict.c
+++ b/lib/sj4core/srchdict.c
@@ -47,9 +47,7 @@ int yomicmp(SJ4_CONTEXT u_char* ptr1, u_char* ptr2, u_char* saml) {
 			if(*ptr1++ != *ptr2++) return OVER;
 
 		j = sstrlen(ptr2);
-	}
-
-	else if(i > same)
+	} else if(i > same)
 		return CONT;
 
 	else {
@@ -88,9 +86,7 @@ static __inline int yomicmp_seg(SJ4_CONTEXT u_char* ptr1, u_char* ptr2, u_char*
 			if(*ptr1++ != *ptr2++) return OVER;
 
 		j = segidxlen;
-	}
-
-	else if(i > same)
+	} else if(i > same)
 		return CONT;
 
 	else {
@@ -113,8 +109,7 @@ static __inline int yomicmp_seg(SJ4_CONTEXT u_char* ptr1, u_char* ptr2, u_char*
 	return MATCH;
 }
 
-static __inline TypeDicSeg
-srchidx_loaded(SJ4_CONTEXT TypeDicSeg low, int len) {
+static __inline TypeDicSeg srchidx_loaded(SJ4_CONTEXT TypeDicSeg low, int len) {
 	TypeDicSeg high;
 	TypeDicSeg mid;
 	int	   cmp;
@@ -134,13 +129,9 @@ srchidx_loaded(SJ4_CONTEXT TypeDicSeg low, int len) {
 
 		if(cmp == OVER) {
 			high = mid - 1;
-		}
-
-		else if(cmp != MATCH) {
+		} else if(cmp != MATCH) {
 			low = mid + 1;
-		}
-
-		else {
+		} else {
 			return mid;
 		}
 	}
@@ -148,8 +139,7 @@ srchidx_loaded(SJ4_CONTEXT TypeDicSeg low, int len) {
 	return (cmp == OVER && mid != DICSEGBASE) ? mid - 1 : mid;
 }
 
-u_char*
-srchdict(SJ4_CONTEXT u_char* tagp) {
+u_char* srchdict(SJ4_CONTEXT u_char* tagp) {
 	TypeDicSeg segno;
 	int	   cmp;
 	int	   maxlen;
@@ -177,9 +167,7 @@ srchdict(SJ4_CONTEXT u_char* tagp) {
 			segidxlen = sstrlen(segidx);
 
 			tagp = dicbuf;
-		}
-
-		else {
+		} else {
 
 			tagp = getntag(tagp);
 
@@ -214,16 +202,12 @@ srchdict(SJ4_CONTEXT u_char* tagp) {
 
 				if(isdpnd(*(cnvstart + dicsaml))) {
 					break;
-				}
-
-				else {
+				} else {
 					dicinl = dicsaml + 1;
 					if(askbase != dicbuf) get_askknj(SJ4_CONTEXT_PASS2);
 					return tagp;
 				}
-			}
-
-			else if(cmp == CONT && getnlen(tagp) != 0 && getplen(tagp) > dicsaml && curdict->skipdic != NULL) {
+			} else if(cmp == CONT && getnlen(tagp) != 0 && getplen(tagp) > dicsaml && curdict->skipdic != NULL) {
 				u_char* next = (*curdict->skipdic)(SJ4_CONTEXT_PASS tagp, segno);
 
 				if(next != NULL) {
diff --git a/lib/sj4core/srchhead.c b/lib/sj4core/srchhead.c
index 3c0867f..d5bba4a 100644
--- a/lib/sj4core/srchhead.c
+++ b/lib/sj4core/srchhead.c
@@ -37,15 +37,11 @@ int srchhead(SJ4_CONTEXT2) {
 		headcode = SETTOU_O;
 		headlen	 = 1;
 		return TRUE;
-	}
-
-	else if(*cnvstart == _GO) {
+	} else if(*cnvstart == _GO) {
 		headcode = SETTOU_GO;
 		headlen	 = 1;
 		return TRUE;
-	}
-
-	else if((*cnvstart == _DA) && (*(cnvstart + 1) == _I)) {
+	} else if((*cnvstart == _DA) && (*(cnvstart + 1) == _I)) {
 		headcode = SETTOU_DAI;
 		headlen	 = 2;
 		return TRUE;
diff --git a/lib/sj4core/srchidx.c b/lib/sj4core/srchidx.c
index 3e79c13..f94c2c8 100644
--- a/lib/sj4core/srchidx.c
+++ b/lib/sj4core/srchidx.c
@@ -31,8 +31,7 @@
 
 #include "sj_kanakan.h"
 
-TypeDicSeg
-srchidx(SJ4_CONTEXT TypeDicSeg low, int len) {
+TypeDicSeg srchidx(SJ4_CONTEXT TypeDicSeg low, int len) {
 	TypeDicSeg high;
 	TypeDicSeg mid;
 	int	   cmp;
@@ -52,13 +51,9 @@ srchidx(SJ4_CONTEXT TypeDicSeg low, int len) {
 
 		if(cmp == OVER) {
 			high = mid - 1;
-		}
-
-		else if(cmp != MATCH) {
+		} else if(cmp != MATCH) {
 			low = mid + 1;
-		}
-
-		else {
+		} else {
 			return mid;
 		}
 	}
diff --git a/lib/sj4core/srchnum.c b/lib/sj4core/srchnum.c
index 8260769..711fadc 100644
--- a/lib/sj4core/srchnum.c
+++ b/lib/sj4core/srchnum.c
@@ -37,8 +37,7 @@
 
 static void srch_kurai1(SJ4_CONTEXT u_char*, u_char*), srch_kurai2(SJ4_CONTEXT u_char*, u_char*);
 
-static void
-srch_josuu_sub(SJ4_CONTEXT JREC* jrec, TypeGram gram) {
+static void srch_josuu_sub(SJ4_CONTEXT JREC* jrec, TypeGram gram) {
 	u_char* tagp;
 	DICTL*	dp;
 
@@ -51,8 +50,7 @@ srch_josuu_sub(SJ4_CONTEXT JREC* jrec, TypeGram gram) {
 	}
 }
 
-static void
-srch_josuu(SJ4_CONTEXT JREC* jrec) {
+static void srch_josuu(SJ4_CONTEXT JREC* jrec) {
 	u_char* kp;
 	int	klen;
 	int	len;
@@ -73,8 +71,7 @@ srch_josuu(SJ4_CONTEXT JREC* jrec) {
 	cnvlen	 = klen;
 }
 
-static void
-setnrec_sub(SJ4_CONTEXT u_char* p, u_short flag, int stb) {
+static void setnrec_sub(SJ4_CONTEXT u_char* p, u_short flag, int stb) {
 	JREC* rec;
 	int   len1;
 	int   len2;
@@ -107,8 +104,7 @@ setnrec_sub(SJ4_CONTEXT u_char* p, u_short flag, int stb) {
 	}
 }
 
-static void
-setnrec(SJ4_CONTEXT u_char* p, u_short flag) {
+static void setnrec(SJ4_CONTEXT u_char* p, u_short flag) {
 	setnrec_sub(SJ4_CONTEXT_PASS p, flag, 0);
 
 	if(!headcode && (*p == Y_S_KIGOU2)) {
@@ -116,8 +112,7 @@ setnrec(SJ4_CONTEXT u_char* p, u_short flag) {
 	}
 }
 
-static u_char*
-srchtbl(u_char ch, u_char* tbl, int rec, int n) {
+static u_char* srchtbl(u_char ch, u_char* tbl, int rec, int n) {
 	int	high, low, mid;
 	u_char* p;
 
@@ -147,13 +142,11 @@ srchtbl(u_char ch, u_char* tbl, int rec, int n) {
 	return p;
 }
 
-static int
-isconnect(u_char* cnct, int num) {
+static int isconnect(u_char* cnct, int num) {
 	return (cnct[num / 8] & (0x80 >> (num % 8)));
 }
 
-static int
-string_cmp(u_char* s, int l, u_char* d) {
+static int string_cmp(u_char* s, int l, u_char* d) {
 	u_char* p;
 
 	p = s;
@@ -167,8 +160,7 @@ string_cmp(u_char* s, int l, u_char* d) {
 	return (s - p);
 }
 
-static int
-check_num(SJ4_CONTEXT u_char* ptr) {
+static int check_num(SJ4_CONTEXT u_char* ptr) {
 	int	i;
 	int	j;
 	int	k;
@@ -255,8 +247,7 @@ check_num(SJ4_CONTEXT u_char* ptr) {
 	return TRUE;
 }
 
-static void
-srch_number1(SJ4_CONTEXT u_char* ptr) {
+static void srch_number1(SJ4_CONTEXT u_char* ptr) {
 	u_char	  ch;
 	u_char	  mode;
 	u_char*	  p;
@@ -351,8 +342,7 @@ srch_number1(SJ4_CONTEXT u_char* ptr) {
 	}
 }
 
-static void
-srch_kurai1(SJ4_CONTEXT u_char* ptr, u_char* cnct) {
+static void srch_kurai1(SJ4_CONTEXT u_char* ptr, u_char* cnct) {
 	u_char	  ch;
 	u_char*	  p;
 	int	  l;
@@ -408,8 +398,7 @@ srch_kurai1(SJ4_CONTEXT u_char* ptr, u_char* cnct) {
 	}
 }
 
-static void
-srch_kurai2(SJ4_CONTEXT u_char* ptr, u_char* cnct) {
+static void srch_kurai2(SJ4_CONTEXT u_char* ptr, u_char* cnct) {
 	u_char	  ch;
 	u_char*	  p;
 	int	  l;
@@ -465,8 +454,7 @@ srch_kurai2(SJ4_CONTEXT u_char* ptr, u_char* cnct) {
 	}
 }
 
-static void
-srch_number2(SJ4_CONTEXT u_char* p) {
+static void srch_number2(SJ4_CONTEXT u_char* p) {
 	u_char ch;
 	int    i;
 
@@ -514,8 +502,7 @@ srch_number2(SJ4_CONTEXT u_char* p) {
 	}
 }
 
-static void
-srchnum_sub(SJ4_CONTEXT u_char* p) {
+static void srchnum_sub(SJ4_CONTEXT u_char* p) {
 	suuji_yptr = p;
 
 	suuji_comma = suuji_keta = 0;
diff --git a/lib/sj4core/study.c b/lib/sj4core/study.c
index 6347b17..57284c8 100644
--- a/lib/sj4core/study.c
+++ b/lib/sj4core/study.c
@@ -126,8 +126,7 @@ int study(SJ4_CONTEXT STDYOUT* stdy) {
 	return ret;
 }
 
-STDYIN*
-srchstdy(SJ4_CONTEXT TypeDicSeg seg, TypeDicOfs ofs, TypeDicID dicid) {
+STDYIN* srchstdy(SJ4_CONTEXT TypeDicSeg seg, TypeDicOfs ofs, TypeDicID dicid) {
 	int	high;
 	int	mid;
 	int	low;
diff --git a/lib/sj4core/wakachi.c b/lib/sj4core/wakachi.c
index 4449033..990c754 100644
--- a/lib/sj4core/wakachi.c
+++ b/lib/sj4core/wakachi.c
@@ -67,9 +67,7 @@ void wakachi(SJ4_CONTEXT2) {
 
 		if(Chrtbl[*(next - 1)] & TAI_KGU)
 			srchfzk(SJ4_CONTEXT_PASS jrec, next, R_DAIMEISI, 0);
-	}
-
-	else {
+	} else {
 
 		if(!(jrec = argjrec(SJ4_CONTEXT_PASS 0, (JREC*)NULL))) return;
 		jrec->jclass = C_WAKACHI;
diff --git a/lib/sj4rkcv/rk_conv.c b/lib/sj4rkcv/rk_conv.c
index d565261..4aab780 100644
--- a/lib/sj4rkcv/rk_conv.c
+++ b/lib/sj4rkcv/rk_conv.c
@@ -726,8 +726,7 @@ int kstradd(wchar16_t** cp, wchar16_t* kstr, int len) {
 	return (0);
 }
 
-RkTablW16*
-mktable(wchar16_t* key, int len) {
+RkTablW16* mktable(wchar16_t* key, int len) {
 	int	   i;
 	RkTablW16 *nrktp, *orktp;
 	RkTablW16* rktp;
diff --git a/lib/sj4rkcv/sj4_rkcv.c b/lib/sj4rkcv/sj4_rkcv.c
index 27c133a..07bff1f 100644
--- a/lib/sj4rkcv/sj4_rkcv.c
+++ b/lib/sj4rkcv/sj4_rkcv.c
@@ -217,11 +217,9 @@ int sj_addten(u_short prefix, u_short c) {
 	u_short c1, cc;
 
 	cc = 0;
-	if((c == ZEN_DTEN || c == ZEN_HDTEN) &&
-	   (sj_ishira(prefix) || sj_iskata(prefix))) {
+	if((c == ZEN_DTEN || c == ZEN_HDTEN) && (sj_ishira(prefix) || sj_iskata(prefix))) {
 		c1 = sj_zen2han(prefix);
-		if((c1 >= KANA_KA && c1 < KANA_NA) ||
-		   (c1 >= KANA_HA && c1 < KANA_MA)) {
+		if((c1 >= KANA_KA && c1 < KANA_NA) || (c1 >= KANA_HA && c1 < KANA_MA)) {
 			if(c == ZEN_DTEN)
 				cc = prefix + 1;
 			else if(c == ZEN_HDTEN && c1 >= KANA_HA)
diff --git a/lib/sj4rkcv/wc16_str.c b/lib/sj4rkcv/wc16_str.c
index 7e62d74..b7c701b 100644
--- a/lib/sj4rkcv/wc16_str.c
+++ b/lib/sj4rkcv/wc16_str.c
@@ -120,8 +120,7 @@ int sj4_wsncmp16(wchar16_t* ws1, wchar16_t* ws2, int n) {
 	return 1;
 }
 
-wchar16_t*
-sj4_wscpy16(wchar16_t* ws1, wchar16_t* ws2) {
+wchar16_t* sj4_wscpy16(wchar16_t* ws1, wchar16_t* ws2) {
 	wchar16_t* ws;
 
 	if(!ws2) return NULL;
@@ -134,8 +133,7 @@ sj4_wscpy16(wchar16_t* ws1, wchar16_t* ws2) {
 	return ws1;
 }
 
-wchar16_t*
-sj4_wsncpy16(wchar16_t* ws1, wchar16_t* ws2, int n) {
+wchar16_t* sj4_wsncpy16(wchar16_t* ws1, wchar16_t* ws2, int n) {
 	wchar16_t* ws;
 	int	   i = 0;
 
@@ -150,8 +148,7 @@ sj4_wsncpy16(wchar16_t* ws1, wchar16_t* ws2, int n) {
 	return ws1;
 }
 
-wchar16_t*
-sj4_wscat16(wchar16_t* ws1, wchar16_t* ws2) {
+wchar16_t* sj4_wscat16(wchar16_t* ws1, wchar16_t* ws2) {
 	wchar16_t* ws;
 
 	if(!ws1) return NULL;
@@ -168,8 +165,7 @@ sj4_wscat16(wchar16_t* ws1, wchar16_t* ws2) {
 	return ws1;
 }
 
-wchar16_t
-sj4_euc2wc16(unsigned int code) {
+wchar16_t sj4_euc2wc16(unsigned int code) {
 	wchar16_t wc = 0;
 
 	if(((code >> 16) & 0xff) == SS3) {
@@ -183,8 +179,7 @@ sj4_euc2wc16(unsigned int code) {
 	return wc;
 }
 
-wchar16_t
-sj4_sjis2wc16(unsigned int code) {
+wchar16_t sj4_sjis2wc16(unsigned int code) {
 	unsigned short ch;
 
 	if((code >> 8) & 0xff) {
@@ -197,8 +192,7 @@ sj4_sjis2wc16(unsigned int code) {
 	return (sj4_euc2wc16(ch));
 }
 
-unsigned int
-sj4_wc2euc16(wchar16_t wc) {
+unsigned int sj4_wc2euc16(wchar16_t wc) {
 	unsigned int  code = 0;
 	unsigned char tmp;
 
@@ -220,8 +214,7 @@ sj4_wc2euc16(wchar16_t wc) {
 	return code;
 }
 
-unsigned int
-sj4_wc2sjis16(wchar16_t wc) {
+unsigned int sj4_wc2sjis16(wchar16_t wc) {
 	unsigned int ch;
 
 	ch = sj4_wc2euc16(wc);
diff --git a/src/sj4mkdic/cnvhinsi.c b/src/sj4mkdic/cnvhinsi.c
index 71d8e95..0fbf50f 100644
--- a/src/sj4mkdic/cnvhinsi.c
+++ b/src/sj4mkdic/cnvhinsi.c
@@ -89,13 +89,9 @@ int cnvhinsi(u_char* buf) {
 
 		if(i < 0) {
 			max = mid - 1;
-		}
-
-		else if(i > 0) {
+		} else if(i > 0) {
 			min = mid + 1;
-		}
-
-		else {
+		} else {
 			return (gramtbl[mid].code);
 		}
 	}
diff --git a/src/sj4mkdic/file.c b/src/sj4mkdic/file.c
index b7e6afc..7dd0c1d 100644
--- a/src/sj4mkdic/file.c
+++ b/src/sj4mkdic/file.c
@@ -37,8 +37,7 @@ typedef struct filelist {
 
 static FileList* flist = NULL;
 
-static char*
-get_fname(FILE* fp) {
+static char* get_fname(FILE* fp) {
 	FileList* p;
 
 	for(p = flist; p; p = p->next)
@@ -109,8 +108,7 @@ long Fsize(char* filename) {
 	exit(1);
 }
 
-size_t
-Fread(char* p, int s, int n, FILE* fp) {
+size_t Fread(char* p, int s, int n, FILE* fp) {
 	if(fread(p, s, n, fp) == n) return n;
 
 	printf("!\n");
@@ -119,8 +117,7 @@ Fread(char* p, int s, int n, FILE* fp) {
 	exit(1);
 }
 
-size_t
-Fwrite(char* p, int s, int n, FILE* fp) {
+size_t Fwrite(char* p, int s, int n, FILE* fp) {
 	if(fwrite(p, s, n, fp) == n) return n;
 
 	fprintf(stderr, "Write error in %s\n", get_fname(fp));
diff --git a/src/sj4mkdic/hindo.c b/src/sj4mkdic/hindo.c
index b6417e9..6f61289 100644
--- a/src/sj4mkdic/hindo.c
+++ b/src/sj4mkdic/hindo.c
@@ -54,8 +54,7 @@ int check_hindo(u_char* ptr, int len) {
 	return 0;
 }
 
-static AssyukuRec*
-makeassyuku(int num) {
+static AssyukuRec* makeassyuku(int num) {
 	AssyukuRec* arec;
 
 	arec = (AssyukuRec*)Malloc(sizeof(AssyukuRec));
@@ -71,15 +70,13 @@ makeassyuku(int num) {
 	return arec;
 }
 
-static int
-assyuku_len(HindoRec* hrec) {
+static int assyuku_len(HindoRec* hrec) {
 	int org;
 	int old;
 	int new;
 	OffsetRec* p;
 
-	if(((*(hrec->kptr) & KANJIMODEMASK) == OFFSETASSYUKU) &&
-	   (hrec->klen == 2)) {
+	if(((*(hrec->kptr) & KANJIMODEMASK) == OFFSETASSYUKU) && (hrec->klen == 2)) {
 		p   = real_ofsrec(hrec->kptr);
 		org = check_hindo(p->kptr, p->klen);
 		old = p->klen * org + 2 * (hrec->exist + hrec->hindo);
@@ -91,8 +88,7 @@ assyuku_len(HindoRec* hrec) {
 	return (old - new);
 }
 
-static void
-set_assyuku(HindoRec* hrec) {
+static void set_assyuku(HindoRec* hrec) {
 	AssyukuRec* arec;
 	AssyukuRec* aprev;
 	int	    len;
@@ -131,8 +127,7 @@ set_assyuku(HindoRec* hrec) {
 	}
 }
 
-static void
-reset_assyuku(HindoRec* hrec) {
+static void reset_assyuku(HindoRec* hrec) {
 	AssyukuRec* arec;
 	AssyukuRec* aptr;
 	AssyukuRec* aprev;
@@ -187,8 +182,7 @@ reset_assyuku(HindoRec* hrec) {
 	hrec->anext = NULL;
 }
 
-static HindoRec*
-makehindo(u_char* ptr, int len, int alen) {
+static HindoRec* makehindo(u_char* ptr, int len, int alen) {
 	HindoRec* hrec;
 	u_char*	  p;
 
@@ -220,8 +214,7 @@ makehindo(u_char* ptr, int len, int alen) {
 	return hrec;
 }
 
-static void
-set_hindo(u_char* ptr, int len, int alen) {
+static void set_hindo(u_char* ptr, int len, int alen) {
 	HindoRec* hrec;
 	int	  low, high, mid;
 	int	  i;
@@ -278,8 +271,7 @@ set_hindo(u_char* ptr, int len, int alen) {
 	set_assyuku(hrec);
 }
 
-static void
-reset_hindo(u_char* p, int l) {
+static void reset_hindo(u_char* p, int l) {
 	HindoRec* hrec;
 	int	  low, high, mid;
 	int	  i;
@@ -376,8 +368,7 @@ void knjhnd_reset(u_char* p, int l) {
 	}
 }
 
-static int
-check_assyuku(HindoRec* p, HindoRec* q) {
+static int check_assyuku(HindoRec* p, HindoRec* q) {
 	u_char ptmp[128], qtmp[128];
 	int    plen;
 	int    qlen;
diff --git a/src/sj4mkdic/knjcvt.c b/src/sj4mkdic/knjcvt.c
index 47d1fa7..3836cd9 100644
--- a/src/sj4mkdic/knjcvt.c
+++ b/src/sj4mkdic/knjcvt.c
@@ -38,8 +38,7 @@ typedef struct div_list {
 	struct div_list* child;
 } DivList;
 
-static void
-free_divlist(DivList* p) {
+static void free_divlist(DivList* p) {
 	DivList* q;
 
 	while(p) {
@@ -63,8 +62,7 @@ make_divrec() {
 	return p;
 }
 
-static int
-make_divlist(DivList* parent, u_char* knj, int len) {
+static int make_divlist(DivList* parent, u_char* knj, int len) {
 	int	 i, j;
 	int	 num;
 	int	 minlen = 0;
@@ -140,8 +138,7 @@ make_divlist(DivList* parent, u_char* knj, int len) {
 	return minlen;
 }
 
-u_char*
-knjofscvt(u_char* ptr, int len, int* ret) {
+u_char* knjofscvt(u_char* ptr, int len, int* ret) {
 	int	i;
 	u_char *p, *q;
 	DivList parent, *dl;
@@ -172,8 +169,7 @@ knjofscvt(u_char* ptr, int len, int* ret) {
 	return p;
 }
 
-u_char*
-knjcvt(u_char* ptr, int len, int* ret) {
+u_char* knjcvt(u_char* ptr, int len, int* ret) {
 	int	i;
 	u_char *p, *q;
 	DivList parent, *dl;
diff --git a/src/sj4mkdic/makelist.c b/src/sj4mkdic/makelist.c
index 8f59010..b0777b1 100644
--- a/src/sj4mkdic/makelist.c
+++ b/src/sj4mkdic/makelist.c
@@ -38,8 +38,7 @@
 
 static DouonRec* drectmp = NULL;
 
-static void
-clearklist(KanjiRec* krec) {
+static void clearklist(KanjiRec* krec) {
 	KanjiRec* p;
 
 	while(krec) {
@@ -53,8 +52,7 @@ clearklist(KanjiRec* krec) {
 	}
 }
 
-static void
-clearhlist(HinsiRec* hrec) {
+static void clearhlist(HinsiRec* hrec) {
 	HinsiRec* p;
 
 	while(hrec) {
@@ -85,8 +83,7 @@ void clear_list() {
 	douon_ptr = NULL;
 }
 
-static u_char*
-makekanji(int* yomi, int* kanji, int* atr, int* len) {
+static u_char* makekanji(int* yomi, int* kanji, int* atr, int* len) {
 	int	kana[MAXYOMILENGTH + 1];
 	u_char	ktmp[MAXKANJILENGTH * 3 + MAXATRNUMBER * 2 + 1];
 	int	i;
@@ -163,8 +160,7 @@ makekanji(int* yomi, int* kanji, int* atr, int* len) {
 	return q;
 }
 
-static u_char*
-makeyomi(int* yomi) {
+static u_char* makeyomi(int* yomi) {
 	u_char	tmp[MAXYOMILENGTH + 1];
 	int	i;
 	int	j;
@@ -199,8 +195,7 @@ makeyomi(int* yomi) {
 	return p;
 }
 
-static KanjiRec*
-make_krec(u_char* kcode, int klen) {
+static KanjiRec* make_krec(u_char* kcode, int klen) {
 	KanjiRec* krec;
 
 	krec = (KanjiRec*)Malloc(sizeof(KanjiRec));
@@ -218,8 +213,7 @@ make_krec(u_char* kcode, int klen) {
 	return krec;
 }
 
-static HinsiRec*
-make_hrec(int hinsi) {
+static HinsiRec* make_hrec(int hinsi) {
 	HinsiRec* hrec;
 
 	hrec = (HinsiRec*)Malloc(sizeof(HinsiRec));
@@ -235,8 +229,7 @@ make_hrec(int hinsi) {
 	return hrec;
 }
 
-static DouonRec*
-make_drec(u_char* ycode) {
+static DouonRec* make_drec(u_char* ycode) {
 	DouonRec* drec;
 
 	drec = (DouonRec*)Malloc(sizeof(DouonRec));
@@ -253,8 +246,7 @@ make_drec(u_char* ycode) {
 	return drec;
 }
 
-static int
-diff_ylen(DouonRec* drec) {
+static int diff_ylen(DouonRec* drec) {
 	DouonRec* dptr;
 	DouonRec* dprev;
 	u_char*	  p1;
@@ -301,8 +293,7 @@ diff_ylen(DouonRec* drec) {
 	return ylen;
 }
 
-static int
-douon_knj(DouonRec* drec) {
+static int douon_knj(DouonRec* drec) {
 	int	  i;
 	int	  len = 0;
 	u_char*	  p;
@@ -328,8 +319,7 @@ douon_knj(DouonRec* drec) {
 	return len;
 }
 
-static void
-make_d_list(DouonRec* drec) {
+static void make_d_list(DouonRec* drec) {
 	DouonRec *dptr, *dprev;
 	HinsiRec* hptr;
 	KanjiRec* kptr;
@@ -485,8 +475,7 @@ void makelist(int* yomi, int* kanji, int hinsi, int* atr) {
 
 	if(hrec->hinsi == hinsi) {
 		for(krec = hrec->krec; krec; krec = krec->knext) {
-			if((krec->klen == klen) &&
-			   !memcmp(krec->kptr, kcode, klen)) {
+			if((krec->klen == klen) && !memcmp(krec->kptr, kcode, klen)) {
 				fprintf(stderr, DUPECOMBINEDWORD);
 				fprintf(stderr, DUPECOMBINEDWORDREAD);
 				output_int(stderr, yomi);
diff --git a/src/sj4mkdic/makeseg.c b/src/sj4mkdic/makeseg.c
index f725cd0..ef9e251 100644
--- a/src/sj4mkdic/makeseg.c
+++ b/src/sj4mkdic/makeseg.c
@@ -36,8 +36,7 @@ static u_char mindex[MAININDEXLENGTH];
 static int    idxpos = 0;
 static int    idxnum = 0;
 
-static u_char*
-set_ofsask(u_char* src, u_char* dst) {
+static u_char* set_ofsask(u_char* src, u_char* dst) {
 	int	   len;
 	u_char*	   ptr;
 	OffsetRec* ofsrec;
diff --git a/src/sj4mkdic/offset.c b/src/sj4mkdic/offset.c
index 858a827..8906bfa 100644
--- a/src/sj4mkdic/offset.c
+++ b/src/sj4mkdic/offset.c
@@ -32,8 +32,7 @@
 
 #include "sj4mkdic.h"
 
-static OffsetRec*
-makeoffset(u_char* ptr, int len, int ofs) {
+static OffsetRec* makeoffset(u_char* ptr, int len, int ofs) {
 	OffsetRec* orec;
 	u_char*	   p;
 
@@ -125,8 +124,7 @@ void clear_ofsrec() {
 	ofsrec_num = 0;
 }
 
-OffsetRec*
-real_ofsrec(u_char* ptr) {
+OffsetRec* real_ofsrec(u_char* ptr) {
 	int	    ofs;
 	int	    i;
 	OffsetRec** p;