diff options
| -rw-r--r-- | libroff.h | 4 | ||||
| -rw-r--r-- | tbl.c | 6 | ||||
| -rw-r--r-- | tbl_layout.c | 10 | ||||
| -rw-r--r-- | tbl_opts.c | 5 |
4 files changed, 12 insertions, 13 deletions
@@ -69,8 +69,8 @@ void tbl_restart(int, int, struct tbl_node *); void tbl_free(struct tbl_node *); void tbl_reset(struct tbl_node *); enum rofferr tbl_read(struct tbl_node *, int, const char *, int); -int tbl_option(struct tbl_node *, int, const char *); -int tbl_layout(struct tbl_node *, int, const char *); +void tbl_option(struct tbl_node *, int, const char *); +void tbl_layout(struct tbl_node *, int, const char *); int tbl_data(struct tbl_node *, int, const char *); int tbl_cdata(struct tbl_node *, int, const char *); const struct tbl_span *tbl_span(struct tbl_node *); @@ -55,9 +55,11 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs) switch (tbl->part) { case TBL_PART_OPTS: - return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); + tbl_option(tbl, ln, p); + return(ROFF_IGN); case TBL_PART_LAYOUT: - return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); + tbl_layout(tbl, ln, p); + return(ROFF_IGN); case TBL_PART_CDATA: return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN); default: diff --git a/tbl_layout.c b/tbl_layout.c index 25a4e29a..ec85b56b 100644 --- a/tbl_layout.c +++ b/tbl_layout.c @@ -299,7 +299,7 @@ cell(struct tbl_node *tbl, struct tbl_row *rp, return(mods(tbl, cell_alloc(tbl, rp, c, vert), ln, p, pos)); } -int +void tbl_layout(struct tbl_node *tbl, int ln, const char *p) { struct tbl_row *rp; @@ -320,18 +320,18 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p) rp = NULL; continue; case '\0': /* Next row on next input line. */ - return(1); + return; case '.': /* End of layout. */ pos++; tbl->part = TBL_PART_DATA; if (tbl->first_row != NULL) - return(1); + return; mandoc_msg(MANDOCERR_TBLNOLAYOUT, tbl->parse, ln, pos, NULL); rp = mandoc_calloc(1, sizeof(*rp)); cell_alloc(tbl, rp, TBL_CELL_LEFT, 0); tbl->first_row = tbl->last_row = rp; - return(1); + return; default: /* Cell. */ break; } @@ -345,7 +345,7 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p) tbl->last_row = rp; } if ( ! cell(tbl, rp, ln, p, &pos)) - return(1); + return; } } @@ -252,7 +252,7 @@ again: /* /* NOTREACHED */ } -int +void tbl_option(struct tbl_node *tbl, int ln, const char *p) { int pos; @@ -265,7 +265,4 @@ tbl_option(struct tbl_node *tbl, int ln, const char *p) pos = 0; opt(tbl, ln, p, &pos); - - /* Always succeed. */ - return(1); } |