| From 876c47e0743031e352a126000c87b0b51209408d Mon Sep 17 00:00:00 2001 |
| From: Tomas Pecka <peckato1@users.noreply.github.com> |
| Date: Thu, 7 Oct 2021 14:11:45 +0200 |
| Subject: [PATCH 5/9] networkctl: lldp uses table_empty_string instead of strna |
| |
| --- |
| src/network/networkctl.c | 13 ++++++++----- |
| 1 file changed, 8 insertions(+), 5 deletions(-) |
| |
| diff --git a/src/network/networkctl.c b/src/network/networkctl.c |
| index 9bbfe177b1..235731079d 100644 |
| --- a/src/network/networkctl.c |
| +++ b/src/network/networkctl.c |
| @@ -2531,6 +2531,9 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { |
| assert_se(cell = table_get_cell(table, 0, 5)); |
| table_set_minimum_width(table, cell, 16); |
| |
| + if (table_set_empty_string(table, "n/a") < 0) |
| + return log_oom(); |
| + |
| for (int i = 0; i < c; i++) { |
| _cleanup_fclose_ FILE *f = NULL; |
| |
| @@ -2592,11 +2595,11 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { |
| |
| r = table_add_many(table, |
| TABLE_STRING, links[i].name, |
| - TABLE_STRING, strna(chassis_id), |
| - TABLE_STRING, strna(system_name), |
| - TABLE_STRING, strna(capabilities), |
| - TABLE_STRING, strna(port_id), |
| - TABLE_STRING, strna(port_description)); |
| + TABLE_STRING, chassis_id, |
| + TABLE_STRING, system_name, |
| + TABLE_STRING, capabilities, |
| + TABLE_STRING, port_id, |
| + TABLE_STRING, port_description); |
| if (r < 0) |
| return table_log_add_error(r); |
| |
| -- |
| 2.33.0 |
| |