summaryrefslogtreecommitdiffstats
path: root/mdoc_validate.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2012-11-17 00:26:33 +0000
committerIngo Schwarze <schwarze@openbsd.org>2012-11-17 00:26:33 +0000
commit1f03d7beeffd15115d82eff4add4681db338cdd1 (patch)
tree8c5e843389db13e8454ff19ebd5ef27c415b51c9 /mdoc_validate.c
parentfef2be9d4fbfa0fd7ac0a086c950c1ce9013a984 (diff)
downloadmandoc-1f03d7beeffd15115d82eff4add4681db338cdd1.tar.gz
Cleanup naming of local variables to make the code easier on the eye:
Settle for "struct man *man", "struct mdoc *mdoc", "struct meta *meta" and avoid the confusing "*m" which was sometimes this, sometimes that. No functional change. ok kristaps@ some time ago
Diffstat (limited to 'mdoc_validate.c')
-rw-r--r--mdoc_validate.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/mdoc_validate.c b/mdoc_validate.c
index 80808d93..54630d1b 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -416,29 +416,29 @@ mdoc_valid_post(struct mdoc *mdoc)
}
static int
-check_count(struct mdoc *m, enum mdoc_type type,
+check_count(struct mdoc *mdoc, enum mdoc_type type,
enum check_lvl lvl, enum check_ineq ineq, int val)
{
const char *p;
enum mandocerr t;
- if (m->last->type != type)
+ if (mdoc->last->type != type)
return(1);
switch (ineq) {
case (CHECK_LT):
p = "less than ";
- if (m->last->nchild < val)
+ if (mdoc->last->nchild < val)
return(1);
break;
case (CHECK_GT):
p = "more than ";
- if (m->last->nchild > val)
+ if (mdoc->last->nchild > val)
return(1);
break;
case (CHECK_EQ):
p = "";
- if (val == m->last->nchild)
+ if (val == mdoc->last->nchild)
return(1);
break;
default:
@@ -447,9 +447,9 @@ check_count(struct mdoc *m, enum mdoc_type type,
}
t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT;
- mandoc_vmsg(t, m->parse, m->last->line, m->last->pos,
+ mandoc_vmsg(t, mdoc->parse, mdoc->last->line, mdoc->last->pos,
"want %s%d children (have %d)",
- p, val, m->last->nchild);
+ p, val, mdoc->last->nchild);
return(1);
}
@@ -515,7 +515,7 @@ hwarn_le1(POST_ARGS)
}
static void
-check_args(struct mdoc *m, struct mdoc_node *n)
+check_args(struct mdoc *mdoc, struct mdoc_node *n)
{
int i;
@@ -524,34 +524,34 @@ check_args(struct mdoc *m, struct mdoc_node *n)
assert(n->args->argc);
for (i = 0; i < (int)n->args->argc; i++)
- check_argv(m, n, &n->args->argv[i]);
+ check_argv(mdoc, n, &n->args->argv[i]);
}
static void
-check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)
+check_argv(struct mdoc *mdoc, struct mdoc_node *n, struct mdoc_argv *v)
{
int i;
for (i = 0; i < (int)v->sz; i++)
- check_text(m, v->line, v->pos, v->value[i]);
+ check_text(mdoc, v->line, v->pos, v->value[i]);
/* FIXME: move to post_std(). */
if (MDOC_Std == v->arg)
- if ( ! (v->sz || m->meta.name))
- mdoc_nmsg(m, n, MANDOCERR_NONAME);
+ if ( ! (v->sz || mdoc->meta.name))
+ mdoc_nmsg(mdoc, n, MANDOCERR_NONAME);
}
static void
-check_text(struct mdoc *m, int ln, int pos, char *p)
+check_text(struct mdoc *mdoc, int ln, int pos, char *p)
{
char *cp;
- if (MDOC_LITERAL & m->flags)
+ if (MDOC_LITERAL & mdoc->flags)
return;
for (cp = p; NULL != (p = strchr(p, '\t')); p++)
- mdoc_pmsg(m, ln, pos + (int)(p - cp), MANDOCERR_BADTAB);
+ mdoc_pmsg(mdoc, ln, pos + (int)(p - cp), MANDOCERR_BADTAB);
}
static int