diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-03 11:27:32 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-03 11:27:32 +0000 |
commit | 1a43dd98e40e2bf465682b76c28bd1ea2fe90ac5 (patch) | |
tree | a1ce2cbd09419ea936477d7b7ac231d7e06bb2e4 /mdoc.c | |
parent | 298f818bf95cddb04543ee3777a239b4d7a7fe6d (diff) | |
download | mandoc-1a43dd98e40e2bf465682b76c28bd1ea2fe90ac5.tar.gz mandoc-1a43dd98e40e2bf465682b76c28bd1ea2fe90ac5.tar.zst mandoc-1a43dd98e40e2bf465682b76c28bd1ea2fe90ac5.zip |
Clarified the role of MDOC_HALT in libmdoc functions by having accessor
functions assert() if they're called after MDOC_HALT is set.
This makes more sense than returning 0 because this return value is used
for parse errors, not programme-flow errors, and it's inconsistent to
use the same value for both. Plus, prior to this, I'd return 0 without
printing an error message, which would cause failure to go unreported to
the operator.
Diffstat (limited to 'mdoc.c')
-rw-r--r-- | mdoc.c | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.176 2011/01/01 12:59:17 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.177 2011/01/03 11:27:33 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -106,7 +106,8 @@ const struct mdoc_node * mdoc_node(const struct mdoc *m) { - return(MDOC_HALT & m->flags ? NULL : m->first); + assert( ! (MDOC_HALT & m->flags)); + return(m->first); } @@ -114,7 +115,8 @@ const struct mdoc_meta * mdoc_meta(const struct mdoc *m) { - return(MDOC_HALT & m->flags ? NULL : &m->meta); + assert( ! (MDOC_HALT & m->flags)); + return(&m->meta); } @@ -215,9 +217,8 @@ int mdoc_endparse(struct mdoc *m) { - if (MDOC_HALT & m->flags) - return(0); - else if (mdoc_macroend(m)) + assert( ! (MDOC_HALT & m->flags)); + if (mdoc_macroend(m)) return(1); m->flags |= MDOC_HALT; return(0); @@ -227,8 +228,7 @@ int mdoc_addspan(struct mdoc *m, const struct tbl_span *sp) { - if (MDOC_HALT & m->flags) - return(0); + assert( ! (MDOC_HALT & m->flags)); /* No text before an initial macro. */ @@ -250,8 +250,7 @@ int mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) { - if (MDOC_HALT & m->flags) - return(0); + assert( ! (MDOC_HALT & m->flags)); m->flags |= MDOC_NEWLINE; |