main-func: Reduce transitive includes

Let's move some logic from _DEFINE_MAIN_FUNCTION() and other places
in main-func.h into functions that we implement in main-func.c to
allow moving some included headers from the header to the .c file.

diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index 6bb3eb10168d5ed0c605b86055a3940760bc1c65..06f999dc802bdb9d628cd54ff91ba51e96e16e3c 100644 (file)
--- a/src/ac-power/ac-power.c
+++ b/src/ac-power/ac-power.c
@@ -8,6 +8,7 @@
 #include "log.h"
 #include "main-func.h"
 #include "pretty-print.h"
+#include "string-util.h"
 
 static bool arg_verbose = false;
 

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 018cd3532132a38b20907b86cc193c73b9bb0c63..a39398a638c1978a5abe25f46f80b613f0354e85 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -7,6 +7,7 @@
 #include "sd-device.h"
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "device-util.h"
 #include "escape.h"
 #include "fileio.h"

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index d672000e55a7ac1ac1e55d83b03a42cc7e56a87c..8091a44705d03ef1132d0a74b13ed1a3cbb69f32 100644 (file)
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 
 #include "sd-bus.h"
+#include "sd-daemon.h"
 #include "sd-json.h"
 
 #include "alloc-util.h"

diff --git a/src/creds/creds.c b/src/creds/creds.c
index 5caa45062e7611665bf2397308bc73889fe7ec7a..7c2e49da4f6873cbd06d67c3418179053f2302dd 100644 (file)
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -23,6 +23,7 @@
 #include "missing_magic.h"
 #include "pager.h"
 #include "parse-argument.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "stat-util.h"

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index e1eadde498786c76ec02c1dfff4775e8e12b8076..c591cbeeebf596c06b66cc6735fcc99a01259bfe 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -13,6 +13,7 @@
 #include "sd-messages.h"
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "ask-password-api.h"
 #include "build.h"
 #include "cryptsetup-fido2.h"

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 55232914ed3b9ca6f35ba13cfd6a8dee6a307a18..6ac292f1408f36383016133fb0d7d82a521221a0 100644 (file)
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -11,6 +11,7 @@
 #include "sd-device.h"
 
 #include "architecture.h"
+#include "argv-util.h"
 #include "blockdev-util.h"
 #include "build.h"
 #include "chase.h"

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 6f8028988164e995458b806facff493a92c67960..31c4c485c0fc55de4f959a5c3cf4b5094cbda4a5 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -5,9 +5,11 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-unit-util.h"
+#include "bus-util.h"
 #include "chase.h"
 #include "creds-util.h"
 #include "efi-loader.h"

diff --git a/src/growfs/makefs.c b/src/growfs/makefs.c
index c76e81d97625b22c748d390a3129e12b90757e55..1e404bc7bfbc18343ad40ef6aeaba5feff0365cd 100644 (file)
--- a/src/growfs/makefs.c
+++ b/src/growfs/makefs.c
@@ -11,6 +11,7 @@
 #include "blockdev-util.h"
 #include "dissect-image.h"
 #include "fd-util.h"
+#include "log.h"
 #include "main-func.h"
 #include "mkfs-util.h"
 #include "path-util.h"

diff --git a/src/home/homework.c b/src/home/homework.c
index 93a4e8dc28b3b9568f67295859c059e333571f83..8af0847c78f03821034c1aba288b416d7d906c57 100644 (file)
--- a/src/home/homework.c
+++ b/src/home/homework.c
@@ -3,6 +3,8 @@
 #include <stddef.h>
 #include <sys/mount.h>
 
+#include "sd-daemon.h"
+
 #include "blockdev-util.h"
 #include "bus-unit-util.h"
 #include "chown-recursive.h"

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 962c5681e416577baf5bcd12ac3312f6bcb3643d..1bfd14b0d8c9e99569ea767f308bfa56e3bf9b77 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -15,6 +15,7 @@
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "constants.h"
 #include "daemon-util.h"
 #include "device-private.h"

