diff options
author | bapt <bapt@FreeBSD.org> | 2015-04-10 17:50:28 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2015-04-10 17:50:28 +0000 |
commit | c7f08411e0a7093fd65b33ad890811466257df99 (patch) | |
tree | bb238a04251527b96bb646b776058bba8293a640 /contrib/nvi/vi/vi.c | |
parent | 62376cf1de8b943fb2849e0ee409f0b0d7293e07 (diff) | |
parent | c42d98a117446dd83b8d13800dd2e3726cb0d2d0 (diff) | |
download | FreeBSD-src-c7f08411e0a7093fd65b33ad890811466257df99.zip FreeBSD-src-c7f08411e0a7093fd65b33ad890811466257df99.tar.gz |
Update nvi to 2.1.3 which fixes the data corruption when locale conversion
failed
Diffstat (limited to 'contrib/nvi/vi/vi.c')
-rw-r--r-- | contrib/nvi/vi/vi.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/contrib/nvi/vi/vi.c b/contrib/nvi/vi/vi.c index aafdbd1..144d903 100644 --- a/contrib/nvi/vi/vi.c +++ b/contrib/nvi/vi/vi.c @@ -34,16 +34,16 @@ typedef enum { } gcret_t; static VIKEYS const - *v_alias __P((SCR *, VICMD *, VIKEYS const *)); -static gcret_t v_cmd __P((SCR *, VICMD *, VICMD *, VICMD *, int *, int *)); -static int v_count __P((SCR *, ARG_CHAR_T, u_long *)); -static void v_dtoh __P((SCR *)); -static int v_init __P((SCR *)); -static gcret_t v_key __P((SCR *, int, EVENT *, u_int32_t)); -static int v_motion __P((SCR *, VICMD *, VICMD *, int *)); + *v_alias(SCR *, VICMD *, VIKEYS const *); +static gcret_t v_cmd(SCR *, VICMD *, VICMD *, VICMD *, int *, int *); +static int v_count(SCR *, ARG_CHAR_T, u_long *); +static void v_dtoh(SCR *); +static int v_init(SCR *); +static gcret_t v_key(SCR *, int, EVENT *, u_int32_t); +static int v_motion(SCR *, VICMD *, VICMD *, int *); #if defined(DEBUG) && defined(COMLOG) -static void v_comlog __P((SCR *, VICMD *)); +static void v_comlog(SCR *, VICMD *); #endif /* @@ -58,7 +58,7 @@ static void v_comlog __P((SCR *, VICMD *)); * vi -- * Main vi command loop. * - * PUBLIC: int vi __P((SCR **)); + * PUBLIC: int vi(SCR **); */ int vi(SCR **spp) @@ -1031,7 +1031,7 @@ v_dtoh(SCR *sp) * v_curword -- * Get the word (tagstring, actually) the cursor is on. * - * PUBLIC: int v_curword __P((SCR *)); + * PUBLIC: int v_curword(SCR *); */ int v_curword(SCR *sp) @@ -1216,7 +1216,6 @@ v_key( break; case E_WRESIZE: return (GC_ERR); - /* FALLTHROUGH */ default: v_event_err(sp, evp); return (GC_ERR); |