board/czechlight/common/patches/systemd/0006-networkctl-lldp-table-now-ellpsizes-via-table-functi.patch

From 03305bb0f181446ae4f1698c14e72470ae642bbb Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@users.noreply.github.com>
Date: Thu, 7 Oct 2021 14:16:53 +0200
Subject: [PATCH 6/9] networkctl: lldp table now ellpsizes via table functions

Tables can now ellipize on their own so there is no need to manually
call ellpsize on the table data.

To achieve compatibility with previous versions the table columns are
set to have the exact same size as before, therefore the minimum and
maximum widths for the columns in the output.
---
 src/network/networkctl.c | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 235731079d..a1d42cbe92 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -2515,21 +2515,27 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
 
         assert_se(cell = table_get_cell(table, 0, 0));
         table_set_minimum_width(table, cell, 16);
+        table_set_maximum_width(table, cell, 16);
 
         assert_se(cell = table_get_cell(table, 0, 1));
         table_set_minimum_width(table, cell, 17);
+        table_set_maximum_width(table, cell, 17);
 
         assert_se(cell = table_get_cell(table, 0, 2));
         table_set_minimum_width(table, cell, 16);
+        table_set_maximum_width(table, cell, 16);
 
         assert_se(cell = table_get_cell(table, 0, 3));
         table_set_minimum_width(table, cell, 11);
+        table_set_maximum_width(table, cell, 11);
 
         assert_se(cell = table_get_cell(table, 0, 4));
         table_set_minimum_width(table, cell, 17);
+        table_set_maximum_width(table, cell, 17);
 
         assert_se(cell = table_get_cell(table, 0, 5));
         table_set_minimum_width(table, cell, 16);
+        table_set_maximum_width(table, cell, 16);
 
         if (table_set_empty_string(table, "n/a") < 0)
                 return log_oom();
@@ -2546,7 +2552,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
                 }
 
                 for (;;) {
-                        _cleanup_free_ char *cid = NULL, *pid = NULL, *sname = NULL, *pdesc = NULL, *capabilities = NULL;
+                        _cleanup_free_ char *capabilities = NULL;
                         const char *chassis_id = NULL, *port_id = NULL, *system_name = NULL, *port_description = NULL;
                         _cleanup_(sd_lldp_neighbor_unrefp) sd_lldp_neighbor *n = NULL;
                         uint16_t cc;
@@ -2564,30 +2570,6 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
                         (void) sd_lldp_neighbor_get_system_name(n, &system_name);
                         (void) sd_lldp_neighbor_get_port_description(n, &port_description);
 
-                        if (chassis_id) {
-                                cid = ellipsize(chassis_id, 17, 100);
-                                if (cid)
-                                        chassis_id = cid;
-                        }
-
-                        if (port_id) {
-                                pid = ellipsize(port_id, 17, 100);
-                                if (pid)
-                                        port_id = pid;
-                        }
-
-                        if (system_name) {
-                                sname = ellipsize(system_name, 16, 100);
-                                if (sname)
-                                        system_name = sname;
-                        }
-
-                        if (port_description) {
-                                pdesc = ellipsize(port_description, 16, 100);
-                                if (pdesc)
-                                        port_description = pdesc;
-                        }
-
                         if (sd_lldp_neighbor_get_enabled_capabilities(n, &cc) >= 0) {
                                 capabilities = lldp_capabilities_to_string(cc);
                                 all |= cc;
-- 
2.33.0