diff --git a/src/import/importd.c b/src/import/importd.c
index a7de9ed24796868145ee055d2bbcec3d8b3100c6..6390b76d545a31dfd6f86981c50f29c0795bb356 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -12,6 +12,7 @@
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "common-signal.h"
 #include "constants.h"
 #include "daemon-util.h"

diff --git a/src/integritysetup/integritysetup.c b/src/integritysetup/integritysetup.c
index 56c02d4ad890b99090d4d99d4edcdc10df6781f4..ece8c3c1a84d6d5d6422012cecd73260ad6d4464 100644 (file)
--- a/src/integritysetup/integritysetup.c
+++ b/src/integritysetup/integritysetup.c
@@ -5,6 +5,7 @@
 #include <sys/stat.h>
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "cryptsetup-util.h"
 #include "fileio.h"
 #include "hexdecoct.h"

diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c
index d4e65f5208777162a4f14f31678b4e71cf8ec032..0a62d994bc4582c0cc94d950d871c9fe23bc1823 100644 (file)
--- a/src/kernel-install/kernel-install.c
+++ b/src/kernel-install/kernel-install.c
@@ -4,6 +4,7 @@
 #include <stdbool.h>
 #include <sys/utsname.h>
 
+#include "argv-util.h"
 #include "boot-entry.h"
 #include "build.h"
 #include "chase.h"

diff --git a/src/locale/localed.c b/src/locale/localed.c
index 3f742b8a6276b11ebfed1dbdc1be657e8c285050..24ec6263e5f6ec149198d4f08dcb50a002e346aa 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -14,6 +14,7 @@
 #include "bus-message.h"
 #include "bus-polkit.h"
 #include "bus-unit-util.h"
+#include "bus-util.h"
 #include "constants.h"
 #include "daemon-util.h"
 #include "kbd-util.h"

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 276a3ba70dc2269ae7ca22fb2f35f7253eae0c6d..df68eb7ef070fd0aa35a5affab345c7c771bca55 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -19,6 +19,7 @@
 #include "log.h"
 #include "main-func.h"
 #include "pager.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "signal-util.h"

diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
index 451e181cd863703558827efea9acb02112d3fd47..0b3e977d5c35770682fda99774eec2db06ec4ecb 100644 (file)
--- a/src/login/user-runtime-dir.c
+++ b/src/login/user-runtime-dir.c
@@ -14,6 +14,7 @@
 #include "fs-util.h"
 #include "label-util.h"
 #include "limits-util.h"
+#include "log.h"
 #include "main-func.h"
 #include "missing_magic.h"
 #include "missing_syscall.h"

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 5a6052549d31745f4101ddb10a9c9baa1ce5cc25..4cd670748e1aa2e61dbea46d6eb3e7a3e796296d 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -38,6 +38,7 @@
 #include "hostname-util.h"
 #include "import-util.h"
 #include "in-addr-util.h"
+#include "label-util.h"
 #include "locale-util.h"
 #include "log.h"
 #include "logs-show.h"

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 364f9dfab6756946cc0d699cc743c4f85f22842e..658a7e4f20789ab13d4a2408c012c34ee91047a7 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -11,6 +11,7 @@
 #include "bus-locator.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "cgroup-util.h"
 #include "common-signal.h"
 #include "daemon-util.h"

diff --git a/src/measure/measure.c b/src/measure/measure.c
index b81bc2453c08896d2819a33f6e0bfee7d5fcc21a..fb18b1a9f7126652d6ebc8ef70d2e8eb5b82f147 100644 (file)
--- a/src/measure/measure.c
+++ b/src/measure/measure.c
@@ -16,6 +16,7 @@
 #include "main-func.h"
 #include "memstream-util.h"
 #include "openssl-util.h"
+#include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"
 #include "pe-binary.h"

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 59daeb5cb014662b65ed85ccf8a8075a7a0a4589..27ecb23e9bf1bb1211d73051ecde5ea0340eff12 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -8,6 +8,7 @@
 #include "build.h"
 #include "conf-files.h"
 #include "constants.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"

diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index bda1e3a3beb491e8f3b70092b05bc415a3174894..de90f9d9837c9ee9b93af6adcc47c71bb7d7b9f9 100644 (file)
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -5,6 +5,7 @@
 #include "sd-bus.h"
 #include "sd-device.h"
 
+#include "argv-util.h"
 #include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"

diff --git a/src/notify/notify.c b/src/notify/notify.c
index acc8bc72af1369a195d6bb857cb6aff5572ef21a..6f924d719cc326bef4ab35744549a3105b12c1e7 100644 (file)
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -24,6 +24,7 @@
 #include "parse-util.h"
 #include "pretty-print.h"
 #include "process-util.h"
+#include "signal-util.h"
 #include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index dd9649d71e03e733cabc6de50538df25538855cf..bda38db1058462db210e64ce9699575ad04c8856 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -16,6 +16,10 @@
 #include <termios.h>
 #include <unistd.h>
 
+#if HAVE_SELINUX
+#include <selinux/selinux.h>
+#endif
+
 #include "sd-bus.h"
 #include "sd-daemon.h"
 #include "sd-id128.h"

diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c
index 26ea1d066e7b4e560716a85066735f21e5c26ee6..b1c6dd86f942f395e39f50588688cb239d4deaea 100644 (file)
--- a/src/nsresourced/nsresourcework.c
+++ b/src/nsresourced/nsresourcework.c
@@ -15,6 +15,7 @@
 #include "sd-netlink.h"
 #include "sd-varlink.h"
 
+#include "argv-util.h"
 #include "bus-polkit.h"
 #include "env-util.h"
 #include "fd-util.h"

diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c
index 79adc01415618270cda415c4e9cb83efb53155b2..3a2ac2a6aa5eb1ede7dac44279f38bf143f268ae 100644 (file)
--- a/src/oom/oomctl.c
+++ b/src/oom/oomctl.c
@@ -9,6 +9,7 @@
 #include "bus-message-util.h"
 #include "log.h"
 #include "main-func.h"
+#include "pager.h"
 #include "pretty-print.h"
 #include "terminal-util.h"
 #include "verbs.h"

diff --git a/src/path/path.c b/src/path/path.c
index 18a88e1c69eeb22bc013db0959e7f0d3a3fe91a3..97685d2bd8fa2f326c06e0968059019aced1cc7a 100644 (file)
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -9,6 +9,7 @@
 
 #include "alloc-util.h"
 #include "build.h"
+#include "errno-util.h"
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"

diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index d94feb34cf6a672e61a7b9090e4e6864b622e136..ddc9935a7d6bb61b0db5af38c438d7f692304af3 100644 (file)
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -8,6 +8,7 @@
 #include "alloc-util.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "common-signal.h"
 #include "constants.h"
 #include "daemon-util.h"

diff --git a/src/ptyfwd/ptyfwd-tool.c b/src/ptyfwd/ptyfwd-tool.c
index 16a49ccdc1bab5ea25dc13abb0747209e35df71f..449c0ee4977cd9b5b98439cab1a3f70e9a692c24 100644 (file)
--- a/src/ptyfwd/ptyfwd-tool.c
+++ b/src/ptyfwd/ptyfwd-tool.c
@@ -12,6 +12,7 @@
 #include "pretty-print.h"
 #include "process-util.h"
 #include "ptyfwd.h"
+#include "signal-util.h"
 #include "strv.h"
 
 static bool arg_quiet = false;

diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index f517d149dd14644e03d6720732c239446352ca12..7d284ab28e6a753c00d540ed9fde47cf36904482 100644 (file)
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -5,18 +5,21 @@
 #include <net/if.h>
 
 #include "sd-bus.h"
+#include "sd-daemon.h"
 #include "sd-json.h"
 #include "sd-netlink.h"
 #include "sd-varlink.h"
 
 #include "af-list.h"
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
 #include "bus-message-util.h"
