From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 29 Jul 2019 16:36:59 +0000 (+0200)
Subject: format-table: if NULL is spcified as data, let's patch to an empty cell
X-Git-Tag: v243-rc1~9^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ea710eaf44132fbc10634dad3a4ac1e24432b6a;p=thirdparty%2Fsystemd.git

format-table: if NULL is spcified as data, let's patch to an empty cell

This should make various calls easier that currently generate either an
empty cell or a regular cell depending on whether they have data to
show.
---

diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index 51ddd1ac519..d2764eebbd8 100644
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -356,6 +356,10 @@ int table_add_cell_full(
         assert(type >= 0);
         assert(type < _TABLE_DATA_TYPE_MAX);
 
+        /* Special rule: patch NULL data fields to the empty field */
+        if (!data)
+                type = TABLE_EMPTY;
+
         /* Determine the cell adjacent to the current one, but one row up */
         if (t->n_cells >= t->n_columns)
                 assert_se(p = t->data[t->n_cells - t->n_columns]);