util-lib: move main() definition macros to its own header file

This way, we can extend the macro a bit with stuff pulled in from other
headers without this affecting everything which pulls in macro.h, which
is one of our most basic headers.

This is just refactoring, no change in behaviour, in prepartion for
later changes.

diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index 2d8cbb985feefe163a136ccef4eb2743bce63bee..090b6b1783d409075789e7938f8e057cebbd9490 100644 (file)
--- a/src/ac-power/ac-power.c
+++ b/src/ac-power/ac-power.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "main-func.h"
 #include "util.h"
 
 static bool arg_verbose = false;

diff --git a/src/basic/macro.h b/src/basic/macro.h
index c52d8e4e3f4f3ccbb3fdeb79c93b2f99d8b9f25a..00fb3212dba9f0f1af1bf3ee245355ecdbb2ab85 100644 (file)
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -506,23 +506,4 @@ static inline int __coverity_check__(int condition) {
         DEFINE_PUBLIC_TRIVIAL_REF_FUNC(type, name);                    \
         DEFINE_PUBLIC_TRIVIAL_UNREF_FUNC(type, name, free_func);
 
-/* Negative return values from impl are mapped to EXIT_FAILURE, and
- * everything else means success! */
-#define DEFINE_MAIN_FUNCTION(impl)                                      \
-        int main(int argc, char *argv[]) {                              \
-                int r;                                                  \
-                r = impl(argc, argv);                                   \
-                return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;             \
-        }
-
-/* Zero is mapped to EXIT_SUCCESS, and both negative and positive values
- * are mapped to EXIT_FAILURE.
- * Note: this means "true" maps to EXIT_FAILURE. */
-#define DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(impl)                \
-        int main(int argc, char *argv[]) {                              \
-                int r;                                                  \
-                r = impl(argc, argv);                                   \
-                return r != 0 ? EXIT_FAILURE : EXIT_SUCCESS;            \
-        }
-
 #include "log.h"

diff --git a/src/basic/main-func.h b/src/basic/main-func.h
new file mode 100644 (file)
index 0000000..9ebe0ab
--- /dev/null
+++ b/src/basic/main-func.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include <stdlib.h>
+
+/* Negative return values from impl are mapped to EXIT_FAILURE, and
+ * everything else means success! */
+#define DEFINE_MAIN_FUNCTION(impl)                                      \
+        int main(int argc, char *argv[]) {                              \
+                int r;                                                  \
+                r = impl(argc, argv);                                   \
+                return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;             \
+        }
+
+/* Zero is mapped to EXIT_SUCCESS, and both negative and positive values
+ * are mapped to EXIT_FAILURE.
+ * Note: this means "true" maps to EXIT_FAILURE. */
+#define DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(impl)                \
+        int main(int argc, char *argv[]) {                              \
+                int r;                                                  \
+                r = impl(argc, argv);                                   \
+                return r != 0 ? EXIT_FAILURE : EXIT_SUCCESS;            \
+        }

diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
index 84ac9e39e48f5eaf60031d9ad53ff863f81d2dba..2455f3703f598f46e59135cc5938dd8c0327c798 100644 (file)
--- a/src/boot/bless-boot.c
+++ b/src/boot/bless-boot.c
@@ -9,6 +9,7 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "log.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "util.h"

diff --git a/src/boot/boot-check-no-failures.c b/src/boot/boot-check-no-failures.c
index 1674517d4878cef5c72072387845e498f27c8e42..3284a0479394612413dc832978b667fad8f01eca 100644 (file)
--- a/src/boot/boot-check-no-failures.c
+++ b/src/boot/boot-check-no-failures.c
@@ -10,6 +10,7 @@
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "log.h"
+#include "main-func.h"
 #include "util.h"
 
 static int help(void) {

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 2cc869dcbdb072c15a8dbc35382b6d04654bfaee..cad274a6334b812a56a872fef1cc4dbd46cd4897 100644 (file)
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -19,6 +19,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 764ee2a9451193122f471086509b90e057b4a88c..46536b7c845a537c63dd8005528593b7d5c19f7c 100644 (file)
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -34,6 +34,7 @@
 #include "journal-importer.h"
 #include "log.h"
 #include "macro.h"
+#include "main-func.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"

diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index a9497fe5872e4da5696336ff30b43e2d839513fc..98fe574f8dabd3e06d90b8704d01d90afe28ef64 100644 (file)
--- a/src/debug-generator/debug-generator.c
+++ b/src/debug-generator/debug-generator.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "alloc-util.h"
+#include "main-func.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"

diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index d1a2ab95a0642625aeae91594de9955ca6d6ee84..f1259fdcd595e1cd4a23b4d4befc52cd9c155cad 100644 (file)
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 
 #include "alloc-util.h"
+#include "main-func.h"
 #include "string-table.h"
 #include "terminal-util.h"
 #include "util.h"

diff --git a/src/escape/escape.c b/src/escape/escape.c
index ed42ad65adb30cc909387537f1f93205722a64ca..b03c9e661d780f3f1c29f64471a9e3326da58af3 100644 (file)
--- a/src/escape/escape.c
+++ b/src/escape/escape.c
@@ -6,6 +6,7 @@
 
 #include "alloc-util.h"
 #include "log.h"
+#include "main-func.h"
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 54d6d26fb54dbf969b5ccdfcc46a956aa5289f31..821ad15c5f3e6c597507dd10c8575d2a623482a1 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -22,6 +22,7 @@
 #include "device-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "proc-cmdline.h"

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index 8220741efaddb498676ddce9194cfb3cf974f4c7..0d40d17a556a2fbebc49f3511668b046e250e4f7 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -14,6 +14,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "hostname-util.h"
+#include "main-func.h"
 #include "spawn-polkit-agent.h"
 #include "terminal-util.h"
 #include "util.h"

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 87b84b70a997ded68b5ebba8ee3d61091b9699fd..89e313854282acd5e549233e0832ca15d053096f 100644 (file)
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -6,6 +6,7 @@
 
 #include "alloc-util.h"
 #include "hwdb-util.h"
+#include "main-func.h"
 #include "selinux-util.h"
 #include "terminal-util.h"
 #include "util.h"

diff --git a/src/id128/id128.c b/src/id128/id128.c
index 6b7045b3e7c61e4be78fb15a0837e79d4594297e..cbd7464d2c97e05d495d9d864263ddc5ebf112d2 100644 (file)
--- a/src/id128/id128.c
+++ b/src/id128/id128.c
@@ -5,6 +5,7 @@
 
 #include "alloc-util.h"
 #include "id128-print.h"
+#include "main-func.h"
 #include "terminal-util.h"
 #include "util.h"
 #include "verbs.h"

diff --git a/src/import/export.c b/src/import/export.c
index 317ac1bba76b31e8b85ceed0c53117e055c9d79c..e07aa5d6d576bce2e98bc78aef553ac211c090cf 100644 (file)
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -13,6 +13,7 @@
 #include "hostname-util.h"
 #include "import-util.h"
 #include "machine-image.h"
+#include "main-func.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "verbs.h"

diff --git a/src/import/import.c b/src/import/import.c
index 69fe8a8a373b6400f2b65cb1b80ef22e7c1507be..9dca2f3d415669425000d86fc3904953e0a2ad90 100644 (file)
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -13,6 +13,7 @@
 #include "import-tar.h"
 #include "import-util.h"
 #include "machine-image.h"
+#include "main-func.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "verbs.h"

diff --git a/src/import/importd.c b/src/import/importd.c
index b5265a7ed34dbafda8c20f310d7d91ff8dfd0433..f17cdf10d4e1d8d3a2af916168ea7623d8b21656 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -13,6 +13,7 @@
 #include "hostname-util.h"
 #include "import-util.h"
 #include "machine-pool.h"
+#include "main-func.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"

diff --git a/src/import/pull.c b/src/import/pull.c
index 821c9772e4d5de4d46eb037ad8b20e9750d287cc..810cab53ba8e3c6efcd12c94c99ec1eb5e7677e4 100644 (file)
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -9,6 +9,7 @@
 #include "hostname-util.h"
 #include "import-util.h"
 #include "machine-image.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "pull-raw.h"
 #include "pull-tar.h"

diff --git a/src/journal/cat.c b/src/journal/cat.c
index 1576199deb758d84d661493a8c31b65960b3cf31..3198d3261b465f8dffcada706d3d0fcdfc0f08bb 100644 (file)
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -11,11 +11,12 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "string-util.h"
 #include "syslog-util.h"
-#include "util.h"
 #include "terminal-util.h"
+#include "util.h"
 
 static const char *arg_identifier = NULL;
 static int arg_priority = LOG_INFO;

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index ca24aea5a76a0d65e4aaa75317d9dd197552ccdf..508c539044a8225414f575106f986093d44a7774 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -14,6 +14,7 @@
 #include "fd-util.h"
 #include "format-table.h"
 #include "format-util.h"
+#include "main-func.h"
 #include "pager.h"
 #include "process-util.h"
 #include "signal-util.h"

diff --git a/src/login/logind.c b/src/login/logind.c
index e71ac0ee6d6504fbbdf9ddab9c43d290d107ad6f..5f2243a15d0d1ebcfcefc3fc01f33bee93cc799f 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -19,6 +19,7 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "logind.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "selinux-util.h"

diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
index b3a6e5c7401561235a00921e59904b7b610193e2..8a1110491a5927385be4443d1f2c8bea501b877c 100644 (file)
--- a/src/login/user-runtime-dir.c
+++ b/src/login/user-runtime-dir.c
@@ -8,6 +8,7 @@
 #include "bus-error.h"
 #include "fs-util.h"
 #include "label.h"
+#include "main-func.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "path-util.h"

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 24850af5bc0a62b2e453274bb3050bb54ee61d4c..a2e7a3024051e40b7c57cb60c8d7e43124cc124f 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -17,6 +17,7 @@
 #include "label.h"
 #include "machine-image.h"
 #include "machined.h"
+#include "main-func.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "special.h"

diff --git a/src/notify/notify.c b/src/notify/notify.c
index 149cd0d05015317dd74f06b31a53e11fc2096706..fdf4598941c8a5b67e5056bbdce8efff9a6f1b8b 100644 (file)
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -12,6 +12,7 @@
 #include "env-util.h"
 #include "format-util.h"
 #include "log.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index dcc69c6a2075176f0590c75da68b0c911180b380..b2702d20f737adf49da5ba6f9d671659bd2077be 100644 (file)
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -11,6 +11,7 @@
 
 #include "alloc-util.h"
 #include "dissect-image.h"
+#include "main-func.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"

diff --git a/src/path/path.c b/src/path/path.c
index 1b7e0c547a530984307fa962c4b5dac6d34648af..4a2e2ca3f61f4ad4c00e115ad92641c09881a9bf 100644 (file)
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -10,6 +10,7 @@
 #include "alloc-util.h"
 #include "log.h"
 #include "macro.h"
+#include "main-func.h"
 #include "string-util.h"
 #include "terminal-util.h"
 #include "util.h"

diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index a853257bc021c954a9b1630fb3551c520b0c4a9f..313211a792165f1cb750378c081103f8f797b52b 100644 (file)
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -6,6 +6,7 @@
 #include "alloc-util.h"
 #include "bus-util.h"
 #include "def.h"
+#include "main-func.h"
 #include "portabled-bus.h"
 #include "portabled-image-bus.h"
 #include "portabled.h"

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index e3c50c366a02625b43ec86ad2a96c2c33c6795cb..7b11f29507f0cdad091a1b066ca9bb88b688e2a1 100644 (file)
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -6,6 +6,7 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
+#include "main-func.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
 #include "signal-util.h"

diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index f5a7eca93c21a5c4a8779764922a7de4935c5791..6162f8d6bf7273145ac1730ce632837819667248 100644 (file)
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -12,6 +12,7 @@
 #include "fd-util.h"
 #include "io-util.h"
 #include "log.h"
+#include "main-func.h"
 #include "mkdir.h"
 #include "string-util.h"
 #include "util.h"

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index 9a0c39e16f099725bbcc0df7c0ceb1b9799e6f65..ece7f2955d12b0661890616d791032c6b3ec7d25 100644 (file)
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -10,6 +10,7 @@
 
 #include "exit-status.h"
 #include "log.h"
+#include "main-func.h"
 #include "mount-setup.h"
 #include "mount-util.h"
 #include "path-util.h"

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 601061136644bf21f61aa77b4efe8dd940bdddb4..f1f4da88860c323917d9f5eb81a706d582457013 100644 (file)
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -16,6 +16,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "sleep-config.h"
 #include "stdio-util.h"

diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index 9efd6c216f1f52a64e1893bcdd37fbda6c5d6359..9ceb3f8d13192925626b4abd9e63c796860ae21e 100644 (file)
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -11,10 +11,11 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-internal.h"
 #include "bus-util.h"
-#include "build.h"
 #include "log.h"
+#include "main-func.h"
 #include "util.h"
 
 #define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket"

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 255adeaa19ea3c683a3184def7b17e880c7293a2..c92d7f841a336e4d8ce15acdbea1027ed8e03f9b 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -14,6 +14,7 @@
 #include "hexdecoct.h"
 #include "install.h"
 #include "log.h"
+#include "main-func.h"
 #include "mkdir.h"
 #include "path-lookup.h"
 #include "path-util.h"

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 1c965217d92b3834269e8e745288ab31673010b2..609839c5a1e20d8b21b342b353b4f43760cf12b7 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -30,6 +30,7 @@
 #include "hashmap.h"
 #include "io-util.h"
 #include "macro.h"
+#include "main-func.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c
index ab7dca37b1006ddddcb76ac0f08448a9634b5099..b08d42834f9bb0fc6b67ae5ab6c8c9575a6c0fc4 100644 (file)
--- a/src/volatile-root/volatile-root.c
+++ b/src/volatile-root/volatile-root.c
@@ -4,12 +4,13 @@
 
 #include "alloc-util.h"
 #include "fs-util.h"
+#include "main-func.h"
 #include "mkdir.h"
 #include "mount-util.h"
+#include "path-util.h"
 #include "stat-util.h"
-#include "volatile-util.h"
 #include "string-util.h"
-#include "path-util.h"
+#include "volatile-util.h"
 
 static int make_volatile(const char *path) {
         _cleanup_free_ char *old_usr = NULL;