+#include "bus-util.h"
 #include "dns-domain.h"
 #include "errno-list.h"
 #include "escape.h"
@@ -31,6 +34,7 @@
 #include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "resolvconf-compat.h"

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 6b216c046f610f18f36e64242c0909e3f38a9f3a..28301cd5270342ad4d0d33b0e6abd5d328f2186d 100644 (file)
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -12,6 +12,7 @@
 
 #include "alloc-util.h"
 #include "device-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/run/run.c b/src/run/run.c
index e2b6c98e03a0f796e0cc05548ce368d4371a504d..d03604e4ee7580c92e40b1d0d4498f467f3bfddd 100644 (file)
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -7,10 +7,12 @@
 #include <sys/types.h>
 
 #include "sd-bus.h"
+#include "sd-daemon.h"
 #include "sd-event.h"
 #include "sd-json.h"
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "ask-password-agent.h"
 #include "build.h"
 #include "bus-error.h"

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 5e3cf2a6cb6c79004bdc95fbecbd0a739c247d45..86fcced09848453e42dc84aa48c980182a27d4ed 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "cgroup-util.h"
 #include "dropin.h"
 #include "escape.h"

diff --git a/src/shared/main-func.c b/src/shared/main-func.c
new file mode 100644 (file)
index 0000000..c861218
--- /dev/null
+++ b/src/shared/main-func.c
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#if HAVE_VALGRIND_VALGRIND_H
+#  include <valgrind/valgrind.h>
+#endif
+
+#include "sd-daemon.h"
+
+#include "argv-util.h"
+#include "ask-password-agent.h"
+#include "hashmap.h"
+#include "main-func.h"
+#include "pager.h"
+#include "polkit-agent.h"
+#include "selinux-util.h"
+#include "signal-util.h"
+
+void main_prepare(int argc, char *argv[]) {
+        assert_se(argc > 0 && !isempty(argv[0]));
+        save_argc_argv(argc, argv);
+}
+
+void main_finalize(int r, int exit_status) {
+        if (r < 0)
+                (void) sd_notifyf(0, "ERRNO=%i", -r);
+        (void) sd_notifyf(0, "EXIT_STATUS=%i", exit_status);
+        ask_password_agent_close();
+        polkit_agent_close();
+        pager_close();
+        mac_selinux_finish();
+}
+
+int raise_or_exit_status(int ret) {
+        if (ret < 0)
+                return EXIT_FAILURE;
+        if (ret == 0)
+                return EXIT_SUCCESS;
+        if (!SIGNAL_VALID(ret))
+                return EXIT_FAILURE;
+
+#if HAVE_VALGRIND_VALGRIND_H
+        /* If raise() below succeeds, the destructor cleanup_pools() in hashmap.c will never called. */
+        if (RUNNING_ON_VALGRIND)
+                hashmap_trim_pools();
+#endif
+
+        (void) raise(ret);
+        /* exit with failure if raise() does not immediately abort the program. */
+        return EXIT_FAILURE;
+}

diff --git a/src/shared/main-func.h b/src/shared/main-func.h
index 67537555a12eaac1ebe2f9b07d4a85700dc39deb..0faaba60883c37f8d5c6933b647376fb2f7cb7b4 100644 (file)
--- a/src/shared/main-func.h
+++ b/src/shared/main-func.h
@@ -3,36 +3,19 @@
 
 #include <stdlib.h>
 
-#if HAVE_VALGRIND_VALGRIND_H
-#  include <valgrind/valgrind.h>
-#endif
+#include "static-destruct.h"
 
-#include "sd-daemon.h"
+void main_prepare(int argc, char *argv[]);
 
