diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2013-10-05 22:19:10 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2013-10-05 22:19:10 +0000 |
| commit | fbc3074e5c326a84fa929c97e202c3c8466aa2ab (patch) | |
| tree | 71d994d055e594a9c0ce682999d1ba5fa96d1b1d /roff.c | |
| parent | afbd7b3d144b4035964dc7947b4af271efc8263a (diff) | |
| download | mandoc-fbc3074e5c326a84fa929c97e202c3c8466aa2ab.tar.gz mandoc-fbc3074e5c326a84fa929c97e202c3c8466aa2ab.tar.zst mandoc-fbc3074e5c326a84fa929c97e202c3c8466aa2ab.zip | |
Avoid code duplication in roff_parseln() as suggested by
Christos Zoulas in NetBSD rev. 1.11;
i'm even going a step further and making this yet a bit shorter.
No functional change.
Diffstat (limited to 'roff.c')
| -rw-r--r-- | roff.c | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.181 2013/10/05 22:15:03 schwarze Exp $ */ +/* $Id: roff.c,v 1.182 2013/10/05 22:19:10 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> @@ -712,19 +712,14 @@ roff_parseln(struct roff *r, int ln, char **bufp, assert(ROFF_IGN == e || ROFF_CONT == e); if (ROFF_CONT != e) return(e); - if (r->eqn) - return(eqn_read(&r->eqn, ln, *bufp, pos, offs)); - if (r->tbl) - return(tbl_read(r->tbl, ln, *bufp, pos)); - return(roff_parsetext(bufp, szp, pos, offs)); - } else if ( ! ctl) { - if (r->eqn) - return(eqn_read(&r->eqn, ln, *bufp, pos, offs)); + } + if (r->eqn) + return(eqn_read(&r->eqn, ln, *bufp, ppos, offs)); + if ( ! ctl) { if (r->tbl) return(tbl_read(r->tbl, ln, *bufp, pos)); return(roff_parsetext(bufp, szp, pos, offs)); - } else if (r->eqn) - return(eqn_read(&r->eqn, ln, *bufp, ppos, offs)); + } /* * If a scope is open, go to the child handler for that macro, |