diff options
Diffstat (limited to 'src/basic/format-table.c')
| -rw-r--r-- | src/basic/format-table.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/basic/format-table.c b/src/basic/format-table.c index 00473a2e8..d0305207e 100644 --- a/src/basic/format-table.c +++ b/src/basic/format-table.c @@ -36,7 +36,7 @@ that. The first row is always the header row. If header display is turned off we simply skip outputting the first row. Also, when sorting rows we always leave the first row where it is, as the header shouldn't move. - - Note because there's no row and no column object some properties that might be approproate as row/column properties + - Note because there's no row and no column object some properties that might be appropriate as row/column properties are exposed as cell properties instead. For example, the "weight" of a column (which is used to determine where to add/remove space preferable when expanding/compressing tables horizontally) is actually made the "weight" of a cell. Given that we usually need it per-column though we will calculate the average across every cell of the column @@ -73,11 +73,11 @@ typedef struct TableData { } TableData; static size_t TABLE_CELL_TO_INDEX(TableCell *cell) { - unsigned i; + size_t i; assert(cell); - i = PTR_TO_UINT(cell); + i = PTR_TO_SIZE(cell); assert(i > 0); return i-1; @@ -85,7 +85,7 @@ static size_t TABLE_CELL_TO_INDEX(TableCell *cell) { static TableCell* TABLE_INDEX_TO_CELL(size_t index) { assert(index != (size_t) -1); - return UINT_TO_PTR((unsigned) (index + 1)); + return SIZE_TO_PTR(index + 1); } struct Table { @@ -1140,14 +1140,12 @@ int table_print(Table *t, FILE *f) { assert(weight_sum >= column_weight[j]); weight_sum -= column_weight[j]; - if (restart) + if (restart && !finalize) break; } - if (finalize) { - assert(!restart); + if (finalize) break; - } if (!restart) finalize = true; |