diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2021-10-17 20:47:55 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2021-10-17 20:47:55 +0000 |
| commit | 16b293893d8d40befd69736b34e541059bff01ee (patch) | |
| tree | 5332f644135281b0f6ab73d508b2f8ef4f850234 | |
| parent | 7826a8bf439c5e15c6a162a8018d7ce102276480 (diff) | |
Simplify the code building lists of spans, no output change intended.
A comment in the code claimed that the list of spans would be sorted,
but the sorting did not actually work. The layout "LSSS,LLSL" resulted
in the list "0-3, 1-2", whereas the layout "LLSL,LSSS" resulted
in the list "1-2, 0-3". Since sorting serves no purpose, just leave
the list unsorted.
| -rw-r--r-- | usr.bin/mandoc/out.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/mandoc/out.c b/usr.bin/mandoc/out.c index 28dcc25a278..dc4e4de44d6 100644 --- a/usr.bin/mandoc/out.c +++ b/usr.bin/mandoc/out.c @@ -1,4 +1,4 @@ -/* $OpenBSD: out.c,v 1.55 2021/09/28 17:06:17 schwarze Exp $ */ +/* $OpenBSD: out.c,v 1.56 2021/10/17 20:47:54 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021 @@ -147,7 +147,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first, * to data cells in the data section. */ - gp = &first_group; for (dp = sp->first; dp != NULL; dp = dp->next) { icol = dp->layout->col; while (maxcol < icol + dp->hspans) @@ -188,16 +187,16 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first, continue; /* - * Build an ordered, singly linked list + * Build a singly linked list * of all groups of columns joined by spans, * recording the minimum width for each group. */ - while (*gp != NULL && ((*gp)->startcol < icol || - (*gp)->endcol < icol + dp->hspans)) + gp = &first_group; + while (*gp != NULL && ((*gp)->startcol != icol || + (*gp)->endcol != icol + dp->hspans)) gp = &(*gp)->next; - if (*gp == NULL || (*gp)->startcol > icol || - (*gp)->endcol > icol + dp->hspans) { + if (*gp == NULL) { g = mandoc_malloc(sizeof(*g)); g->next = *gp; g->wanted = width; |