Simplify by making many functions in the man(7) parser void,

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 61bd1a64b5cb9d035b0679a3c1a8be3b44ee4995..8f66013ab24e7d178122f9b2d5222b3d2149a48f 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,6 +1,7 @@
-/*     $Id: libman.h,v 1.62 2014/08/01 17:40:34 schwarze Exp $ */
+/*     $Id: libman.h,v 1.65 2014/11/28 05:51:32 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -45,7 +46,7 @@ struct        man {
                          char *buf
 
 struct man_macro {
-       int             (*fp)(MACRO_PROT_ARGS);
+       void            (*fp)(MACRO_PROT_ARGS);
        int               flags;
 #define        MAN_SCOPED       (1 << 0)
 #define        MAN_EXPLICIT     (1 << 1)       /* See blk_imp(). */
@@ -53,25 +54,25 @@ struct      man_macro {
 #define        MAN_NSCOPED      (1 << 3)       /* See in_line_eoln(). */
 #define        MAN_NOCLOSE      (1 << 4)       /* See blk_exp(). */
 #define        MAN_BSCOPE       (1 << 5)       /* Break BLINE scope. */
+#define        MAN_JOIN         (1 << 6)       /* Join arguments together. */
 };
 
 extern const struct man_macro *const man_macros;
 
 __BEGIN_DECLS
 
-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);
-int              man_tail_alloc(struct man *, int, int, enum mant);
-int              man_body_alloc(struct man *, int, int, enum mant);
-int              man_elem_alloc(struct man *, int, int, enum mant);
+void             man_word_alloc(struct man *, int, int, const char *);
+void             man_word_append(struct man *, const char *);
+void             man_block_alloc(struct man *, int, int, enum mant);
+void             man_head_alloc(struct man *, int, int, enum mant);
+void             man_body_alloc(struct man *, int, int, enum mant);
+void             man_elem_alloc(struct man *, int, int, enum mant);
 void             man_node_delete(struct man *, struct man_node *);
 void             man_hash_init(void);
 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 *);
+void             man_macroend(struct man *);
+void             man_valid_post(struct man *);
+void             man_unscope(struct man *, const struct man_node *);
 
 __END_DECLS