From 6826c9275f2d9e9f18b49ffd5af619d3564cdd3e Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Thu, 17 Mar 2011 11:56:17 +0000 Subject: Clean-up in libman: make all calls to man_*msg not check return value. Also convert man_vmsg to return void. --- libman.h | 4 ++-- man.c | 6 +++--- man_macro.c | 25 ++++++++++++------------- man_validate.c | 7 +++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/libman.h b/libman.h index e085693a..b264a3ac 100644 --- a/libman.h +++ b/libman.h @@ -1,4 +1,4 @@ -/* $Id: libman.h,v 1.45 2011/01/12 10:43:22 kristaps Exp $ */ +/* $Id: libman.h,v 1.46 2011/03/17 11:56:17 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * @@ -81,7 +81,7 @@ int man_args(struct man *, int, int *, char *, char **); #define ARGS_EOLN (0) #define ARGS_WORD (1) #define ARGS_QWORD (1) -int man_vmsg(struct man *, enum mandocerr, +void man_vmsg(struct man *, enum mandocerr, int, int, const char *, ...); int man_valid_post(struct man *); int man_valid_pre(struct man *, struct man_node *); diff --git a/man.c b/man.c index 8bcb7070..51ed9dc4 100644 --- a/man.c +++ b/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.102 2011/03/07 01:35:51 schwarze Exp $ */ +/* $Id: man.c,v 1.103 2011/03/17 11:56:17 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * @@ -622,7 +622,7 @@ err: /* Error out. */ } -int +void man_vmsg(struct man *man, enum mandocerr t, int ln, int pos, const char *fmt, ...) { @@ -632,7 +632,7 @@ man_vmsg(struct man *man, enum mandocerr t, va_start(ap, fmt); vsnprintf(buf, sizeof(buf) - 1, fmt, ap); va_end(ap); - return((*man->msg)(t, man->data, ln, pos, buf)); + (*man->msg)(t, man->data, ln, pos, buf); } diff --git a/man_macro.c b/man_macro.c index dbc4b4b0..979232c9 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.55 2011/01/12 16:55:22 kristaps Exp $ */ +/* $Id: man_macro.c,v 1.56 2011/03/17 11:56:17 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -43,7 +43,7 @@ static enum rew rew_dohalt(enum mant, enum man_type, const struct man_node *); static enum rew rew_block(enum mant, enum man_type, const struct man_node *); -static int rew_warn(struct man *, +static void rew_warn(struct man *, struct man_node *, enum mandocerr); const struct man_macro __man_macros[MAN_MAX] = { @@ -88,17 +88,19 @@ const struct man_macro * const man_macros = __man_macros; /* * Warn when "n" is an explicit non-roff macro. */ -static int +static void rew_warn(struct man *m, struct man_node *n, enum mandocerr er) { if (er == MANDOCERR_MAX || MAN_BLOCK != n->type) - return(1); + return; if (MAN_VALID & n->flags) - return(1); + return; if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) - return(1); - return(man_nmsg(m, n, er)); + return; + + assert(er < MANDOCERR_FATAL); + man_nmsg(m, n, er); } @@ -123,16 +125,14 @@ man_unscope(struct man *m, const struct man_node *to, * out to be lost. */ n = m->last->parent; - if ( ! rew_warn(m, m->last, er)) - return(0); + rew_warn(m, m->last, er); if ( ! man_valid_post(m)) return(0); m->last = n; assert(m->last); } - if ( ! rew_warn(m, m->last, er)) - return(0); + rew_warn(m, m->last, er); if ( ! man_valid_post(m)) return(0); @@ -279,8 +279,7 @@ blk_close(MACRO_PROT_ARGS) break; if (NULL == nn) - if ( ! man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE)) - return(0); + man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE); if ( ! rew_scope(MAN_BODY, m, ntok)) return(0); diff --git a/man_validate.c b/man_validate.c index c09ab36c..e0e8e1cf 100644 --- a/man_validate.c +++ b/man_validate.c @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.63 2011/03/07 01:35:51 schwarze Exp $ */ +/* $Id: man_validate.c,v 1.64 2011/03/17 11:56:17 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -223,9 +223,8 @@ check_text(CHKARGS) if ('\t' == *p) { if (MAN_LITERAL & m->flags) continue; - if (man_pmsg(m, n->line, pos, MANDOCERR_BADTAB)) - continue; - return(0); + man_pmsg(m, n->line, pos, MANDOCERR_BADTAB); + continue; } /* Check the special character. */ -- cgit v1.2.3-56-ge451