Clean up messages regarding excess arguments:

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 4bc5128204f636e911d14c151bc7c84cef510c80..dc187849f2f14128b58d801a0b6a448ca753c710 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*     $Id: libman.h,v 1.55 2011/11/07 01:24:40 schwarze Exp $ */
+/*     $Id: libman.h,v 1.58 2014/04/20 16:46:04 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -24,6 +24,7 @@ enum  man_next {
 
 struct man {
        struct mparse   *parse; /* parse pointer */
+       int              quick; /* abort parse early */
        int              flags; /* parse flags */
 #define        MAN_HALT        (1 << 0) /* badness happened: die */
 #define        MAN_ELINE       (1 << 1) /* Next-line element scope. */
@@ -39,7 +40,7 @@ struct        man {
        struct roff     *roff;
 };
 
-#define        MACRO_PROT_ARGS   struct man *m, \
+#define        MACRO_PROT_ARGS   struct man *man, \
                          enum mant tok, \
                          int line, \
                          int ppos, \
@@ -61,10 +62,10 @@ extern      const struct man_macro *const man_macros;
 
 __BEGIN_DECLS
 
-#define                  man_pmsg(m, l, p, t) \
-                 mandoc_msg((t), (m)->parse, (l), (p), NULL)
-#define                  man_nmsg(m, n, t) \
-                 mandoc_msg((t), (m)->parse, (n)->line, (n)->pos, NULL)
+#define                  man_pmsg(man, l, p, t) \
+                 mandoc_msg((t), (man)->parse, (l), (p), NULL)
+#define                  man_nmsg(man, n, t) \
+                 mandoc_msg((t), (man)->parse, (n)->line, (n)->pos, NULL)
 int              man_word_alloc(struct man *, int, int, const char *);
 int              man_block_alloc(struct man *, int, int, enum mant);
 int              man_head_alloc(struct man *, int, int, enum mant);
@@ -77,8 +78,8 @@ enum mant       man_hash_find(const char *);
 int              man_macroend(struct man *);
 int              man_valid_post(struct man *);
 int              man_valid_pre(struct man *, struct man_node *);
-int              man_unscope(struct man *, 
-                       const struct man_node *, enum mandocerr);
+int              man_unscope(struct man *, const struct man_node *,
+                       enum mandocerr);
 
 __END_DECLS