From f6b21f845c28c5c32c6abed3c8a192e58cd35fb0 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Wed, 9 Feb 2011 09:33:43 +0000 Subject: Consolidate "rc" value in main.c around addspan, addeqn, and parseln. --- main.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 308b4f72..8c0c8ae0 100644 --- a/main.c +++ b/main.c @@ -853,35 +853,35 @@ rerun: * currently open parse. Since we only get here if * there does exist data (see tbl_data.c), we're * guaranteed that something's been allocated. + * Do the same for ROFF_EQN. */ - if (ROFF_TBL == rr) { - assert(curp->man || curp->mdoc); + rc = -1; + + if (ROFF_TBL == rr) while (NULL != (span = roff_span(curp->roff))) { - if (curp->man) - man_addspan(curp->man, span); - else + rc = curp->man ? + man_addspan(curp->man, span) : mdoc_addspan(curp->mdoc, span); + if (0 == rc) + break; } - } else if (ROFF_EQN == rr) { - assert(curp->man || curp->mdoc); - assert(roff_eqn(curp->roff)); + else if (ROFF_EQN == rr) rc = curp->mdoc ? mdoc_addeqn(curp->mdoc, roff_eqn(curp->roff)) : man_addeqn(curp->man, roff_eqn(curp->roff)); - } else if (curp->man || curp->mdoc) { + else if (curp->man || curp->mdoc) rc = curp->man ? man_parseln(curp->man, curp->line, ln.buf, of) : mdoc_parseln(curp->mdoc, curp->line, ln.buf, of); - if ( ! rc) { - assert(MANDOCLEVEL_FATAL <= file_status); - break; - } + if (0 == rc) { + assert(MANDOCLEVEL_FATAL <= file_status); + break; } /* Temporary buffers typically are not full. */ -- cgit