=================================================================== RCS file: /cvs/mandoc/libman.h,v retrieving revision 1.64 retrieving revision 1.67 diff -u -p -r1.64 -r1.67 --- mandoc/libman.h 2014/11/03 23:18:39 1.64 +++ mandoc/libman.h 2014/12/28 14:42:27 1.67 @@ -1,4 +1,4 @@ -/* $Id: libman.h,v 1.64 2014/11/03 23:18:39 schwarze Exp $ */ +/* $Id: libman.h,v 1.67 2014/12/28 14:42:27 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -15,8 +15,6 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef LIBMAN_H -#define LIBMAN_H enum man_next { MAN_NEXT_SIBLING = 0, @@ -25,6 +23,7 @@ enum man_next { struct man { struct mparse *parse; /* parse pointer */ + const char *defos; /* default OS argument for .TH */ int quick; /* abort parse early */ int flags; /* parse flags */ #define MAN_ELINE (1 << 1) /* Next-line element scope. */ @@ -46,7 +45,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(). */ @@ -61,20 +60,17 @@ extern const struct man_macro *const man_macros; __BEGIN_DECLS -int man_word_alloc(struct man *, int, int, const char *); +void man_word_alloc(struct man *, int, int, const char *); void man_word_append(struct man *, 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_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_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 - -#endif /*!LIBMAN_H*/