From c8b62cf60064b8bcbb95db6e97d1ca3931eba341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 20 Sep 2022 20:38:27 +0200 Subject: shared/format-table: use enum instead of Table.empty_string All users were setting this to some static string (usually "-"), so let's simplify things by not doing strdup, but instead limiting callers to a fixed set of values. In preparation for the next commit, the function is renamed from "empty" to "replacement", because it'll be used for more than empty fields. I didn't do the whole string-table setup, because it's all used internally in one file and this way we can immediately assert if an invalid value is passed in. Some callers were (void)ing the error, others were ignoring it, and others propagating. It's nicer to remove the boilerplate. --- src/sysupdate/sysupdate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sysupdate') diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c index 7dcfac1261..8a4e1b5477 100644 --- a/src/sysupdate/sysupdate.c +++ b/src/sysupdate/sysupdate.c @@ -510,7 +510,7 @@ static int context_show_version(Context *c, const char *version) { (void) table_set_align_percent(t, table_get_cell(t, 0, 6), 100); (void) table_set_align_percent(t, table_get_cell(t, 0, 7), 100); (void) table_set_align_percent(t, table_get_cell(t, 0, 8), 100); - (void) table_set_empty_string(t, "-"); + table_set_ersatz_string(t, TABLE_ERSATZ_DASH); /* Determine if the target will make use of partition/fs attributes for any of the transfers */ for (size_t n = 0; n < c->n_transfers; n++) { -- cgit v1.2.1