From bc29a7782316619b08239339e6ce81a9286f0a32 Mon Sep 17 00:00:00 2001 From: Zhihao Yuan Date: Wed, 10 Oct 2012 13:29:58 -0500 Subject: [PATCH] Unify the pointer casting style in my code. Code from 1.8x are left for diff-friendly. --- common/encoding.c | 2 +- common/exf.c | 2 +- vi/v_txt.c | 4 ++-- vi/vs_line.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/encoding.c b/common/encoding.c index 4fc2c3ac..6de509e5 100644 --- a/common/encoding.c +++ b/common/encoding.c @@ -59,7 +59,7 @@ static char text_chars[256] = { int looks_utf8(const char *ibuf, size_t nbytes) { - const u_char *buf = (u_char*)ibuf; + const u_char *buf = (u_char *)ibuf; size_t i; int n; int gotone = 0, ctrl = 0; diff --git a/common/exf.c b/common/exf.c index 33fb31b3..77081feb 100644 --- a/common/exf.c +++ b/common/exf.c @@ -1263,7 +1263,7 @@ file_encinit(SCR *sp) key.data = &lno; key.size = sizeof(lno); if (!ep->db->seq(ep->db, &key, &data, R_LAST) && - *(char*)data.data == '\0') + *(char *)data.data == '\0') ep->db->del(ep->db, &key, 0); o_set(sp, O_FILEENCODING, OS_STRDUP, "utf-16le", 0); break; diff --git a/vi/v_txt.c b/vi/v_txt.c index be665bf0..f9f0ec8b 100644 --- a/vi/v_txt.c +++ b/vi/v_txt.c @@ -2304,7 +2304,7 @@ txt_emark(SCR *sp, TEXT *tp, size_t cno) for (cno += chlen; chlen--;) *p++ = ' '; else - for (kp = (u_char*) + for (kp = (u_char *) KEY_NAME(sp, tp->lb[cno]), cno += chlen; chlen--;) *p++ = *kp++; @@ -2501,7 +2501,7 @@ txt_insch(SCR *sp, TEXT *tp, CHAR_T *chp, u_int flags) for (p = tp->lb + cno + 1; chlen--;) *p++ = ' '; else - for (kp = (u_char*) + for (kp = (u_char *) KEY_NAME(sp, tp->lb[cno]) + nlen, p = tp->lb + cno + 1; chlen--;) *p++ = *kp++; diff --git a/vi/vs_line.c b/vi/vs_line.c index 51b202d8..d6ab97f3 100644 --- a/vi/vs_line.c +++ b/vi/vs_line.c @@ -436,7 +436,7 @@ empty: (void)gp->scr_addstr(sp, if (KEY_NEEDSWIDE(sp, ch)) *cbp++ = ch; else - for (kp = (u_char*) + for (kp = (u_char *) KEY_NAME(sp, ch) + offset_in_char; chlen--;) *cbp++ = *kp++; @@ -459,7 +459,7 @@ empty: (void)gp->scr_addstr(sp, chlen = KEY_LEN(sp, '$'); if (cbp + chlen >= ecbp) FLUSH; - for (kp = (u_char*) + for (kp = (u_char *) KEY_NAME(sp, '$'); chlen--;) *cbp++ = *kp++; }