diff options
| author | Joerg Sonnenberger <joerg@netbsd.org> | 2011-04-07 01:08:42 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@netbsd.org> | 2011-04-07 01:08:42 +0000 |
| commit | e99813aa631956ea6bc1323879f2817f2fe6f761 (patch) | |
| tree | e8b59faf54089ca36d09b90e933a405a8bfee947 | |
| parent | 27aea7255c76e3a5eb45660da5b5ead2dc61b692 (diff) | |
| download | mandoc-e99813aa631956ea6bc1323879f2817f2fe6f761.tar.gz | |
Don't shadow global identifiers.
| -rw-r--r-- | mdoc_argv.c | 24 | ||||
| -rw-r--r-- | tbl_layout.c | 10 |
2 files changed, 17 insertions, 17 deletions
diff --git a/mdoc_argv.c b/mdoc_argv.c index 6bca095e..32bdc0cf 100644 --- a/mdoc_argv.c +++ b/mdoc_argv.c @@ -652,40 +652,40 @@ args_checkpunct(struct mdoc *m, const char *buf, int i, int ln, int fl) 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 --git a/tbl_layout.c b/tbl_layout.c index 65df1447..8dd35484 100644 --- a/tbl_layout.c +++ b/tbl_layout.c @@ -427,19 +427,19 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos) } 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; } |