diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-01-30 04:11:50 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-30 04:11:50 +0000 |
| commit | 71fa4361c47e9ed2f3c6521e9273fabb41aadc20 (patch) | |
| tree | ac472a0b2793a26633a7405d837eaa7fa648ea74 /tbl_data.c | |
| parent | 8ea5dc6d40c942157256ddd510bd3fa16cb44303 (diff) | |
| download | mandoc-71fa4361c47e9ed2f3c6521e9273fabb41aadc20.tar.gz mandoc-71fa4361c47e9ed2f3c6521e9273fabb41aadc20.tar.zst mandoc-71fa4361c47e9ed2f3c6521e9273fabb41aadc20.zip | |
Abolish struct tbl_head and replace it by an "int col" member in
struct tbl_cell. No functional change, minus 40 lines of code.
Diffstat (limited to 'tbl_data.c')
| -rw-r--r-- | tbl_data.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl_data.c,v 1.37 2015/01/30 02:09:04 schwarze Exp $ */ +/* $Id: tbl_data.c,v 1.38 2015/01/30 04:11:50 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -44,13 +44,9 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, struct tbl_cell *cp; int sv; - cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next; - - /* - * Skip over spanners, since - * we want to match data with data layout cells in the header. - */ + /* Advance to the next layout cell, skipping spanners. */ + cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next; while (cp != NULL && cp->pos == TBL_CELL_SPAN) cp = cp->next; @@ -172,7 +168,6 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row *rp) dp->line = line; dp->opts = &tbl->opts; dp->layout = rp; - dp->head = tbl->first_head; dp->prev = tbl->last_span; if (dp->prev == NULL) { |