Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't use err, it conflicts with err(3)

Browse Source
This commit is contained in:
christos 2013-12-25 17:18:39 +00:00
parent 0d115b4766
commit 6495e57c27
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
external/bsd/nvi/dist/cl/cl_main.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: cl_main.c,v 1.2 2013/11/22 15:52:05 christos Exp $ */
/* $NetBSD: cl_main.c,v 1.3 2013/12/25 17:18:39 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
* The Regents of the University of California. All rights reserved.
@ -239,11 +239,11 @@ cl_end(CL_PRIVATE *clp)
static void
term_init(const char *name, const char *ttype)
{
int err;
int error;
/* Set up the terminal database information. */
setupterm(__UNCONST(ttype), STDOUT_FILENO, &err);
switch (err) {
setupterm(__UNCONST(ttype), STDOUT_FILENO, &error);
switch (error) {
case -1:
(void)fprintf(stderr,
"%s: No terminal database found\n", name);

8
external/bsd/nvi/dist/vi/v_search.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: v_search.c,v 1.3 2013/11/25 22:43:46 christos Exp $ */
/* $NetBSD: v_search.c,v 1.4 2013/12/25 17:18:39 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@ -70,7 +70,7 @@ v_exaddr(SCR *sp, VICMD *vp, dir_t dir)
TEXT *tp;
db_recno_t s_lno;
size_t len, s_cno, tlen;
int err, nb, type;
int error, nb, type;
char buf[20];
CHAR_T *cmd, *t;
const CHAR_T *w;
@ -174,7 +174,7 @@ v_exaddr(SCR *sp, VICMD *vp, dir_t dir)
* confused the parser. We're not that compatible.
*/
cmdp = &wp->excmd;
if (ex_range(sp, cmdp, &err))
if (ex_range(sp, cmdp, &error))
return (1);
/*
@ -185,7 +185,7 @@ v_exaddr(SCR *sp, VICMD *vp, dir_t dir)
len = cmdp->clen;
wp->excmd.clen = 0;
if (err)
if (error)
goto err2;
/* Copy out the new cursor position and make sure it's okay. */