| Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame^] | 1 | From 876c47e0743031e352a126000c87b0b51209408d Mon Sep 17 00:00:00 2001 |
| 2 | From: Tomas Pecka <peckato1@users.noreply.github.com> |
| 3 | Date: Thu, 7 Oct 2021 14:11:45 +0200 |
| 4 | Subject: [PATCH 5/9] networkctl: lldp uses table_empty_string instead of strna |
| 5 | |
| 6 | --- |
| 7 | src/network/networkctl.c | 13 ++++++++----- |
| 8 | 1 file changed, 8 insertions(+), 5 deletions(-) |
| 9 | |
| 10 | diff --git a/src/network/networkctl.c b/src/network/networkctl.c |
| 11 | index 9bbfe177b1..235731079d 100644 |
| 12 | --- a/src/network/networkctl.c |
| 13 | +++ b/src/network/networkctl.c |
| 14 | @@ -2531,6 +2531,9 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { |
| 15 | assert_se(cell = table_get_cell(table, 0, 5)); |
| 16 | table_set_minimum_width(table, cell, 16); |
| 17 | |
| 18 | + if (table_set_empty_string(table, "n/a") < 0) |
| 19 | + return log_oom(); |
| 20 | + |
| 21 | for (int i = 0; i < c; i++) { |
| 22 | _cleanup_fclose_ FILE *f = NULL; |
| 23 | |
| 24 | @@ -2592,11 +2595,11 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { |
| 25 | |
| 26 | r = table_add_many(table, |
| 27 | TABLE_STRING, links[i].name, |
| 28 | - TABLE_STRING, strna(chassis_id), |
| 29 | - TABLE_STRING, strna(system_name), |
| 30 | - TABLE_STRING, strna(capabilities), |
| 31 | - TABLE_STRING, strna(port_id), |
| 32 | - TABLE_STRING, strna(port_description)); |
| 33 | + TABLE_STRING, chassis_id, |
| 34 | + TABLE_STRING, system_name, |
| 35 | + TABLE_STRING, capabilities, |
| 36 | + TABLE_STRING, port_id, |
| 37 | + TABLE_STRING, port_description); |
| 38 | if (r < 0) |
| 39 | return table_log_add_error(r); |
| 40 | |
| 41 | -- |
| 42 | 2.33.0 |
| 43 | |