summaryrefslogtreecommitdiffstats
path: root/mdoc_man.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_man.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_man.c')
-rw-r--r--mdoc_man.c37
1 files changed, 19 insertions, 18 deletions
diff --git a/mdoc_man.c b/mdoc_man.c
index f6afd614..8f938785 100644
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -28,7 +28,7 @@
#include "mdoc.h"
#include "main.h"
-#define DECL_ARGS const struct mdoc_meta *m, \
+#define DECL_ARGS const struct mdoc_meta *meta, \
const struct mdoc_node *n
struct manact {
@@ -471,14 +471,15 @@ man_man(void *arg, const struct man *man)
void
man_mdoc(void *arg, const struct mdoc *mdoc)
{
- const struct mdoc_meta *m;
+ const struct mdoc_meta *meta;
const struct mdoc_node *n;
- m = mdoc_meta(mdoc);
+ meta = mdoc_meta(mdoc);
n = mdoc_node(mdoc);
printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"",
- m->title, m->msec, m->date, m->os, m->vol);
+ meta->title, meta->msec, meta->date,
+ meta->os, meta->vol);
outflags = MMAN_nl | MMAN_Sm;
if (0 == fontqueue.size) {
@@ -486,7 +487,7 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
fontqueue.head = fontqueue.tail = mandoc_malloc(8);
*fontqueue.tail = 'R';
}
- print_node(m, n);
+ print_node(meta, n);
putchar('\n');
}
@@ -527,9 +528,9 @@ print_node(DECL_ARGS)
* node.
*/
act = manacts + n->tok;
- cond = NULL == act->cond || (*act->cond)(m, n);
+ cond = NULL == act->cond || (*act->cond)(meta, n);
if (cond && act->pre)
- do_sub = (*act->pre)(m, n);
+ do_sub = (*act->pre)(meta, n);
}
/*
@@ -539,13 +540,13 @@ print_node(DECL_ARGS)
*/
if (do_sub)
for (sub = n->child; sub; sub = sub->next)
- print_node(m, sub);
+ print_node(meta, sub);
/*
* Lastly, conditionally run the post-node handler.
*/
if (cond && act->post)
- (*act->post)(m, n);
+ (*act->post)(meta, n);
}
static int
@@ -636,7 +637,7 @@ post__t(DECL_ARGS)
putchar('\"');
} else
font_pop();
- post_percent(m, n);
+ post_percent(meta, n);
}
/*
@@ -939,7 +940,7 @@ pre_fa(DECL_ARGS)
while (NULL != n) {
font_push('I');
- print_node(m, n);
+ print_node(meta, n);
font_pop();
if (NULL != (n = n->next))
print_word(",");
@@ -1003,7 +1004,7 @@ pre_fn(DECL_ARGS)
return(0);
font_push('B');
- print_node(m, n);
+ print_node(meta, n);
font_pop();
outflags &= ~MMAN_spc;
print_word("(");
@@ -1011,7 +1012,7 @@ pre_fn(DECL_ARGS)
n = n->next;
if (NULL != n)
- pre_fa(m, n);
+ pre_fa(meta, n);
return(0);
}
@@ -1057,7 +1058,7 @@ post_fo(DECL_ARGS)
font_pop();
break;
case (MDOC_BODY):
- post_fn(m, n);
+ post_fn(meta, n);
break;
default:
break;
@@ -1256,7 +1257,7 @@ pre_nm(DECL_ARGS)
pre_syn(n);
if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
return(1);
- name = n->child ? n->child->string : m->name;
+ name = n->child ? n->child->string : meta->name;
if (NULL == name)
return(0);
if (MDOC_HEAD == n->type) {
@@ -1268,7 +1269,7 @@ pre_nm(DECL_ARGS)
}
font_push('B');
if (NULL == n->child)
- print_word(m->name);
+ print_word(meta->name);
return(1);
}
@@ -1400,13 +1401,13 @@ pre_xr(DECL_ARGS)
n = n->child;
if (NULL == n)
return(0);
- print_node(m, n);
+ print_node(meta, n);
n = n->next;
if (NULL == n)
return(0);
outflags &= ~MMAN_spc;
print_word("(");
- print_node(m, n);
+ print_node(meta, n);
print_word(")");
return(0);
}