[src/trunk]: src/external/bsd/nvi/dist don't use err, it conflicts with err(3)

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4276e4327e52
branches:  trunk
changeset: 325453:4276e4327e52
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Dec 25 17:18:39 2013 +0000

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

diffstat:

 external/bsd/nvi/dist/cl/cl_main.c  |  8 ++++----
 external/bsd/nvi/dist/vi/v_search.c |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r 3a595494dea0 -r 4276e4327e52 external/bsd/nvi/dist/cl/cl_main.c
--- a/external/bsd/nvi/dist/cl/cl_main.c        Wed Dec 25 16:05:59 2013 +0000
+++ b/external/bsd/nvi/dist/cl/cl_main.c        Wed Dec 25 17:18:39 2013 +0000
@@ -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 @@
 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);
diff -r 3a595494dea0 -r 4276e4327e52 external/bsd/nvi/dist/vi/v_search.c
--- a/external/bsd/nvi/dist/vi/v_search.c       Wed Dec 25 16:05:59 2013 +0000
+++ b/external/bsd/nvi/dist/vi/v_search.c       Wed Dec 25 17:18:39 2013 +0000
@@ -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 @@
        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 @@
         * 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 @@
        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. */