From decad4826dd3c1937c3b4b11e173c1b6353bb0b4 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 5 May 2025 14:28:08 +0200 Subject: [PATCH] static-destruct: Reduce transitive includes --- src/ac-power/ac-power.c | 1 + src/analyze/analyze-critical-chain.c | 1 + src/ask-password/ask-password.c | 1 + src/basic/static-destruct.h | 3 ++- src/battery-check/battery-check.c | 1 + src/environment-d-generator/environment-d-generator.c | 1 + src/factory-reset/factory-reset-tool.c | 1 + src/hibernate-resume/hibernate-resume.c | 1 + src/import/import-generator.c | 1 + src/libsystemd-network/test-ndisc-send.c | 1 + src/locale/localectl.c | 1 + src/modules-load/modules-load.c | 1 + src/network/generator/main.c | 1 + src/network/networkctl.c | 1 + src/network/wait-online/wait-online.c | 1 + src/oom/oomctl.c | 1 + src/oom/oomd.c | 1 + src/pcrextend/pcrextend.c | 1 + src/pcrlock/pcrlock.c | 1 + src/rc-local-generator/rc-local-generator.c | 1 + src/sbsign/sbsign.c | 1 + src/sleep/sleep.c | 1 + src/ssh-generator/ssh-generator.c | 1 + src/ssh-generator/ssh-proxy.c | 1 + src/system-update-generator/system-update-generator.c | 1 + src/sysupdate/updatectl.c | 1 + src/timedate/timedatectl.c | 1 + src/tpm2-setup/tpm2-clear.c | 1 + src/tpm2-setup/tpm2-setup.c | 1 + src/udev/cdrom_id/cdrom_id.c | 1 + src/udev/fido_id/fido_id.c | 1 + src/udev/udevadm-cat.c | 1 + src/userdb/userdbctl.c | 1 + src/validatefs/validatefs.c | 1 + src/vpick/vpick-tool.c | 1 + src/xdg-autostart-generator/xdg-autostart-generator.c | 1 + src/xdg-autostart-generator/xdg-autostart-service.c | 1 + 37 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c index 06f999dc802..13382b99943 100644 --- a/src/ac-power/ac-power.c +++ b/src/ac-power/ac-power.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "ansi-color.h" #include "battery-util.h" #include "build.h" diff --git a/src/analyze/analyze-critical-chain.c b/src/analyze/analyze-critical-chain.c index edb06c5c536..e86aac24363 100644 --- a/src/analyze/analyze-critical-chain.c +++ b/src/analyze/analyze-critical-chain.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "alloc-util.h" #include "analyze.h" #include "analyze-critical-chain.h" #include "analyze-time-data.h" diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index 55ff91d76c8..b6760a980bb 100644 --- a/src/ask-password/ask-password.c +++ b/src/ask-password/ask-password.c @@ -7,6 +7,7 @@ #include "sd-varlink.h" +#include "alloc-util.h" #include "ask-password-api.h" #include "build.h" #include "bus-polkit.h" diff --git a/src/basic/static-destruct.h b/src/basic/static-destruct.h index 2ffc6516f80..2c7c75628f6 100644 --- a/src/basic/static-destruct.h +++ b/src/basic/static-destruct.h @@ -2,10 +2,11 @@ #pragma once -#include "alloc-util.h" #include "macro.h" #include "memory-util.h" +typedef void (*free_func_t)(void *p); + /* A framework for registering static variables that shall be freed on shutdown of a process. It's a bit like gcc's * destructor attribute, but allows us to precisely schedule when we want to free the variables. This is supposed to * feel a bit like the gcc cleanup attribute, but for static variables. Note that this does not work for static diff --git a/src/battery-check/battery-check.c b/src/battery-check/battery-check.c index 9e55edaf972..b6cbbbb84fc 100644 --- a/src/battery-check/battery-check.c +++ b/src/battery-check/battery-check.c @@ -7,6 +7,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "battery-util.h" #include "build.h" #include "errno-util.h" diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c index 7affff5c1f3..33f400864b8 100644 --- a/src/environment-d-generator/environment-d-generator.c +++ b/src/environment-d-generator/environment-d-generator.c @@ -2,6 +2,7 @@ #include "sd-path.h" +#include "alloc-util.h" #include "conf-files.h" #include "constants.h" #include "env-file.h" diff --git a/src/factory-reset/factory-reset-tool.c b/src/factory-reset/factory-reset-tool.c index 73f37e7490b..f2c4c7ca436 100644 --- a/src/factory-reset/factory-reset-tool.c +++ b/src/factory-reset/factory-reset-tool.c @@ -5,6 +5,7 @@ #include "sd-json.h" #include "sd-varlink.h" +#include "alloc-util.h" #include "ansi-color.h" #include "build.h" #include "device-util.h" diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c index 91b98b4f877..781b2faf778 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -4,6 +4,7 @@ #include #include +#include "alloc-util.h" #include "build.h" #include "devnum-util.h" #include "hibernate-resume-config.h" diff --git a/src/import/import-generator.c b/src/import/import-generator.c index bee4d7262f8..a442a2025fb 100644 --- a/src/import/import-generator.c +++ b/src/import/import-generator.c @@ -2,6 +2,7 @@ #include "sd-json.h" +#include "alloc-util.h" #include "creds-util.h" #include "discover-image.h" #include "efivars.h" diff --git a/src/libsystemd-network/test-ndisc-send.c b/src/libsystemd-network/test-ndisc-send.c index 85897e3797f..52bd9fa637e 100644 --- a/src/libsystemd-network/test-ndisc-send.c +++ b/src/libsystemd-network/test-ndisc-send.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "build.h" #include "ether-addr-util.h" #include "fd-util.h" diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 36dbeb9daa8..54e2ee597cd 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -5,6 +5,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "build.h" #include "bus-error.h" #include "bus-locator.h" diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 27ecb23e9bf..a09311d41d7 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -5,6 +5,7 @@ #include #include +#include "alloc-util.h" #include "build.h" #include "conf-files.h" #include "constants.h" diff --git a/src/network/generator/main.c b/src/network/generator/main.c index 78389ba3194..0d077585ba8 100644 --- a/src/network/generator/main.c +++ b/src/network/generator/main.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "build.h" #include "creds-util.h" #include "errno-util.h" diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 829618e811f..cee7be5ee15 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "build.h" #include "log.h" #include "logs-show.h" diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c index a8b13264be7..58b485bbd15 100644 --- a/src/network/wait-online/wait-online.c +++ b/src/network/wait-online/wait-online.c @@ -6,6 +6,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "build.h" #include "daemon-util.h" #include "log.h" diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c index 3a2ac2a6aa5..09df6080a89 100644 --- a/src/oom/oomctl.c +++ b/src/oom/oomctl.c @@ -3,6 +3,7 @@ #include #include +#include "alloc-util.h" #include "build.h" #include "bus-error.h" #include "bus-locator.h" diff --git a/src/oom/oomd.c b/src/oom/oomd.c index 11d11a3dc8a..d0876d789f0 100644 --- a/src/oom/oomd.c +++ b/src/oom/oomd.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "build.h" #include "bus-log-control-api.h" #include "bus-object.h" diff --git a/src/pcrextend/pcrextend.c b/src/pcrextend/pcrextend.c index f54fb85343d..d57fcfbfcc7 100644 --- a/src/pcrextend/pcrextend.c +++ b/src/pcrextend/pcrextend.c @@ -6,6 +6,7 @@ #include "sd-messages.h" #include "sd-varlink.h" +#include "alloc-util.h" #include "build.h" #include "efi-loader.h" #include "escape.h" diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c index a5cf892953e..d821c6457e7 100644 --- a/src/pcrlock/pcrlock.c +++ b/src/pcrlock/pcrlock.c @@ -9,6 +9,7 @@ #include "sd-json.h" #include "sd-varlink.h" +#include "alloc-util.h" #include "ask-password-api.h" #include "bitfield.h" #include "blockdev-util.h" diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c index 53ea23215ed..f680382bfcc 100644 --- a/src/rc-local-generator/rc-local-generator.c +++ b/src/rc-local-generator/rc-local-generator.c @@ -4,6 +4,7 @@ #include #include +#include "alloc-util.h" #include "generator.h" #include "initrd-util.h" #include "log.h" diff --git a/src/sbsign/sbsign.c b/src/sbsign/sbsign.c index 74e05d4b400..346f577ebe6 100644 --- a/src/sbsign/sbsign.c +++ b/src/sbsign/sbsign.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "ansi-color.h" #include "authenticode.h" #include "build.h" diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 2149a49299c..ac6912d2f94 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -19,6 +19,7 @@ #include "sd-json.h" #include "sd-messages.h" +#include "alloc-util.h" #include "battery-capacity.h" #include "battery-util.h" #include "blockdev-util.h" diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c index 99ceeb667ad..1cc5efd04c8 100644 --- a/src/ssh-generator/ssh-generator.c +++ b/src/ssh-generator/ssh-generator.c @@ -4,6 +4,7 @@ #include #include +#include "alloc-util.h" #include "creds-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/ssh-generator/ssh-proxy.c b/src/ssh-generator/ssh-proxy.c index 86db2e1cde8..eaf5982dea6 100644 --- a/src/ssh-generator/ssh-proxy.c +++ b/src/ssh-generator/ssh-proxy.c @@ -6,6 +6,7 @@ #include "sd-varlink.h" +#include "alloc-util.h" #include "fd-util.h" #include "io-util.h" #include "iovec-util.h" diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c index d76437745b4..c70958b9c96 100644 --- a/src/system-update-generator/system-update-generator.c +++ b/src/system-update-generator/system-update-generator.c @@ -3,6 +3,7 @@ #include #include +#include "alloc-util.h" #include "fs-util.h" #include "generator.h" #include "initrd-util.h" diff --git a/src/sysupdate/updatectl.c b/src/sysupdate/updatectl.c index 20476fae880..af65f28429f 100644 --- a/src/sysupdate/updatectl.c +++ b/src/sysupdate/updatectl.c @@ -6,6 +6,7 @@ #include "sd-bus.h" #include "sd-json.h" +#include "alloc-util.h" #include "build.h" #include "bus-error.h" #include "bus-label.h" diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 1691c5aa1ba..02ee9c226e7 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -8,6 +8,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "build.h" #include "bus-error.h" #include "bus-locator.h" diff --git a/src/tpm2-setup/tpm2-clear.c b/src/tpm2-setup/tpm2-clear.c index 9bc99b1cd19..2bbaf333bad 100644 --- a/src/tpm2-setup/tpm2-clear.c +++ b/src/tpm2-setup/tpm2-clear.c @@ -4,6 +4,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "build.h" #include "env-util.h" #include "fileio.h" diff --git a/src/tpm2-setup/tpm2-setup.c b/src/tpm2-setup/tpm2-setup.c index 0a928e1cb9f..29f2e558602 100644 --- a/src/tpm2-setup/tpm2-setup.c +++ b/src/tpm2-setup/tpm2-setup.c @@ -5,6 +5,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "build.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index 24bb9cd5efb..748093a275a 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -10,6 +10,7 @@ #include #include +#include "alloc-util.h" #include "build.h" #include "fd-util.h" #include "main-func.h" diff --git a/src/udev/fido_id/fido_id.c b/src/udev/fido_id/fido_id.c index 6c4b099568f..2bd64ee75ed 100644 --- a/src/udev/fido_id/fido_id.c +++ b/src/udev/fido_id/fido_id.c @@ -15,6 +15,7 @@ #include #include +#include "alloc-util.h" #include "build.h" #include "device-private.h" #include "device-util.h" diff --git a/src/udev/udevadm-cat.c b/src/udev/udevadm-cat.c index 2d7e86994d3..76811ef16fb 100644 --- a/src/udev/udevadm-cat.c +++ b/src/udev/udevadm-cat.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "log.h" #include "parse-argument.h" #include "pretty-print.h" diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c index aba39d251ac..db1743ee05a 100644 --- a/src/userdb/userdbctl.c +++ b/src/userdb/userdbctl.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "bitfield.h" #include "build.h" #include "copy.h" diff --git a/src/validatefs/validatefs.c b/src/validatefs/validatefs.c index 2f841aa4e68..8cc595932e8 100644 --- a/src/validatefs/validatefs.c +++ b/src/validatefs/validatefs.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "blkid-util.h" #include "blockdev-util.h" #include "build.h" diff --git a/src/vpick/vpick-tool.c b/src/vpick/vpick-tool.c index 64ece305108..df6d888091b 100644 --- a/src/vpick/vpick-tool.c +++ b/src/vpick/vpick-tool.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "architecture.h" #include "build.h" #include "format-table.h" diff --git a/src/xdg-autostart-generator/xdg-autostart-generator.c b/src/xdg-autostart-generator/xdg-autostart-generator.c index 9323143fa44..37e59991e96 100644 --- a/src/xdg-autostart-generator/xdg-autostart-generator.c +++ b/src/xdg-autostart-generator/xdg-autostart-generator.c @@ -4,6 +4,7 @@ #include #include +#include "alloc-util.h" #include "dirent-util.h" #include "fd-util.h" #include "generator.h" diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c index 23c6fb01ef2..e4081c9e635 100644 --- a/src/xdg-autostart-generator/xdg-autostart-service.c +++ b/src/xdg-autostart-generator/xdg-autostart-service.c @@ -5,6 +5,7 @@ #include #include +#include "alloc-util.h" #include "conf-parser.h" #include "escape.h" #include "extract-word.h" -- 2.47.3