Module Name: src
Committed By: christos
Date: Fri Oct 18 20:40:15 UTC 2013
Modified Files:
src/dist/nvi/cl: cl_funcs.c cl_screen.c
src/dist/nvi/common: exf.c key.c
src/dist/nvi/ex: ex.c ex_args.c ex_argv.c ex_bang.c ex_display.c
ex_global.c ex_print.c ex_script.c ex_subst.c ex_tag.c ex_usage.c
src/dist/nvi/regex: engine.c
src/dist/nvi/vi: v_mark.c v_search.c v_txt.c vs_line.c vs_msg.c
vs_split.c
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/dist/nvi/cl/cl_funcs.c
cvs rdiff -u -r1.2 -r1.3 src/dist/nvi/cl/cl_screen.c
cvs rdiff -u -r1.5 -r1.6 src/dist/nvi/common/exf.c
cvs rdiff -u -r1.6 -r1.7 src/dist/nvi/common/key.c
cvs rdiff -u -r1.9 -r1.10 src/dist/nvi/ex/ex.c
cvs rdiff -u -r1.3 -r1.4 src/dist/nvi/ex/ex_args.c src/dist/nvi/ex/ex_bang.c \
src/dist/nvi/ex/ex_display.c
cvs rdiff -u -r1.4 -r1.5 src/dist/nvi/ex/ex_argv.c \
src/dist/nvi/ex/ex_global.c src/dist/nvi/ex/ex_subst.c
cvs rdiff -u -r1.2 -r1.3 src/dist/nvi/ex/ex_print.c
cvs rdiff -u -r1.5 -r1.6 src/dist/nvi/ex/ex_script.c
cvs rdiff -u -r1.11 -r1.12 src/dist/nvi/ex/ex_tag.c
cvs rdiff -u -r1.6 -r1.7 src/dist/nvi/ex/ex_usage.c
cvs rdiff -u -r1.7 -r1.8 src/dist/nvi/regex/engine.c
cvs rdiff -u -r1.2 -r1.3 src/dist/nvi/vi/v_mark.c
cvs rdiff -u -r1.4 -r1.5 src/dist/nvi/vi/v_search.c
cvs rdiff -u -r1.8 -r1.9 src/dist/nvi/vi/v_txt.c
cvs rdiff -u -r1.6 -r1.7 src/dist/nvi/vi/vs_line.c
cvs rdiff -u -r1.5 -r1.6 src/dist/nvi/vi/vs_msg.c
cvs rdiff -u -r1.3 -r1.4 src/dist/nvi/vi/vs_split.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/cl/cl_funcs.c
diff -u src/dist/nvi/cl/cl_funcs.c:1.4 src/dist/nvi/cl/cl_funcs.c:1.5
--- src/dist/nvi/cl/cl_funcs.c:1.4 Sun Nov 15 13:43:28 2009
+++ src/dist/nvi/cl/cl_funcs.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cl_funcs.c,v 1.4 2009/11/15 18:43:28 dsl Exp $ */
+/* $NetBSD: cl_funcs.c,v 1.5 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -37,12 +37,10 @@ static void cl_rdiv __P((SCR *));
static int
addstr4(SCR *sp, const void *str, size_t len, int wide)
{
- CL_PRIVATE *clp;
WINDOW *win;
size_t y, x;
int iv;
- clp = CLP(sp);
win = CLSP(sp) ? CLSP(sp) : stdscr;
/*
@@ -51,6 +49,7 @@ addstr4(SCR *sp, const void *str, size_t
*/
iv = 0;
getyx(win, y, x);
+ __USE(x);
if (!F_ISSET(sp, SC_SCR_EXWROTE) &&
y == RLNO(sp, LASTLINE(sp)) && IS_SPLIT(sp)) {
iv = 1;
@@ -312,11 +311,9 @@ int
cl_deleteln(SCR *sp)
{
CHAR_T ch;
- CL_PRIVATE *clp;
WINDOW *win;
size_t col, lno, spcnt, y, x;
- clp = CLP(sp);
win = CLSP(sp) ? CLSP(sp) : stdscr;
/*
@@ -548,13 +545,11 @@ cl_move(SCR *sp, size_t lno, size_t cno)
int
cl_refresh(SCR *sp, int repaint)
{
- GS *gp;
CL_PRIVATE *clp;
WINDOW *win;
SCR *psp, *tsp;
size_t y, x;
- gp = sp->gp;
clp = CLP(sp);
win = CLSP(sp) ? CLSP(sp) : stdscr;
@@ -741,11 +736,9 @@ cl_suspend(SCR *sp, int *allowedp)
struct termios t;
CL_PRIVATE *clp;
WINDOW *win;
- GS *gp;
size_t y, x;
int changed;
- gp = sp->gp;
clp = CLP(sp);
win = CLSP(sp) ? CLSP(sp) : stdscr;
*allowedp = 1;
Index: src/dist/nvi/cl/cl_screen.c
diff -u src/dist/nvi/cl/cl_screen.c:1.2 src/dist/nvi/cl/cl_screen.c:1.3
--- src/dist/nvi/cl/cl_screen.c:1.2 Fri Dec 5 17:51:42 2008
+++ src/dist/nvi/cl/cl_screen.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cl_screen.c,v 1.2 2008/12/05 22:51:42 christos Exp $ */
+/* $NetBSD: cl_screen.c,v 1.3 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -185,11 +185,9 @@ static int
cl_vi_init(SCR *sp)
{
CL_PRIVATE *clp;
- GS *gp;
char *o_cols, *o_lines, *o_term;
const char *ttype;
- gp = sp->gp;
clp = CLP(sp);
/* If already initialized, just set the terminal modes. */
Index: src/dist/nvi/common/exf.c
diff -u src/dist/nvi/common/exf.c:1.5 src/dist/nvi/common/exf.c:1.6
--- src/dist/nvi/common/exf.c:1.5 Sun Jul 15 05:13:59 2012
+++ src/dist/nvi/common/exf.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exf.c,v 1.5 2012/07/15 09:13:59 spz Exp $ */
+/* $NetBSD: exf.c,v 1.6 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -131,10 +131,10 @@ file_init(SCR *sp, FREF *frp, char *rcv_
EXF *ep;
struct stat sb;
size_t psize;
- int fd, exists, open_err, readonly, stolen;
+ int fd, exists, open_err, readonly;
char *oname = NULL, tname[MAXPATHLEN];
- stolen = open_err = readonly = 0;
+ open_err = readonly = 0;
/*
* If the file is a recovery file, let the recovery code handle it.
Index: src/dist/nvi/common/key.c
diff -u src/dist/nvi/common/key.c:1.6 src/dist/nvi/common/key.c:1.7
--- src/dist/nvi/common/key.c:1.6 Mon Mar 21 10:53:02 2011
+++ src/dist/nvi/common/key.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.6 2011/03/21 14:53:02 tnozaki Exp $ */
+/* $NetBSD: key.c,v 1.7 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -345,12 +345,10 @@ v_event_push(SCR *sp, EVENT *p_evp, cons
/* CH_* flags. */
{
EVENT *evp;
- GS *gp;
WIN *wp;
size_t total;
/* If we have room, stuff the items into the buffer. */
- gp = sp->gp;
wp = sp->wp;
if (nitems <= wp->i_next ||
(wp->i_event != NULL && wp->i_cnt == 0 && nitems <= wp->i_nelem)) {
Index: src/dist/nvi/ex/ex.c
diff -u src/dist/nvi/ex/ex.c:1.9 src/dist/nvi/ex/ex.c:1.10
--- src/dist/nvi/ex/ex.c:1.9 Wed Nov 23 14:25:28 2011
+++ src/dist/nvi/ex/ex.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex.c,v 1.9 2011/11/23 19:25:28 tnozaki Exp $ */
+/* $NetBSD: ex.c,v 1.10 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -52,7 +52,6 @@ static void ex_unknown __P((SCR *, CHAR_
int
ex(SCR **spp)
{
- EX_PRIVATE *exp;
GS *gp;
WIN *wp;
MSGS *mp;
@@ -63,7 +62,6 @@ ex(SCR **spp)
sp = *spp;
wp = sp->wp;
gp = sp->gp;
- exp = EXP(sp);
/* Start the ex screen. */
if (ex_init(sp))
@@ -1628,8 +1626,6 @@ int
ex_range(SCR *sp, EXCMD *ecp, int *errp)
{
enum { ADDR_FOUND, ADDR_NEED, ADDR_NONE } addr;
- GS *gp;
- EX_PRIVATE *exp;
MARK m;
int isaddr;
@@ -1656,8 +1652,6 @@ ex_range(SCR *sp, EXCMD *ecp, int *errp)
* addresses. For consistency, we make it true for leading semicolon
* addresses as well.
*/
- gp = sp->gp;
- exp = EXP(sp);
for (addr = ADDR_NONE, ecp->addrcnt = 0; ecp->clen > 0;)
switch (*ecp->cp) {
case '%': /* Entire file. */
@@ -1827,17 +1821,12 @@ static int
ex_line(SCR *sp, EXCMD *ecp, MARK *mp, int *isaddrp, int *errp)
{
enum nresult nret;
- EX_PRIVATE *exp;
- GS *gp;
long total, val;
unsigned long uval;
int isneg;
int (*sf) __P((SCR *, MARK *, MARK *, CHAR_T *, size_t, CHAR_T **, u_int));
CHAR_T *endp;
- gp = sp->gp;
- exp = EXP(sp);
-
*isaddrp = *errp = 0;
F_CLR(ecp, E_DELTA);
Index: src/dist/nvi/ex/ex_args.c
diff -u src/dist/nvi/ex/ex_args.c:1.3 src/dist/nvi/ex/ex_args.c:1.4
--- src/dist/nvi/ex/ex_args.c:1.3 Sat Jan 17 22:45:50 2009
+++ src/dist/nvi/ex/ex_args.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_args.c,v 1.3 2009/01/18 03:45:50 lukem Exp $ */
+/* $NetBSD: ex_args.c,v 1.4 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -265,7 +265,6 @@ ex_rew(SCR *sp, EXCMD *cmdp)
int
ex_args(SCR *sp, EXCMD *cmdp)
{
- GS *gp;
int cnt, sep;
size_t col, len;
char **ap;
@@ -275,7 +274,6 @@ ex_args(SCR *sp, EXCMD *cmdp)
return (0);
}
- gp = sp->gp;
col = len = sep = 0;
for (cnt = 1, ap = sp->argv; *ap != NULL; ++ap) {
col += len = strlen(*ap) + sep + (ap == sp->cargv ? 2 : 0);
Index: src/dist/nvi/ex/ex_bang.c
diff -u src/dist/nvi/ex/ex_bang.c:1.3 src/dist/nvi/ex/ex_bang.c:1.4
--- src/dist/nvi/ex/ex_bang.c:1.3 Sat Nov 14 18:40:11 2009
+++ src/dist/nvi/ex/ex_bang.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_bang.c,v 1.3 2009/11/14 23:40:11 christos Exp $ */
+/* $NetBSD: ex_bang.c,v 1.4 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -56,7 +56,6 @@ ex_bang(SCR *sp, EXCMD *cmdp)
EX_PRIVATE *exp;
MARK rm;
db_recno_t lno;
- int rval;
const char *msg;
const char *np;
size_t nlen;
@@ -156,7 +155,7 @@ ex_bang(SCR *sp, EXCMD *cmdp)
ftype = FILTER_RBANG;
}
}
- rval = ex_filter(sp, cmdp,
+ (void)ex_filter(sp, cmdp,
&cmdp->addr1, &cmdp->addr2, &rm, ap->bp, ftype);
/*
Index: src/dist/nvi/ex/ex_display.c
diff -u src/dist/nvi/ex/ex_display.c:1.3 src/dist/nvi/ex/ex_display.c:1.4
--- src/dist/nvi/ex/ex_display.c:1.3 Mon Mar 21 10:53:03 2011
+++ src/dist/nvi/ex/ex_display.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_display.c,v 1.3 2011/03/21 14:53:03 tnozaki Exp $ */
+/* $NetBSD: ex_display.c,v 1.4 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -121,12 +121,10 @@ static void
db(SCR *sp, CB *cbp, const char *np)
{
CHAR_T *p;
- GS *gp;
TEXT *tp;
size_t len;
const unsigned char *name = (const void *)np;
- gp = sp->gp;
(void)ex_printf(sp, "********** %s%s\n",
name == NULL ? KEY_NAME(sp, cbp->name) : name,
F_ISSET(cbp, CB_LMODE) ? " (line mode)" : " (character mode)");
Index: src/dist/nvi/ex/ex_argv.c
diff -u src/dist/nvi/ex/ex_argv.c:1.4 src/dist/nvi/ex/ex_argv.c:1.5
--- src/dist/nvi/ex/ex_argv.c:1.4 Mon Mar 21 10:53:03 2011
+++ src/dist/nvi/ex/ex_argv.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_argv.c,v 1.4 2011/03/21 14:53:03 tnozaki Exp $ */
+/* $NetBSD: ex_argv.c,v 1.5 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -89,14 +89,12 @@ argv_exp0(SCR *sp, EXCMD *excp, const CH
int
argv_exp1(SCR *sp, EXCMD *excp, const CHAR_T *cmd, size_t cmdlen, int is_bang)
{
- EX_PRIVATE *exp;
size_t blen, len;
CHAR_T *p, *t, *bp;
GET_SPACE_RETW(sp, bp, blen, 512);
len = 0;
- exp = EXP(sp);
if (argv_fexp(sp, excp, cmd, cmdlen, bp, &len, &bp, &blen, is_bang)) {
FREE_SPACEW(sp, bp, blen);
return (1);
Index: src/dist/nvi/ex/ex_global.c
diff -u src/dist/nvi/ex/ex_global.c:1.4 src/dist/nvi/ex/ex_global.c:1.5
--- src/dist/nvi/ex/ex_global.c:1.4 Mon Mar 21 10:53:03 2011
+++ src/dist/nvi/ex/ex_global.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_global.c,v 1.4 2011/03/21 14:53:03 tnozaki Exp $ */
+/* $NetBSD: ex_global.c,v 1.5 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -71,7 +71,6 @@ ex_g_setup(SCR *sp, EXCMD *cmdp, enum wh
RANGE *rp;
busy_t btype;
db_recno_t start, end;
- regex_t *re;
regmatch_t match[1];
size_t len;
int cnt, delim, eval;
@@ -150,7 +149,6 @@ usage: ex_emsg(sp, cmdp->cmd->usage, EX
*/
sp->searchdir = FORWARD;
}
- re = &sp->re_c;
/* The global commands always set the previous context mark. */
myabs.lno = sp->lno;
Index: src/dist/nvi/ex/ex_subst.c
diff -u src/dist/nvi/ex/ex_subst.c:1.4 src/dist/nvi/ex/ex_subst.c:1.5
--- src/dist/nvi/ex/ex_subst.c:1.4 Mon Mar 21 10:53:03 2011
+++ src/dist/nvi/ex/ex_subst.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_subst.c,v 1.4 2011/03/21 14:53:03 tnozaki Exp $ */
+/* $NetBSD: ex_subst.c,v 1.5 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -353,7 +353,7 @@ s(SCR *sp, EXCMD *cmdp, CHAR_T *st, rege
regmatch_t match[10];
size_t blen, cnt, last, lbclen, lblen, len, llen;
size_t offset, saved_offset, scno;
- int cflag, lflag, nflag, pflag, rflag;
+ int lflag, nflag, pflag, rflag;
int didsub, do_eol_match, eflags, empty_ok, eval;
int linechanged, matched, quit, rval;
CHAR_T *lb, *bp;
@@ -391,7 +391,7 @@ s(SCR *sp, EXCMD *cmdp, CHAR_T *st, rege
* just take it them in whatever order the user gives them. (The ex
* usage statement doesn't reflect this.)
*/
- cflag = lflag = nflag = pflag = rflag = 0;
+ lflag = nflag = pflag = rflag = 0;
if (st == NULL)
goto noargs;
for (lno = OOBLNO; *st != '\0'; ++st)
Index: src/dist/nvi/ex/ex_print.c
diff -u src/dist/nvi/ex/ex_print.c:1.2 src/dist/nvi/ex/ex_print.c:1.3
--- src/dist/nvi/ex/ex_print.c:1.2 Fri Dec 5 17:51:42 2008
+++ src/dist/nvi/ex/ex_print.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_print.c,v 1.2 2008/12/05 22:51:42 christos Exp $ */
+/* $NetBSD: ex_print.c,v 1.3 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -97,7 +97,6 @@ ex_pr(SCR *sp, EXCMD *cmdp)
int
ex_print(SCR *sp, EXCMD *cmdp, MARK *fp, MARK *tp, u_int32_t flags)
{
- GS *gp;
db_recno_t from, to;
size_t col, len;
const CHAR_T *p;
@@ -106,7 +105,6 @@ ex_print(SCR *sp, EXCMD *cmdp, MARK *fp,
NEEDFILE(sp, cmdp);
- gp = sp->gp;
for (from = fp->lno, to = tp->lno; from <= to; ++from) {
col = 0;
@@ -215,12 +213,10 @@ ex_prchars(SCR *sp, const CHAR_T *p, siz
{
CHAR_T ch;
const char *kp;
- GS *gp;
size_t col, tlen, ts;
if (O_ISSET(sp, O_LIST))
LF_SET(E_C_LIST);
- gp = sp->gp;
ts = O_VAL(sp, O_TABSTOP);
for (col = *colp; len--;)
if ((ch = *p++) == L('\t') && !LF_ISSET(E_C_LIST))
Index: src/dist/nvi/ex/ex_script.c
diff -u src/dist/nvi/ex/ex_script.c:1.5 src/dist/nvi/ex/ex_script.c:1.6
--- src/dist/nvi/ex/ex_script.c:1.5 Wed Nov 23 14:18:53 2011
+++ src/dist/nvi/ex/ex_script.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_script.c,v 1.5 2011/11/23 19:18:53 tnozaki Exp $ */
+/* $NetBSD: ex_script.c,v 1.6 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -415,13 +415,11 @@ loop: memcpy(&rdfd, fdset, sizeof(fd_set
int
sscr_input(SCR *sp)
{
- GS *gp;
WIN *wp;
struct timeval poll;
fd_set rdfd;
int maxfd;
- gp = sp->gp;
wp = sp->wp;
loop: maxfd = 0;
Index: src/dist/nvi/ex/ex_tag.c
diff -u src/dist/nvi/ex/ex_tag.c:1.11 src/dist/nvi/ex/ex_tag.c:1.12
--- src/dist/nvi/ex/ex_tag.c:1.11 Fri Feb 24 19:13:00 2012
+++ src/dist/nvi/ex/ex_tag.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_tag.c,v 1.11 2012/02/25 00:13:00 joerg Exp $ */
+/* $NetBSD: ex_tag.c,v 1.12 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -1069,7 +1069,6 @@ gtag_slist(SCR *sp, CHAR_T *tag, int ref
{
TAGQ *tqp;
size_t len, nlen, slen, wlen;
- int echk;
TAG *tp;
const char *np;
char *name, *file, *search;
@@ -1100,7 +1099,6 @@ gtag_slist(SCR *sp, CHAR_T *tag, int ref
while (fgetc(fp) != '\n')
;
if (getentry(buf, &name, &file, &search) == 0) {
- echk = 1;
break;
}
slen = strlen(search);
@@ -1345,7 +1343,6 @@ static void
ctag_file(SCR *sp, TAGF *tfp, char *name, char **dirp, size_t *dlenp)
{
struct stat sb;
- size_t len;
char *p, buf[MAXPATHLEN];
/*
@@ -1360,7 +1357,7 @@ ctag_file(SCR *sp, TAGF *tfp, char *name
if (name[0] != '/' &&
stat(name, &sb) && (p = strrchr(tfp->name, '/')) != NULL) {
*p = '\0';
- len = snprintf(buf, sizeof(buf), "%s/%s", tfp->name, name);
+ (void)snprintf(buf, sizeof(buf), "%s/%s", tfp->name, name);
if (stat(buf, &sb) == 0) {
*dirp = tfp->name;
*dlenp = strlen(*dirp);
Index: src/dist/nvi/ex/ex_usage.c
diff -u src/dist/nvi/ex/ex_usage.c:1.6 src/dist/nvi/ex/ex_usage.c:1.7
--- src/dist/nvi/ex/ex_usage.c:1.6 Mon Mar 21 10:53:03 2011
+++ src/dist/nvi/ex/ex_usage.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_usage.c,v 1.6 2011/03/21 14:53:03 tnozaki Exp $ */
+/* $NetBSD: ex_usage.c,v 1.7 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -146,11 +146,9 @@ ex_usage(SCR *sp, EXCMD *cmdp)
int
ex_viusage(SCR *sp, EXCMD *cmdp)
{
- GS *gp;
VIKEYS const *kp;
int key;
- gp = sp->gp;
switch (cmdp->argc) {
case 1:
if (cmdp->argv[0]->len != 1) {
Index: src/dist/nvi/regex/engine.c
diff -u src/dist/nvi/regex/engine.c:1.7 src/dist/nvi/regex/engine.c:1.8
--- src/dist/nvi/regex/engine.c:1.7 Sat Nov 19 12:45:11 2011
+++ src/dist/nvi/regex/engine.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: engine.c,v 1.7 2011/11/19 17:45:11 tnozaki Exp $ */
+/* $NetBSD: engine.c,v 1.8 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -380,6 +380,7 @@ sopno stopst;
/* did innards match? */
if (slow(m, sp, rest, ssub, esub) != NULL) {
dp = dissect(m, sp, rest, ssub, esub);
+ __USE(dp);
assert(dp == rest);
} else /* no */
assert(sp == rest);
Index: src/dist/nvi/vi/v_mark.c
diff -u src/dist/nvi/vi/v_mark.c:1.2 src/dist/nvi/vi/v_mark.c:1.3
--- src/dist/nvi/vi/v_mark.c:1.2 Fri Dec 5 17:51:43 2008
+++ src/dist/nvi/vi/v_mark.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: v_mark.c,v 1.2 2008/12/05 22:51:43 christos Exp $ */
+/* $NetBSD: v_mark.c,v 1.3 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -106,7 +106,6 @@ v_emark(SCR *sp, VICMD *vp)
static int
mark(SCR *sp, VICMD *vp, int getmark, enum which cmd)
{
- dir_t dir;
MARK m;
size_t len;
@@ -171,9 +170,7 @@ mark(SCR *sp, VICMD *vp, int getmark, en
m = vp->m_start;
vp->m_start = vp->m_stop;
vp->m_stop = m;
- dir = BACKWARD;
} else
- dir = FORWARD;
/*
* Yank cursor motion, when associated with marks as motion commands,
Index: src/dist/nvi/vi/v_search.c
diff -u src/dist/nvi/vi/v_search.c:1.4 src/dist/nvi/vi/v_search.c:1.5
--- src/dist/nvi/vi/v_search.c:1.4 Mon Mar 21 10:53:04 2011
+++ src/dist/nvi/vi/v_search.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: v_search.c,v 1.4 2011/03/21 14:53:04 tnozaki Exp $ */
+/* $NetBSD: v_search.c,v 1.5 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -351,12 +351,8 @@ v_searchw(SCR *sp, VICMD *vp)
int
v_esearch(SCR *sp, VICMD *vp)
{
- MARK m;
int flags;
- m.lno = sp->lno;
- m.cno = sp->cno;
-
LF_INIT(SEARCH_NOOPT);
if (FL_ISSET(vp->ev.e_flags, VI_SEARCH_EXT))
LF_SET(SEARCH_EXTEND);
@@ -444,7 +440,6 @@ v_search(SCR *sp, VICMD *vp, CHAR_T *ptr
int
v_correct(SCR *sp, VICMD *vp, int isdelta)
{
- dir_t dir;
MARK m;
size_t len;
@@ -489,9 +484,7 @@ v_correct(SCR *sp, VICMD *vp, int isdelt
m = vp->m_start;
vp->m_start = vp->m_stop;
vp->m_stop = m;
- dir = BACKWARD;
} else
- dir = FORWARD;
/*
* BACKWARD:
Index: src/dist/nvi/vi/v_txt.c
diff -u src/dist/nvi/vi/v_txt.c:1.8 src/dist/nvi/vi/v_txt.c:1.9
--- src/dist/nvi/vi/v_txt.c:1.8 Wed Nov 23 14:25:28 2011
+++ src/dist/nvi/vi/v_txt.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: v_txt.c,v 1.8 2011/11/23 19:25:28 tnozaki Exp $ */
+/* $NetBSD: v_txt.c,v 1.9 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -1473,7 +1473,6 @@ alloc_err:
static int
txt_abbrev(SCR *sp, TEXT *tp, ARG_CHAR_T *pushcp, int isinfoline, int *didsubp, int *turnoffp)
{
- VI_PRIVATE *vip;
CHAR_T ch, *p;
SEQ *qp;
size_t len, off;
@@ -1483,8 +1482,6 @@ txt_abbrev(SCR *sp, TEXT *tp, ARG_CHAR_T
if (tp->cno == tp->offset)
return (0);
- vip = VIP(sp);
-
/*
* Find the start of the "word".
*
@@ -1823,7 +1820,6 @@ v_txt_auto(SCR *sp, db_recno_t lno, TEXT
static TEXT *
txt_backup(SCR *sp, TEXTH *tiqh, TEXT *tp, u_int32_t *flagsp)
{
- VI_PRIVATE *vip;
TEXT *ntp;
/* Get a handle on the previous TEXT structure. */
@@ -1838,7 +1834,6 @@ txt_backup(SCR *sp, TEXTH *tiqh, TEXT *t
ntp->len = ntp->sv_len;
/* Handle appending to the line. */
- vip = VIP(sp);
if (ntp->owrite == 0 && ntp->insert == 0) {
ntp->lb[ntp->len] = CH_CURSOR;
++ntp->insert;
@@ -2661,7 +2656,6 @@ txt_isrch(SCR *sp, VICMD *vp, TEXT *tp,
static int
txt_resolve(SCR *sp, TEXTH *tiqh, u_int32_t flags)
{
- VI_PRIVATE *vip;
TEXT *tp;
db_recno_t lno;
int changed;
@@ -2673,7 +2667,6 @@ txt_resolve(SCR *sp, TEXTH *tiqh, u_int3
* change, we have to redisplay it, otherwise the information cached
* about the line will be wrong.
*/
- vip = VIP(sp);
tp = tiqh->cqh_first;
if (LF_ISSET(TXT_AUTOINDENT))
@@ -2715,13 +2708,10 @@ txt_resolve(SCR *sp, TEXTH *tiqh, u_int3
static int
txt_showmatch(SCR *sp, TEXT *tp)
{
- GS *gp;
VCS cs;
MARK m;
int cnt, endc, startc;
- gp = sp->gp;
-
/*
* Do a refresh first, in case we haven't done one in awhile,
* so the user can see what we're complaining about.
@@ -2782,14 +2772,12 @@ txt_showmatch(SCR *sp, TEXT *tp)
static int
txt_margin(SCR *sp, TEXT *tp, TEXT *wmtp, int *didbreak, u_int32_t flags)
{
- VI_PRIVATE *vip;
size_t len, off;
- CHAR_T *p, *wp;
+ CHAR_T *p;
/* Find the nearest previous blank. */
for (off = tp->cno - 1, p = tp->lb + off, len = 0;; --off, --p, ++len) {
if (ISBLANK((UCHAR_T)*p)) {
- wp = p + 1;
break;
}
@@ -2818,7 +2806,6 @@ txt_margin(SCR *sp, TEXT *tp, TEXT *wmtp
* line -- it's going to be used to set the cursor value when we
* move to the new line.
*/
- vip = VIP(sp);
wmtp->lb = p + 1;
wmtp->offset = len;
wmtp->insert = LF_ISSET(TXT_APPENDEOL) ? tp->insert - 1 : tp->insert;
Index: src/dist/nvi/vi/vs_line.c
diff -u src/dist/nvi/vi/vs_line.c:1.6 src/dist/nvi/vi/vs_line.c:1.7
--- src/dist/nvi/vi/vs_line.c:1.6 Wed Nov 16 09:24:43 2011
+++ src/dist/nvi/vi/vs_line.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vs_line.c,v 1.6 2011/11/16 14:24:43 tnozaki Exp $ */
+/* $NetBSD: vs_line.c,v 1.7 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -496,13 +496,11 @@ vs_number(SCR *sp)
{
GS *gp;
SMAP *smp;
- VI_PRIVATE *vip;
size_t len, oldy, oldx;
int exist;
char nbuf[10];
gp = sp->gp;
- vip = VIP(sp);
/* No reason to do anything if we're in input mode on the info line. */
if (F_ISSET(sp, SC_TINPUT_INFO))
Index: src/dist/nvi/vi/vs_msg.c
diff -u src/dist/nvi/vi/vs_msg.c:1.5 src/dist/nvi/vi/vs_msg.c:1.6
--- src/dist/nvi/vi/vs_msg.c:1.5 Fri Feb 24 19:13:00 2012
+++ src/dist/nvi/vi/vs_msg.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vs_msg.c,v 1.5 2012/02/25 00:13:00 joerg Exp $ */
+/* $NetBSD: vs_msg.c,v 1.6 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -399,13 +399,13 @@ vs_output(SCR *sp, mtype_t mtype, const
GS *gp;
VI_PRIVATE *vip;
size_t chlen, notused;
- int ch, len, rlen, tlen;
+ int ch, len, tlen;
const char *p, *t;
char *cbp, *ecbp, cbuf[128];
gp = sp->gp;
vip = VIP(sp);
- for (p = line, rlen = llen; llen > 0;) {
+ for (p = line; llen > 0;) {
/* Get the next physical line. */
if ((p = memchr(line, '\n', llen)) == NULL)
len = llen;
Index: src/dist/nvi/vi/vs_split.c
diff -u src/dist/nvi/vi/vs_split.c:1.3 src/dist/nvi/vi/vs_split.c:1.4
--- src/dist/nvi/vi/vs_split.c:1.3 Sat Jan 17 22:45:50 2009
+++ src/dist/nvi/vi/vs_split.c Fri Oct 18 16:40:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vs_split.c,v 1.3 2009/01/18 03:45:50 lukem Exp $ */
+/* $NetBSD: vs_split.c,v 1.4 2013/10/18 20:40:15 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -298,11 +298,8 @@ vs_vsplit(SCR *sp, SCR *new)
static void
vs_insert(SCR *sp, WIN *wp)
{
- GS *gp;
SCR *tsp;
- gp = sp->gp;
-
sp->wp = wp;
/* Move past all screens with lower row numbers. */
@@ -458,13 +455,11 @@ vs_discard(SCR *sp, SCR **spp)
static int
vs_join(SCR *sp, SCR **listp, jdir_t *jdirp)
{
- GS *gp;
WIN *wp;
SCR **lp, *tsp;
int first;
size_t tlen;
- gp = sp->gp;
wp = sp->wp;
/* Check preceding vertical. */
