[src/trunk]: src/external/bsd/mdocml/dist Deal with two cases of name shadowing

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

details:   https://anonhg.NetBSD.org/src/rev/d19ffc56e4db
branches:  trunk
changeset: 764302:d19ffc56e4db
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Apr 15 15:50:28 2011 +0000

description:
Deal with two cases of name shadowing

diffstat:

 external/bsd/mdocml/dist/mdoc_argv.c  |  24 ++++++++++++------------
 external/bsd/mdocml/dist/tbl_layout.c |  10 +++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

diffs (84 lines):

diff -r 02e0feb5e92f -r d19ffc56e4db external/bsd/mdocml/dist/mdoc_argv.c
--- a/external/bsd/mdocml/dist/mdoc_argv.c      Fri Apr 15 15:30:59 2011 +0000
+++ b/external/bsd/mdocml/dist/mdoc_argv.c      Fri Apr 15 15:50:28 2011 +0000
@@ -652,40 +652,40 @@
 static enum mdocargt
 argv_a2arg(enum mdoct tok, const char *p)
 {
-       const enum mdocargt *args;
+       const enum mdocargt *argsp;
 
-       args = NULL;
+       argsp = NULL;
 
        switch (tok) {
        case (MDOC_An):
-               args = args_An;
+               argsp = args_An;
                break;
        case (MDOC_Bd):
-               args = args_Bd;
+               argsp = args_Bd;
                break;
        case (MDOC_Bf):
-               args = args_Bf;
+               argsp = args_Bf;
                break;
        case (MDOC_Bk):
-               args = args_Bk;
+               argsp = args_Bk;
                break;
        case (MDOC_Bl):
-               args = args_Bl;
+               argsp = args_Bl;
                break;
        case (MDOC_Rv):
                /* FALLTHROUGH */
        case (MDOC_Ex):
-               args = args_Ex;
+               argsp = args_Ex;
                break;
        default:
                return(MDOC_ARG_MAX);
        }
 
-       assert(args);
+       assert(argsp);
 
-       for ( ; MDOC_ARG_MAX != *args ; args++)
-               if (0 == strcmp(p, mdoc_argnames[*args]))
-                       return(*args);
+       for ( ; MDOC_ARG_MAX != *argsp ; argsp++)
+               if (0 == strcmp(p, mdoc_argnames[*argsp]))
+                       return(*argsp);
 
        return(MDOC_ARG_MAX);
 }
diff -r 02e0feb5e92f -r d19ffc56e4db external/bsd/mdocml/dist/tbl_layout.c
--- a/external/bsd/mdocml/dist/tbl_layout.c     Fri Apr 15 15:30:59 2011 +0000
+++ b/external/bsd/mdocml/dist/tbl_layout.c     Fri Apr 15 15:50:28 2011 +0000
@@ -427,19 +427,19 @@
 }
 
 static void
-head_adjust(const struct tbl_cell *cell, struct tbl_head *head)
+head_adjust(const struct tbl_cell *cellp, struct tbl_head *head)
 {
-       if (TBL_CELL_VERT != cell->pos &&
-                       TBL_CELL_DVERT != cell->pos) {
+       if (TBL_CELL_VERT != cellp->pos &&
+                       TBL_CELL_DVERT != cellp->pos) {
                head->pos = TBL_HEAD_DATA;
                return;
        }
 
-       if (TBL_CELL_VERT == cell->pos)
+       if (TBL_CELL_VERT == cellp->pos)
                if (TBL_HEAD_DVERT != head->pos)
                        head->pos = TBL_HEAD_VERT;
 
-       if (TBL_CELL_DVERT == cell->pos)
+       if (TBL_CELL_DVERT == cellp->pos)
                head->pos = TBL_HEAD_DVERT;
 }