From 4527a83bc7f25299eeb86cede21efb88f638b9bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 29 Nov 2018 12:47:43 +0100 Subject: [PATCH] machinectl: drop helper function It only serves to forward some arguments without modification and is only used in one place anyway. --- src/machine/machinectl.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 094ee9d360..898be80a22 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -474,20 +474,6 @@ static int show_unit_cgroup(sd_bus *bus, const char *unit, pid_t leader) { return 0; } -static int print_addresses(sd_bus *bus, const char *name, int ifi, const char *prefix, const char *prefix2, int n_addr) { - _cleanup_free_ char *s = NULL; - int r; - - r = call_get_addresses(bus, name, ifi, prefix, prefix2, n_addr, &s); - if (r < 0) - return r; - - if (r > 0) - fputs(s, stdout); - - return r; -} - static int print_os_release(sd_bus *bus, const char *method, const char *name, const char *prefix) { _cleanup_free_ char *pretty = NULL; int r; @@ -560,6 +546,7 @@ static void machine_status_info_clear(MachineStatusInfo *info) { static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) { char since1[FORMAT_TIMESTAMP_RELATIVE_MAX]; char since2[FORMAT_TIMESTAMP_MAX]; + _cleanup_free_ char *addresses = NULL; const char *s1, *s2; int ifi = -1; @@ -629,11 +616,12 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) { fputc('\n', stdout); } - if (print_addresses(bus, i->name, ifi, - "\t Address: ", - "\n\t ", - ALL_IP_ADDRESSES) > 0) + if (call_get_addresses(bus, i->name, ifi, + "\t Address: ", "\n\t ", ALL_IP_ADDRESSES, + &addresses) > 0) { + fputs(addresses, stdout); fputc('\n', stdout); + } print_os_release(bus, "GetMachineOSRelease", i->name, "\t OS: "); -- 2.25.1