=================================================================== RCS file: /cvs/mandoc/libmdoc.h,v retrieving revision 1.90 retrieving revision 1.92 diff -u -p -r1.90 -r1.92 --- mandoc/libmdoc.h 2014/11/28 01:05:43 1.90 +++ mandoc/libmdoc.h 2014/11/28 04:47:03 1.92 @@ -1,4 +1,4 @@ -/* $Id: libmdoc.h,v 1.90 2014/11/28 01:05:43 schwarze Exp $ */ +/* $Id: libmdoc.h,v 1.92 2014/11/28 04:47:03 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2013, 2014 Ingo Schwarze @@ -56,7 +56,7 @@ struct mdoc { char *buf struct mdoc_macro { - int (*fp)(MACRO_PROT_ARGS); + void (*fp)(MACRO_PROT_ARGS); int flags; #define MDOC_CALLABLE (1 << 0) #define MDOC_PARSED (1 << 1) @@ -105,21 +105,20 @@ extern const struct mdoc_macro *const mdoc_macros; __BEGIN_DECLS -int mdoc_macro(MACRO_PROT_ARGS); -int mdoc_word_alloc(struct mdoc *, - int, int, const char *); +void mdoc_macro(MACRO_PROT_ARGS); +void mdoc_word_alloc(struct mdoc *, int, int, const char *); void mdoc_word_append(struct mdoc *, const char *); -int mdoc_elem_alloc(struct mdoc *, int, int, +void mdoc_elem_alloc(struct mdoc *, int, int, enum mdoct, struct mdoc_arg *); -int mdoc_block_alloc(struct mdoc *, int, int, +struct mdoc_node *mdoc_block_alloc(struct mdoc *, int, int, enum mdoct, struct mdoc_arg *); -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 *, int, int, enum mdoct, +struct mdoc_node *mdoc_head_alloc(struct mdoc *, int, int, enum mdoct); +void mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct); +struct mdoc_node *mdoc_body_alloc(struct mdoc *, int, int, enum mdoct); +void 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_node_relink(struct mdoc *, struct mdoc_node *); void mdoc_hash_init(void); enum mdoct mdoc_hash_find(const char *); const char *mdoc_a2att(const char *); @@ -136,7 +135,7 @@ enum margserr mdoc_args(struct mdoc *, int, int *, char *, enum mdoct, char **); enum margserr mdoc_zargs(struct mdoc *, int, int *, char *, char **); -int mdoc_macroend(struct mdoc *); +void mdoc_macroend(struct mdoc *); enum mdelim mdoc_isdelim(const char *); __END_DECLS