diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-20 09:18:21 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-20 16:48:21 +0100 |
commit | 50378e5d972d2f3a521f56d158bc45c3f5ce541d (patch) | |
tree | 4b12c29e323d382235f83531a3678a147a4a2414 /src/timedate | |
parent | a34c79d0067b79cc27748f70092861ddd942a039 (diff) | |
download | systemd-50378e5d972d2f3a521f56d158bc45c3f5ce541d.tar.gz |
timedatectl: define main through macro
pager_close() is called from DEFINE_MAIN_FUNCTION().
Diffstat (limited to 'src/timedate')
-rw-r--r-- | src/timedate/timedatectl.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index d148b45b38..c6d9a23bcf 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -11,6 +11,7 @@ #include "bus-error.h" #include "bus-util.h" #include "in-addr-util.h" +#include "main-func.h" #include "pager.h" #include "parse-util.h" #include "spawn-polkit-agent.h" @@ -829,7 +830,6 @@ static int parse_argv(int argc, char *argv[]) { } static int timedatectl_main(sd_bus *bus, int argc, char *argv[]) { - static const Verb verbs[] = { { "status", VERB_ANY, 1, VERB_DEFAULT, show_status }, { "show", VERB_ANY, 1, 0, show_properties }, @@ -847,8 +847,8 @@ static int timedatectl_main(sd_bus *bus, int argc, char *argv[]) { return dispatch_verb(argc, argv, verbs, bus); } -int main(int argc, char *argv[]) { - sd_bus *bus = NULL; +static int run(int argc, char *argv[]) { + _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; int r; setlocale(LC_ALL, ""); @@ -857,21 +857,13 @@ int main(int argc, char *argv[]) { r = parse_argv(argc, argv); if (r <= 0) - goto finish; + return r; r = bus_connect_transport(arg_transport, arg_host, false, &bus); - if (r < 0) { - log_error_errno(r, "Failed to create bus connection: %m"); - goto finish; - } - - r = timedatectl_main(bus, argc, argv); - -finish: - /* make sure we terminate the bus connection first, and then close the - * pager, see issue #3543 for the details. */ - sd_bus_flush_close_unref(bus); - pager_close(); + if (r < 0) + return log_error_errno(r, "Failed to create bus connection: %m"); - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return timedatectl_main(bus, argc, argv); } + +DEFINE_MAIN_FUNCTION(run); |