diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-01-13 17:57:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 17:57:59 +0100 |
| commit | 04d8507f687674b9b7a6820f0996b95cc1094bff (patch) | |
| tree | aded6791179d1b92f0a317ff17218277e02acf8c /src/timedate/timedatectl.c | |
| parent | 200427cf7c8d5184bf0762b83a6084cc05e94dd4 (diff) | |
| parent | 117caf37655727febe1a477bf4f37850a49a8568 (diff) | |
| download | systemd-04d8507f687674b9b7a6820f0996b95cc1094bff.tar.gz | |
Merge pull request #14381 from keszybz/ifindex-cleanup
Resolve alternative names
Diffstat (limited to 'src/timedate/timedatectl.c')
| -rw-r--r-- | src/timedate/timedatectl.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 7cfeeb8532..8496224848 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -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,11 +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, ret); - if (r >= 0) - return 0; + r = parse_ifindex(str); + if (r > 0) + return r; + assert(r < 0); r = sd_bus_call_method( bus, @@ -859,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) { @@ -871,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); @@ -909,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); |