From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 16 Nov 2018 11:15:35 +0000 (+0100)
Subject: id128: define main through macro
X-Git-Tag: v240~280^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c79f0b3ced903bbaaa41ad7feb698e3955e1f12;p=thirdparty%2Fsystemd.git

id128: define main through macro
---

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);