static-destruct: Reduce transitive includes

diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index 06f999dc802bdb9d628cd54ff91ba51e96e16e3c..13382b9994377bb938b2984fe0b8851e4a6b339a 100644 (file)
--- a/src/ac-power/ac-power.c
+++ b/src/ac-power/ac-power.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 edb06c5c5369f6f0dbe6567eca1dc63d4d657261..e86aac243635b523592bc40651711bfcde81cc23 100644 (file)
--- 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 55ff91d76c8040037cd562d1a31932a4e55153a9..b6760a980bbfa6bcd1d627c754ca87feb66b8eab 100644 (file)
--- 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 2ffc6516f80c209be1e84b7a5ac79daf6a29f602..2c7c75628f6626155b6d15bf7a577a8367491c12 100644 (file)
--- 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 9e55edaf9728e272929a55fa15ad36c22e6174a5..b6cbbbb84fc74d16d2f14b0c862fdd4e24c9c20b 100644 (file)
--- 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 7affff5c1f35dac76223f8a14a0299e7f9cf0c09..33f400864b82930b3ea496abbec6038e9ecaaa6b 100644 (file)
--- 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 73f37e7490b7ff1f6ac6c40bda09bc2fff30a46e..f2c4c7ca436d0d4e96bfe7617321fb104eb7bc09 100644 (file)
--- 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 91b98b4f87726047d291489463136bab9772423b..781b2faf778304447a4e6f685988bd78a74fceae 100644 (file)
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -4,6 +4,7 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
+#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 bee4d7262f8d9ea97cf9829febb5dfebe6159b95..a442a2025fbfb50c7c14d2ea0bfe1ed148ef6bb4 100644 (file)
--- 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 85897e3797fc20a79b5c1d130f26794634f95ccc..52bd9fa637e3ce35da7a344563a9aa1adb91d39a 100644 (file)
--- a/src/libsystemd-network/test-ndisc-send.c
+++ b/src/libsystemd-network/test-ndisc-send.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 36dbeb9daa89a1c67606085355abd0286db6a99e..54e2ee597cd9c882f5ea0fc765a30d48149f10e5 100644 (file)
--- 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 27ecb23e9bf1bb1211d73051ecde5ea0340eff12..a09311d41d73a5ee271d398b1300ccf2da2205a8 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -5,6 +5,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 
+#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 78389ba31943bb754da9c449012e1b1284270dd9..0d077585ba81362ab069b2e61cb714e461e547b7 100644 (file)
--- a/src/network/generator/main.c
+++ b/src/network/generator/main.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 829618e811f3c41d90552a6099b930bc36dd9859..cee7be5ee159071267b40e29587fe7be0acde543 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 a8b13264be79803c45b21635c3f3bbcd583786be..58b485bbd1516c764744e3fa6282fcd7ac32e81e 100644 (file)
--- 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 3a2ac2a6aa5eb1ede7dac44279f38bf143f268ae..09df6080a89353d8da972069f3cdbb94517c71b4 100644 (file)
--- a/src/oom/oomctl.c
+++ b/src/oom/oomctl.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <unistd.h>
 
