diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-16 14:56:15 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-17 09:13:35 +0100 |
commit | 166a9dc66fcbed83a658b2f965cd9b888e7816d3 (patch) | |
tree | dd5a5cf9a546710ef149481d9431d208099a5952 /src/portable/portabled.c | |
parent | 24d5223fc99b9fee998753854ddf32b16889df26 (diff) | |
download | systemd-166a9dc66fcbed83a658b2f965cd9b888e7816d3.tar.gz |
portabled: define main through macro
Diffstat (limited to 'src/portable/portabled.c')
-rw-r--r-- | src/portable/portabled.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/portable/portabled.c b/src/portable/portabled.c index 53faa09bac..e5efac51d0 100644 --- a/src/portable/portabled.c +++ b/src/portable/portabled.c @@ -122,7 +122,7 @@ static int manager_run(Manager *m) { check_idle, m); } -int main(int argc, char *argv[]) { +static int run(int argc, char *argv[]) { _cleanup_(manager_unrefp) Manager *m = NULL; int r; @@ -134,26 +134,20 @@ int main(int argc, char *argv[]) { if (argc != 1) { log_error("This program takes no arguments."); - r = -EINVAL; - goto finish; + return -EINVAL; } assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGCHLD, SIGTERM, SIGINT, -1) >= 0); r = manager_new(&m); - if (r < 0) { - log_error_errno(r, "Failed to allocate manager object: %m"); - goto finish; - } + if (r < 0) + return log_error_errno(r, "Failed to allocate manager object: %m"); r = manager_startup(m); - if (r < 0) { - log_error_errno(r, "Failed to fully start up daemon: %m"); - goto finish; - } + if (r < 0) + return log_error_errno(r, "Failed to fully start up daemon: %m"); log_debug("systemd-portabled running as pid " PID_FMT, getpid_cached()); - sd_notify(false, "READY=1\n" "STATUS=Processing requests..."); @@ -161,8 +155,7 @@ int main(int argc, char *argv[]) { r = manager_run(m); log_debug("systemd-portabled stopped as pid " PID_FMT, getpid_cached()); - -finish: - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; - + return r; } + +DEFINE_MAIN_FUNCTION(run); |