diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-03-17 11:30:23 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-03-17 11:30:23 +0000 |
| commit | 23a24bf33187bc5c870f18253d69add673316375 (patch) | |
| tree | e43c31430c8861ef536b97de7672b0c7fb6a254b /mdoc_validate.c | |
| parent | 8ccf0c87185bc55b87c3903be984e8afa6e46f7c (diff) | |
| download | mandoc-23a24bf33187bc5c870f18253d69add673316375.tar.gz mandoc-23a24bf33187bc5c870f18253d69add673316375.tar.zst mandoc-23a24bf33187bc5c870f18253d69add673316375.zip | |
Clean-up in libmdoc: fix last checks for mdoc_*msg return value, then
make mdoc_vmsg not return an int. libmdoc is now completely clean of
return-value checks from the message subsystem.
Diffstat (limited to 'mdoc_validate.c')
| -rw-r--r-- | mdoc_validate.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mdoc_validate.c b/mdoc_validate.c index c57a9f44..7dd43f28 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.161 2011/03/17 09:24:51 kristaps Exp $ */ +/* $Id: mdoc_validate.c,v 1.162 2011/03/17 11:30:23 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -446,10 +446,10 @@ check_count(struct mdoc *m, enum mdoc_type type, } t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT; - - return(mdoc_vmsg(m, t, m->last->line, m->last->pos, + mdoc_vmsg(m, t, m->last->line, m->last->pos, "want %s%d children (have %d)", - p, val, m->last->nchild)); + p, val, m->last->nchild); + return(1); } static int @@ -1266,7 +1266,7 @@ post_an(POST_ARGS) static int post_it(POST_ARGS) { - int i, cols, rc; + int i, cols; enum mdoc_list lt; struct mdoc_node *n, *c; enum mandocerr er; @@ -1332,10 +1332,9 @@ post_it(POST_ARGS) else er = MANDOCERR_SYNTARGCOUNT; - rc = mdoc_vmsg(mdoc, er, - mdoc->last->line, mdoc->last->pos, + mdoc_vmsg(mdoc, er, mdoc->last->line, mdoc->last->pos, "columns == %d (have %d)", cols, i); - return(rc); + return(MANDOCERR_ARGCOUNT == er); default: break; } |