From: David Tardon <dtardon@redhat.com>
Date: Mon, 20 Feb 2023 18:23:17 +0000 (+0100)
Subject: systemctl: extract code to a helper function
X-Git-Tag: v254-rc1~1202^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=531a45f35a7e4555827058c33715e7cfc2c77481;p=thirdparty%2Fsystemd.git

systemctl: extract code to a helper function

It will be used more in subsequent commits.
---

diff --git a/src/systemctl/systemctl-list-units.c b/src/systemctl/systemctl-list-units.c
index 6bfaf97236d..3d37465661b 100644
--- a/src/systemctl/systemctl-list-units.c
+++ b/src/systemctl/systemctl-list-units.c
@@ -101,6 +101,20 @@ static void output_legend(const char *type, size_t n_items) {
                 printf("Pass --all to see loaded but inactive %ss, too.\n", type);
 }
 
+static int table_add_triggered(Table *table, char **triggered) {
+        assert(table);
+
+        if (strv_isempty(triggered))
+                return table_add_cell(table, NULL, TABLE_EMPTY, NULL);
+        else if (strv_length(triggered) == 1)
+                return table_add_cell(table, NULL, TABLE_STRING, triggered[0]);
+        else
+                /* This should never happen, currently our socket units can only trigger a
+                 * single unit. But let's handle this anyway, who knows what the future
+                 * brings? */
+                return table_add_cell(table, NULL, TABLE_STRV, triggered);
+}
+
 static int output_units_list(const UnitInfo *unit_infos, size_t c) {
         _cleanup_(table_unrefp) Table *table = NULL;
         size_t job_count = 0;
@@ -402,15 +416,7 @@ static int output_sockets_list(struct socket_info *socket_infos, size_t cs) {
                 if (r < 0)
                         return table_log_add_error(r);
 
-                if (strv_isempty(s->triggered))
-                        r = table_add_cell(table, NULL, TABLE_EMPTY, NULL);
-                else if (strv_length(s->triggered) == 1)
-                        r = table_add_cell(table, NULL, TABLE_STRING, s->triggered[0]);
-                else
-                        /* This should never happen, currently our socket units can only trigger a
-                                * single unit. But let's handle this anyway, who knows what the future
-                                * brings? */
-                        r = table_add_cell(table, NULL, TABLE_STRV, s->triggered);
+                r = table_add_triggered(table, s->triggered);
                 if (r < 0)
                         return table_log_add_error(r);
         }