=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.1 retrieving revision 1.3 diff -u -p -r1.1 -r1.3 --- mandoc/mdoc_term.c 2009/03/26 14:38:11 1.1 +++ mandoc/mdoc_term.c 2009/03/26 16:23:22 1.3 @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.1 2009/03/26 14:38:11 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.3 2009/03/26 16:23:22 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -306,6 +306,11 @@ static const struct termact termacts[MDOC_MAX] = { { NULL, NULL }, /* %Q */ }; +#ifdef __linux__ +extern size_t strlcpy(char *, const char *, size_t); +extern size_t strlcat(char *, const char *, size_t); +#endif + static int arg_hasattr(int, const struct mdoc_node *); static int arg_getattrs(const int *, int *, size_t, const struct mdoc_node *); @@ -316,11 +321,11 @@ static int arg_listtype(const struct mdoc_node *); static int fmt_block_vspace(struct termp *, const struct mdoc_node *, const struct mdoc_node *); -static int print_node(DECL_ARGS); -static int print_head(struct termp *, +static void print_node(DECL_ARGS); +static void print_head(struct termp *, const struct mdoc_meta *); -static int print_body(DECL_ARGS); -static int print_foot(struct termp *, +static void print_body(DECL_ARGS); +static void print_foot(struct termp *, const struct mdoc_meta *); static void sanity(const struct mdoc_node *); @@ -329,27 +334,25 @@ int mdoc_run(struct termp *p, const struct mdoc *m) { - if ( ! print_head(p, mdoc_meta(m))) - return(0); - if ( ! print_body(p, NULL, mdoc_meta(m), mdoc_node(m))) - return(0); - return(print_foot(p, mdoc_meta(m))); + print_head(p, mdoc_meta(m)); + print_body(p, NULL, mdoc_meta(m), mdoc_node(m)); + print_foot(p, mdoc_meta(m)); + return(1); } -static int +static void print_body(DECL_ARGS) { - if ( ! print_node(p, pair, meta, node)) - return(0); + print_node(p, pair, meta, node); if ( ! node->next) - return(1); - return(print_body(p, pair, meta, node->next)); + return; + print_body(p, pair, meta, node->next); } -static int +static void print_node(DECL_ARGS) { int dochild; @@ -391,12 +394,10 @@ print_node(DECL_ARGS) if (MDOC_TEXT != node->type) if (termacts[node->tok].post) (*termacts[node->tok].post)(p, &npair, meta, node); - - return(1); } -static int +static void print_foot(struct termp *p, const struct mdoc_meta *meta) { struct tm *tm; @@ -444,12 +445,10 @@ print_foot(struct termp *p, const struct mdoc_meta *me free(buf); free(os); - - return(1); } -static int +static void print_head(struct termp *p, const struct mdoc_meta *meta) { char *buf, *title; @@ -515,8 +514,6 @@ print_head(struct termp *p, const struct mdoc_meta *me free(title); free(buf); - - return(1); }