picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

machinectl: drop helper function 

It only serves to forward some arguments without modification and is only
used in one place anyway.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-11-29 12:47:43 +01:00
parent ecb1a44cc9
commit 4527a83bc7
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/machine/machinectl.c
View File

@ -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: ");