-#include "argv-util.h"
-#include "ask-password-agent.h"
-#include "hashmap.h"
-#include "pager.h"
-#include "polkit-agent.h"
-#include "selinux-util.h"
-#include "signal-util.h"
-#include "static-destruct.h"
+void main_finalize(int r, int exit_status);
 
 #define _DEFINE_MAIN_FUNCTION(intro, impl, result_to_exit_status, result_to_return_value) \
         int main(int argc, char *argv[]) {                              \
                 int r;                                                  \
-                assert_se(argc > 0 && !isempty(argv[0]));               \
-                save_argc_argv(argc, argv);                             \
+                main_prepare(argc, argv);                               \
                 intro;                                                  \
                 r = impl;                                               \
-                if (r < 0)                                              \
-                        (void) sd_notifyf(0, "ERRNO=%i", -r);           \
-                (void) sd_notifyf(0, "EXIT_STATUS=%i",                  \
-                                  result_to_exit_status(r));            \
-                ask_password_agent_close();                             \
-                polkit_agent_close();                                   \
-                pager_close();                                          \
-                mac_selinux_finish();                                   \
+                main_finalize(r, result_to_exit_status(r));             \
                 static_destruct();                                      \
                 return result_to_return_value(r);                       \
         }
@@ -56,24 +39,7 @@ static inline int exit_failure_if_nonzero(int result) {
 #define DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(impl)                \
         _DEFINE_MAIN_FUNCTION(,impl(argc, argv), exit_failure_if_nonzero, exit_failure_if_nonzero)
 
-static inline int raise_or_exit_status(int ret) {
-        if (ret < 0)
-                return EXIT_FAILURE;
-        if (ret == 0)
-                return EXIT_SUCCESS;
-        if (!SIGNAL_VALID(ret))
-                return EXIT_FAILURE;
-
-#if HAVE_VALGRIND_VALGRIND_H
-        /* If raise() below succeeds, the destructor cleanup_pools() in hashmap.c will never called. */
-        if (RUNNING_ON_VALGRIND)
-                hashmap_trim_pools();
-#endif
-
-        (void) raise(ret);
-        /* exit with failure if raise() does not immediately abort the program. */
-        return EXIT_FAILURE;
-}
+int raise_or_exit_status(int ret);
 
 /* Negative return values from impl are mapped to EXIT_FAILURE, zero is mapped to EXIT_SUCCESS,
  * and raise if a positive signal is returned from impl. */

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 298dbcf18e923198b0046a8ee58e8fe6d392cff4..da1deffe4dc025cf961f600df2b5e1f5d258494b 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -119,6 +119,7 @@ shared_sources = files(
         'machine-id-setup.c',
         'machine-pool.c',
         'macvlan-util.c',
+        'main-func.c',
         'mkdir-label.c',
         'mkfs-util.c',
         'module-util.c',

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 765d315b73c290c6aef9d0f78d88f78eb4ff3c6c..250aed060f0047d275a7679d26838a0000d224df 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -11,6 +11,7 @@
 #include "sd-bus.h"
 #include "sd-varlink.h"
 
+#include "argv-util.h"
 #include "blockdev-util.h"
 #include "build.h"
 #include "bus-error.h"

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 3ed29d1026b8299a605b3905fd49b4f2b3045ae9..55c597e5f9b5b5e3d3b8c99c21b5c5d608ca3cbc 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6,6 +6,7 @@
 
 #include "sd-daemon.h"
 
+#include "argv-util.h"
 #include "build.h"
 #include "bus-util.h"
 #include "capsule-util.h"

diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 3bd91ac02247da73312244648e382ea4b982ccee..8393b35b73dfe1c0fcebf4f8244184a6670b8d09 100644 (file)
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -3,6 +3,8 @@
 #include <getopt.h>
 #include <unistd.h>
 
+#include "sd-daemon.h"
+
 #include "build.h"
 #include "chase.h"
 #include "conf-files.h"

diff --git a/src/sysupdate/updatectl.c b/src/sysupdate/updatectl.c
index 64172fe4c37d50175cae0e00d006b40490093360..20476fae8803fc25d51d439543ff7b3e44c8e821 100644 (file)
--- a/src/sysupdate/updatectl.c
+++ b/src/sysupdate/updatectl.c
@@ -24,6 +24,7 @@
 #include "os-util.h"
 #include "pager.h"
 #include "path-util.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "strv.h"
 #include "sysupdate-update-set-flags.h"

diff --git a/src/test/test-display-quota.c b/src/test/test-display-quota.c
index 68ecfc8d0139902916ac6b9cc8fff32356870df6..0fe9e33956a6d21455696725138a7e88fe89f2e7 100644 (file)
--- a/src/test/test-display-quota.c
+++ b/src/test/test-display-quota.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "bitfield.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "log.h"

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 5e0fb165a7906f73055bdc651969fe1647d271e7..8d8495a6e29fe3efca1dc489c7aded7ad2480314 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -20,6 +20,7 @@
 #include "bus-message-util.h"
 #include "bus-polkit.h"
 #include "bus-unit-util.h"
+#include "bus-util.h"
 #include "clock-util.h"
 #include "conf-files.h"
 #include "constants.h"

diff --git a/src/timesync/wait-sync.c b/src/timesync/wait-sync.c
index 4104b0132544d48869e5051c13fa2e23b35e97a8..fa34138875e020d3efd81f3582814bf8c4f10443 100644 (file)
--- a/src/timesync/wait-sync.c
+++ b/src/timesync/wait-sync.c
@@ -13,6 +13,7 @@
 
 #include "sd-event.h"
 
+#include "errno-util.h"
 #include "fd-util.h"
 #include "inotify-util.h"
 #include "main-func.h"

diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index ebf1e5190ccb7fa476eab2790a72d6baf12a6d5a..c9e9a354a88ac20fb3d020f5681a684a4dbb18fd 100644 (file)
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "process-util.h"

diff --git a/src/userdb/userwork.c b/src/userdb/userwork.c
index b030fae84cfb920dc4fbac26693b37ecc5613a04..6ce5d57ef3cf04b412e04c41f9602ee326f90395 100644 (file)
--- a/src/userdb/userwork.c
+++ b/src/userdb/userwork.c
@@ -6,7 +6,9 @@
 #include "sd-daemon.h"
 #include "sd-varlink.h"
 
+#include "argv-util.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "group-record.h"
 #include "io-util.h"

diff --git a/src/varlinkctl/varlinkctl.c b/src/varlinkctl/varlinkctl.c
index 7b2ff301aa9ff7f076e51cb53b3ad0f0fe1a5a2e..75c656d13cf98f4422130cdc22b050af83e3f9e5 100644 (file)
--- a/src/varlinkctl/varlinkctl.c
+++ b/src/varlinkctl/varlinkctl.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "sd-daemon.h"
 #include "sd-varlink.h"
 
 #include "build.h"

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 5f92cc901138d7ef0dd31ad77cdbd870060710be..35bf5fffb7099b9790e3c822ea58b09a9b4ef889 100644 (file)
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -7,6 +7,7 @@
 #include "sd-device.h"
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "cryptsetup-util.h"
 #include "fileio.h"
 #include "fstab-util.h"

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index 9e062006ab9dda0028edbf842c893cd96e6789b2..e9713dc172359030af036955320b603aa2dca1dd 100644 (file)
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -20,6 +20,7 @@
 #include "build.h"
 #include "bus-internal.h"
 #include "bus-locator.h"
+#include "bus-util.h"
 #include "bus-wait-for-jobs.h"
 #include "capability-util.h"
 #include "chase.h"

diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c
index 9ab96504800308382f4d0ece0828304bd0eefbe1..f7c482de05c116324b531f486b3b4f10f70b5fb4 100644 (file)
--- a/src/volatile-root/volatile-root.c
+++ b/src/volatile-root/volatile-root.c
@@ -7,6 +7,7 @@
 #include "chase.h"
 #include "devnum-util.h"
 #include "escape.h"
+#include "log.h"
 #include "main-func.h"
 #include "mkdir.h"
 #include "mount-util.h"