From 3c79f0b3ced903bbaaa41ad7feb698e3955e1f12 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 16 Nov 2018 12:15:35 +0100 Subject: [PATCH] id128: define main through macro --- src/id128/id128.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/id128/id128.c b/src/id128/id128.c index fe325042e0e..6b7045b3e7c 100644 --- a/src/id128/id128.c +++ b/src/id128/id128.c @@ -150,7 +150,7 @@ static int id128_main(int argc, char *argv[]) { return dispatch_verb(argc, argv, verbs, NULL); } -int main(int argc, char *argv[]) { +static int run(int argc, char *argv[]) { int r; log_parse_environment(); @@ -158,10 +158,9 @@ int main(int argc, char *argv[]) { r = parse_argv(argc, argv); if (r <= 0) - goto finish; + return r; - r = id128_main(argc, argv); - - finish: - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return id128_main(argc, argv); } + +DEFINE_MAIN_FUNCTION(run); -- 2.47.3