From 06213aae94eeb59a7e343d2071c5e3c8def2f732 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 16 Nov 2018 12:13:28 +0100
Subject: [PATCH] hwdb: define main through macro

---
 src/hwdb/hwdb.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index be64a26..87b84b7 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -110,7 +110,7 @@ static int hwdb_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();
@@ -118,12 +118,11 @@ int main (int argc, char *argv[]) {
 
         r = parse_argv(argc, argv);
         if (r <= 0)
-                goto finish;
+                return r;
 
         mac_selinux_init();
 
-        r = hwdb_main(argc, argv);
-
-finish:
-        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+        return hwdb_main(argc, argv);
 }
+
+DEFINE_MAIN_FUNCTION(run);
-- 
2.7.4