From 43ead4114bcd2ad1537d5990c28416aca3951461 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 16 Nov 2018 11:23:02 +0100 Subject: [PATCH] hostnamectl: define main through macro --- src/hostname/hostnamectl.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index be94de4994..8220741efa 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -426,7 +426,7 @@ static int hostnamectl_main(sd_bus *bus, int argc, char *argv[]) { return dispatch_verb(argc, argv, verbs, bus); } -int main(int argc, char *argv[]) { +static int run(int argc, char *argv[]) { _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; int r; @@ -436,16 +436,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 = hostnamectl_main(bus, argc, argv); + if (r < 0) + return log_error_errno(r, "Failed to create bus connection: %m"); -finish: - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return hostnamectl_main(bus, argc, argv); } + +DEFINE_MAIN_FUNCTION(run); -- 2.25.1