summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc/libmdoc.h
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2012-11-17 00:25:20 +0000
committerschwarze <schwarze@openbsd.org>2012-11-17 00:25:20 +0000
commit7ead8a4edaf221a075d07cdd2a310009890c920d (patch)
tree1a8bdb821ad6a88896f62fcf5374b4cfd7d338d0 /usr.bin/mandoc/libmdoc.h
parentIn SETUP_INCOMING_VARARGS(), make sure to return in pretend_size the amount (diff)
downloadwireguard-openbsd-7ead8a4edaf221a075d07cdd2a310009890c920d.tar.xz
wireguard-openbsd-7ead8a4edaf221a075d07cdd2a310009890c920d.zip
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 'usr.bin/mandoc/libmdoc.h')
-rw-r--r--usr.bin/mandoc/libmdoc.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/usr.bin/mandoc/libmdoc.h b/usr.bin/mandoc/libmdoc.h
index f82dfb58140..f907baf07e3 100644
--- a/usr.bin/mandoc/libmdoc.h
+++ b/usr.bin/mandoc/libmdoc.h
@@ -1,4 +1,4 @@
-/* $Id: libmdoc.h,v 1.50 2012/07/18 11:09:30 schwarze Exp $ */
+/* $Id: libmdoc.h,v 1.51 2012/11/17 00:25:20 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -43,7 +43,7 @@ struct mdoc {
struct roff *roff;
};
-#define MACRO_PROT_ARGS struct mdoc *m, \
+#define MACRO_PROT_ARGS struct mdoc *mdoc, \
enum mdoct tok, \
int line, \
int ppos, \
@@ -100,10 +100,10 @@ extern const struct mdoc_macro *const mdoc_macros;
__BEGIN_DECLS
-#define mdoc_pmsg(m, l, p, t) \
- mandoc_msg((t), (m)->parse, (l), (p), NULL)
-#define mdoc_nmsg(m, n, t) \
- mandoc_msg((t), (m)->parse, (n)->line, (n)->pos, NULL)
+#define mdoc_pmsg(mdoc, l, p, t) \
+ mandoc_msg((t), (mdoc)->parse, (l), (p), NULL)
+#define mdoc_nmsg(mdoc, n, t) \
+ mandoc_msg((t), (mdoc)->parse, (n)->line, (n)->pos, NULL)
int mdoc_macro(MACRO_PROT_ARGS);
int mdoc_word_alloc(struct mdoc *,
int, int, const char *);
@@ -114,9 +114,8 @@ int mdoc_block_alloc(struct mdoc *, int, int,
int mdoc_head_alloc(struct mdoc *, int, int, enum mdoct);
int mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct);
int mdoc_body_alloc(struct mdoc *, int, int, enum mdoct);
-int mdoc_endbody_alloc(struct mdoc *m, int line, int pos,
- enum mdoct tok, struct mdoc_node *body,
- enum mdoc_endbody end);
+int mdoc_endbody_alloc(struct mdoc *, int, int, enum mdoct,
+ struct mdoc_node *, enum mdoc_endbody);
void mdoc_node_delete(struct mdoc *, struct mdoc_node *);
int mdoc_node_relink(struct mdoc *, struct mdoc_node *);
void mdoc_hash_init(void);