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

timedatectl: drop ifindex output parameter too

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-12-18 13:57:01 +01:00
parent 597da51bae
commit 9030b50a7b
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/timedate/timedatectl.c
View file

@ -829,7 +829,7 @@ static int show_timesync(int argc, char **argv, void *userdata) {
return 0;
}
static int parse_ifindex_bus(sd_bus *bus, const char *str, int *ret) {
static int parse_ifindex_bus(sd_bus *bus, const char *str) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
int32_t i;
@ -837,14 +837,11 @@ static int parse_ifindex_bus(sd_bus *bus, const char *str, int *ret) {
assert(bus);
assert(str);
assert(ret);
r = parse_ifindex(str);
if (r >= 0) {
assert(r != 0);
*ret = r;
return 0;
}
if (r > 0)
return r;
assert(r < 0);
r = sd_bus_call_method(
bus,
@ -862,8 +859,7 @@ static int parse_ifindex_bus(sd_bus *bus, const char *str, int *ret) {
if (r < 0)
return bus_log_create_error(r);
*ret = i;
return 0;
return i;
}
static int verb_ntp_servers(int argc, char **argv, void *userdata) {
@ -874,9 +870,9 @@ static int verb_ntp_servers(int argc, char **argv, void *userdata) {
assert(bus);
r = parse_ifindex_bus(bus, argv[1], &ifindex);
if (r < 0)
return r;
ifindex = parse_ifindex_bus(bus, argv[1]);
if (ifindex < 0)
return ifindex;
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
@ -912,9 +908,9 @@ static int verb_revert(int argc, char **argv, void *userdata) {
assert(bus);
r = parse_ifindex_bus(bus, argv[1], &ifindex);
if (r < 0)
return r;
ifindex = parse_ifindex_bus(bus, argv[1]);
if (ifindex < 0)
return ifindex;
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);