+#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 11d11a3dc8ae47f133fc7ef1f350065a585e4f0c..d0876d789f0f751a840b8434f48bcebca38abe67 100644 (file)
--- a/src/oom/oomd.c
+++ b/src/oom/oomd.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 f54fb85343d112effd18f6572b5f89d070f0fa48..d57fcfbfcc78d02acf1be45d26432e6d8217c511 100644 (file)
--- 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 a5cf892953ed9c7736192d77e05b1b4c7e44e77d..d821c6457e7461d3557e5939c2a4ae6d73355ad0 100644 (file)
--- 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 53ea23215edcafdb72b8a61fcd62af6444e1e12f..f680382bfcc31361497f87d3c4c353e49ed13686 100644 (file)
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#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 74e05d4b40006e74f5a6f5302558d37a99328a4d..346f577ebe666bc242ca2e9e5de9a8c88a5fa091 100644 (file)
--- a/src/sbsign/sbsign.c
+++ b/src/sbsign/sbsign.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 2149a49299c1114adcb55303a51f10f1128077ac..ac6912d2f941bf3aa82cc4bee31e2a1a7fa9fea2 100644 (file)
--- 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 99ceeb667ad387b6bf39255a994dcf744eb638f2..1cc5efd04c86f69289e9e1e944ada4726ede98bf 100644 (file)
--- a/src/ssh-generator/ssh-generator.c
+++ b/src/ssh-generator/ssh-generator.c
@@ -4,6 +4,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#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 86db2e1cde843a09d0379aa34e455f6b453b3fd0..eaf5982dea66d56cd7fb9ccc9b04329c02ea21ab 100644 (file)
--- 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 d76437745b48d776900dfe5f22fb39e8f7d8e1f8..c70958b9c96cee7cf260fce27f2545fbf7c867b8 100644 (file)
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -3,6 +3,7 @@
 #include <errno.h>
 #include <unistd.h>
 
+#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 20476fae8803fc25d51d439543ff7b3e44c8e821..af65f28429f923c14554cc13ed97999d5227f817 100644 (file)
--- 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 1691c5aa1baf157cdee932bac951ce1a59e47b6d..02ee9c226e7045123565da06c55cffb1f10712fa 100644 (file)
--- 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 9bc99b1cd191154b26b7e76b185235bc8085ce8a..2bbaf333bad341220f79435787064621e8b19df3 100644 (file)
--- 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 0a928e1cb9ffa354e59f6d31160e681bcf11bc7e..29f2e55860219b394c23aca2cb80ed4b749ce167 100644 (file)
--- 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 24bb9cd5efb89ed041c6f351a27311bd6d810fd4..748093a275aa2db53049bb8ac6d5aa8d5658bb06 100644 (file)
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -10,6 +10,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#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 6c4b099568fe73d150bd9ef7ae1d62cb479b1313..2bd64ee75edaf41708bab4e933494efc3e19c0ac 100644 (file)
--- a/src/udev/fido_id/fido_id.c
+++ b/src/udev/fido_id/fido_id.c
@@ -15,6 +15,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#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 2d7e86994d364e78c20dc8733dda06da0788f7d7..76811ef16fb89fd4ab8f6954b8be58670f07a271 100644 (file)
--- a/src/udev/udevadm-cat.c
+++ b/src/udev/udevadm-cat.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 aba39d251acbe78ef324e58f61c9a0009151aefa..db1743ee05aee82f84bfd22530aad3b50b22bc87 100644 (file)
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 2f841aa4e68f121c2d640c6185af77a3d190e171..8cc595932e8ed23b45a963ac62976a64fd6599f2 100644 (file)
--- a/src/validatefs/validatefs.c
+++ b/src/validatefs/validatefs.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 64ece3051083224474c974a4596e3e8b1d2b3558..df6d888091b734ad086c7c1e442db44e347520fa 100644 (file)
--- a/src/vpick/vpick-tool.c
+++ b/src/vpick/vpick-tool.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#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 9323143fa4433b58a2d841b11f6f1d8ecb426153..37e59991e96ff8cb426c521c46c8b0abb987ce69 100644 (file)
--- a/src/xdg-autostart-generator/xdg-autostart-generator.c
+++ b/src/xdg-autostart-generator/xdg-autostart-generator.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#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 23c6fb01ef29823b00d8fdcf9d110e6d67acd04c..e4081c9e635aba371a793f1edb4e6e4e57476865 100644 (file)
--- a/src/xdg-autostart-generator/xdg-autostart-service.c
+++ b/src/xdg-autostart-generator/xdg-autostart-service.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "conf-parser.h"
 #include "escape.h"
 #include "extract-word.h"