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:
parent
ecb1a44cc9
commit
4527a83bc7
|
@ -474,20 +474,6 @@ static int show_unit_cgroup(sd_bus *bus, const char *unit, pid_t leader) {
|
||||||
return 0;
|
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) {
|
static int print_os_release(sd_bus *bus, const char *method, const char *name, const char *prefix) {
|
||||||
_cleanup_free_ char *pretty = NULL;
|
_cleanup_free_ char *pretty = NULL;
|
||||||
int r;
|
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) {
|
static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
|
||||||
char since1[FORMAT_TIMESTAMP_RELATIVE_MAX];
|
char since1[FORMAT_TIMESTAMP_RELATIVE_MAX];
|
||||||
char since2[FORMAT_TIMESTAMP_MAX];
|
char since2[FORMAT_TIMESTAMP_MAX];
|
||||||
|
_cleanup_free_ char *addresses = NULL;
|
||||||
const char *s1, *s2;
|
const char *s1, *s2;
|
||||||
int ifi = -1;
|
int ifi = -1;
|
||||||
|
|
||||||
|
@ -629,11 +616,12 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
|
||||||
fputc('\n', stdout);
|
fputc('\n', stdout);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (print_addresses(bus, i->name, ifi,
|
if (call_get_addresses(bus, i->name, ifi,
|
||||||
"\t Address: ",
|
"\t Address: ", "\n\t ", ALL_IP_ADDRESSES,
|
||||||
"\n\t ",
|
&addresses) > 0) {
|
||||||
ALL_IP_ADDRESSES) > 0)
|
fputs(addresses, stdout);
|
||||||
fputc('\n', stdout);
|
fputc('\n', stdout);
|
||||||
|
}
|
||||||
|
|
||||||
print_os_release(bus, "GetMachineOSRelease", i->name, "\t OS: ");
|
print_os_release(bus, "GetMachineOSRelease", i->name, "\t OS: ");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue