From d11ce973863b1c907e60cd3de39cbcc7e24b8b32 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 20 Nov 2025 19:15:14 +0100 Subject: [PATCH 1/3] test-journald-config: Modernize test --- src/journal/test-journald-config.c | 152 +++++++++++++---------------- 1 file changed, 69 insertions(+), 83 deletions(-) diff --git a/src/journal/test-journald-config.c b/src/journal/test-journald-config.c index 735e4d664a..15815f2967 100644 --- a/src/journal/test-journald-config.c +++ b/src/journal/test-journald-config.c @@ -5,90 +5,76 @@ #include #include "alloc-util.h" -#include "journald-manager.h" +#include "journald-config.h" #include "log.h" #include "socket-util.h" #include "sparse-endian.h" #include "tests.h" -#define _COMPRESS_PARSE_CHECK(str, enab, thresh, varname) \ - do { \ - JournalCompressOptions varname = {-222, 111}; \ - config_parse_compress("", "", 0, "", 0, "", 0, str, \ - &varname, NULL); \ - assert_se((enab) == varname.enabled); \ - if (varname.enabled) \ - assert_se((thresh) == varname.threshold_bytes); \ - } while (0) +static void compress_parse_check(const char *str, int expected_enabled, uint64_t expected_threshold) { + JournalCompressOptions conf = { .enabled = -222, .threshold_bytes = 111 }; -#define COMPRESS_PARSE_CHECK(str, enabled, threshold) \ - _COMPRESS_PARSE_CHECK(str, enabled, threshold, conf##__COUNTER__) + ASSERT_OK(config_parse_compress("", "", 0, "", 0, "", 0, str, &conf, NULL)); + ASSERT_EQ(expected_enabled, conf.enabled); + if (conf.enabled) + ASSERT_EQ(expected_threshold, conf.threshold_bytes); +} TEST(config_compress) { - COMPRESS_PARSE_CHECK("yes", true, UINT64_MAX); - COMPRESS_PARSE_CHECK("no", false, UINT64_MAX); - COMPRESS_PARSE_CHECK("y", true, UINT64_MAX); - COMPRESS_PARSE_CHECK("n", false, UINT64_MAX); - COMPRESS_PARSE_CHECK("true", true, UINT64_MAX); - COMPRESS_PARSE_CHECK("false", false, UINT64_MAX); - COMPRESS_PARSE_CHECK("t", true, UINT64_MAX); - COMPRESS_PARSE_CHECK("f", false, UINT64_MAX); - COMPRESS_PARSE_CHECK("on", true, UINT64_MAX); - COMPRESS_PARSE_CHECK("off", false, UINT64_MAX); + compress_parse_check("yes", true, UINT64_MAX); + compress_parse_check("no", false, UINT64_MAX); + compress_parse_check("y", true, UINT64_MAX); + compress_parse_check("n", false, UINT64_MAX); + compress_parse_check("true", true, UINT64_MAX); + compress_parse_check("false", false, UINT64_MAX); + compress_parse_check("t", true, UINT64_MAX); + compress_parse_check("f", false, UINT64_MAX); + compress_parse_check("on", true, UINT64_MAX); + compress_parse_check("off", false, UINT64_MAX); /* Weird size/bool overlapping case. We preserve backward compatibility instead of assuming these are byte * counts. */ - COMPRESS_PARSE_CHECK("1", true, UINT64_MAX); - COMPRESS_PARSE_CHECK("0", false, UINT64_MAX); + compress_parse_check("1", true, UINT64_MAX); + compress_parse_check("0", false, UINT64_MAX); /* IEC sizing */ - COMPRESS_PARSE_CHECK("1B", true, 1); - COMPRESS_PARSE_CHECK("1K", true, 1024); - COMPRESS_PARSE_CHECK("1M", true, 1024 * 1024); - COMPRESS_PARSE_CHECK("1G", true, 1024 * 1024 * 1024); + compress_parse_check("1B", true, 1); + compress_parse_check("1K", true, 1024); + compress_parse_check("1M", true, 1024 * 1024); + compress_parse_check("1G", true, 1024 * 1024 * 1024); /* Invalid Case */ - COMPRESS_PARSE_CHECK("-1", -222, 111); - COMPRESS_PARSE_CHECK("blah blah", -222, 111); - COMPRESS_PARSE_CHECK("", -1, UINT64_MAX); + compress_parse_check("-1", -222, 111); + compress_parse_check("blah blah", -222, 111); + compress_parse_check("", -1, UINT64_MAX); } -#define _FORWARD_TO_SOCKET_PARSE_CHECK_FAILS(str, addr, varname) \ - do { \ - SocketAddress varname = {}; \ - config_parse_forward_to_socket("", "", 0, "", 0, "", 0, str, \ - &varname, NULL); \ - assert_se(socket_address_verify(&varname, true) < 0); \ - } while (0) +static void forward_to_socket_parse_check_fails(const char *str) { + SocketAddress conf = {}; -#define FORWARD_TO_SOCKET_PARSE_CHECK_FAILS(str) \ - _FORWARD_TO_SOCKET_PARSE_CHECK_FAILS(str, addr, conf##__COUNTER__) + ASSERT_OK(config_parse_forward_to_socket("", "", 0, "", 0, "", 0, str, &conf, NULL)); + ASSERT_FAIL(socket_address_verify(&conf, true)); +} -#define _FORWARD_TO_SOCKET_PARSE_CHECK(str, addr, varname) \ - do { \ - SocketAddress varname = {}; \ - config_parse_forward_to_socket("", "", 0, "", 0, "", 0, str, \ - &varname, NULL); \ - buf = mfree(buf); \ - buf2 = mfree(buf2); \ - socket_address_print(&varname, &buf); \ - socket_address_print(&addr, &buf2); \ - log_info("\"%s\" parsed as \"%s\", should be \"%s\"", str, buf, buf2); \ - log_info("socket_address_verify(&addr, false) = %d", socket_address_verify(&addr, false)); \ - log_info("socket_address_verify(&varname, false) = %d", socket_address_verify(&varname, false)); \ - log_info("socket_address_family(&addr) = %d", socket_address_family(&addr)); \ - log_info("socket_address_family(&varname) = %d", socket_address_family(&varname)); \ - log_info("addr.size = %u", addr.size); \ - log_info("varname.size = %u", varname.size); \ - assert_se(socket_address_equal(&varname, &addr)); \ - } while (0) +static void forward_to_socket_parse_check(const char *str, const SocketAddress *expected_addr) { + _cleanup_free_ char *buf = NULL, *buf2 = NULL; + SocketAddress conf = {}; -#define FORWARD_TO_SOCKET_PARSE_CHECK(str, addr) \ - _FORWARD_TO_SOCKET_PARSE_CHECK(str, addr, conf##__COUNTER__) + ASSERT_OK(config_parse_forward_to_socket("", "", 0, "", 0, "", 0, str, &conf, NULL)); + ASSERT_OK(socket_address_print(&conf, &buf)); + ASSERT_OK(socket_address_print(expected_addr, &buf2)); + log_info("\"%s\" parsed as \"%s\", should be \"%s\"", str, buf, buf2); + log_info("socket_address_verify(&expected_addr, false) = %d", socket_address_verify(expected_addr, false)); + log_info("socket_address_verify(&conf, false) = %d", socket_address_verify(&conf, false)); + log_info("socket_address_family(&expected_addr) = %d", socket_address_family(expected_addr)); + log_info("socket_address_family(&conf) = %d", socket_address_family(&conf)); + log_info("expected_addr.size = %u", expected_addr->size); + log_info("conf.size = %u", conf.size); + ASSERT_TRUE(socket_address_equal(&conf, expected_addr)); +} TEST(config_forward_to_socket) { SocketAddress addr; - _cleanup_free_ char *buf = NULL, *buf2 = NULL; /* Valid AF_UNIX */ addr = (SocketAddress) { @@ -98,11 +84,11 @@ TEST(config_forward_to_socket) { }, .size = offsetof(struct sockaddr_un, sun_path) + strlen("/run/host/journal/socket") + 1, }; - FORWARD_TO_SOCKET_PARSE_CHECK("/run/host/journal/socket", addr); + forward_to_socket_parse_check("/run/host/journal/socket", &addr); addr.size -= 1; memcpy(addr.sockaddr.un.sun_path, "\0run/host/journal/socket", sizeof("\0run/host/journal/socket")); - FORWARD_TO_SOCKET_PARSE_CHECK("@run/host/journal/socket", addr); + forward_to_socket_parse_check("@run/host/journal/socket", &addr); /* Valid AF_INET */ addr = (SocketAddress) { @@ -113,7 +99,7 @@ TEST(config_forward_to_socket) { }, .size = sizeof(struct sockaddr_in), }; - FORWARD_TO_SOCKET_PARSE_CHECK("192.168.0.1:1234", addr); + forward_to_socket_parse_check("192.168.0.1:1234", &addr); /* Valid AF_INET6 */ addr = (SocketAddress) { @@ -133,7 +119,7 @@ TEST(config_forward_to_socket) { }, .size = sizeof(struct sockaddr_in6), }; - FORWARD_TO_SOCKET_PARSE_CHECK("[2001:db8:4006:812::200e]:8080", addr); + forward_to_socket_parse_check("[2001:db8:4006:812::200e]:8080", &addr); /* Valid AF_VSOCK */ addr = (SocketAddress) { @@ -144,34 +130,34 @@ TEST(config_forward_to_socket) { }, .size = sizeof(struct sockaddr_vm), }; - FORWARD_TO_SOCKET_PARSE_CHECK("vsock:123456:654321", addr); + forward_to_socket_parse_check("vsock:123456:654321", &addr); /* Invalid IPv4 */ - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("256.123.45.12:1235"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("252.123.45.12:123500"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("252.123.45.12:0"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("252.123.45.12:-1"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("-1.123.45.12:22"); + forward_to_socket_parse_check_fails("256.123.45.12:1235"); + forward_to_socket_parse_check_fails("252.123.45.12:123500"); + forward_to_socket_parse_check_fails("252.123.45.12:0"); + forward_to_socket_parse_check_fails("252.123.45.12:-1"); + forward_to_socket_parse_check_fails("-1.123.45.12:22"); /* Invalid IPv6 */ - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("[2001:db8:4006:812::200e]:80800"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("[1ffff:db8:4006:812::200e]:8080"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("[-1:db8:4006:812::200e]:8080"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("[2001:db8:4006:812::200e]:-1"); + forward_to_socket_parse_check_fails("[2001:db8:4006:812::200e]:80800"); + forward_to_socket_parse_check_fails("[1ffff:db8:4006:812::200e]:8080"); + forward_to_socket_parse_check_fails("[-1:db8:4006:812::200e]:8080"); + forward_to_socket_parse_check_fails("[2001:db8:4006:812::200e]:-1"); /* Invalid UNIX */ - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("a/b/c"); + forward_to_socket_parse_check_fails("a/b/c"); /* Invalid VSock */ - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("vsock:4294967296:1234"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("vsock:1234:4294967296"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("vsock:abcd:1234"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("vsock:1234:abcd"); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("vsock:1234"); + forward_to_socket_parse_check_fails("vsock:4294967296:1234"); + forward_to_socket_parse_check_fails("vsock:1234:4294967296"); + forward_to_socket_parse_check_fails("vsock:abcd:1234"); + forward_to_socket_parse_check_fails("vsock:1234:abcd"); + forward_to_socket_parse_check_fails("vsock:1234"); /* Invalid Case */ - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS(""); - FORWARD_TO_SOCKET_PARSE_CHECK_FAILS("ahh yes sockets, mmh"); + forward_to_socket_parse_check_fails(""); + forward_to_socket_parse_check_fails("ahh yes sockets, mmh"); } DEFINE_TEST_MAIN(LOG_INFO); From 87fbd33372c00a91a5a9b3af41ed81006dd0799f Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 23 May 2025 13:38:45 +0200 Subject: [PATCH 2/3] clang-tidy: Fix all remaining misc-include-cleaner violations - Remove unused includes - Add common false positive headers to misc-include-cleaner.IgnoreHeaders - Add IWYU pragma keep for uncommon false positive headers --- .clang-tidy | 21 +++++++++++++++++++ src/analyze/analyze-nvpcrs.c | 1 - src/basic/alloc-util.h | 2 +- src/basic/architecture.h | 2 +- src/basic/confidential-virt.c | 4 ++-- src/basic/dirent-util.h | 4 ++-- src/basic/format-util.h | 4 ++-- src/basic/raw-clone.c | 4 ++-- src/basic/string-table.h | 3 ++- src/basic/time-util.c | 4 +--- src/basic/unit-def.c | 2 -- src/basic/virt.c | 2 +- src/battery-check/battery-check.c | 2 +- src/boot/efi-log.h | 2 +- src/core/apparmor-setup.c | 5 ++++- src/core/automount.c | 2 +- src/core/bpf/restrict-fs/restrict-fs-skel.h | 4 ++-- .../restrict-ifaces/restrict-ifaces-skel.h | 4 ++-- src/core/bpf/socket-bind/socket-bind-skel.h | 4 ++-- src/core/cgroup.c | 2 -- src/core/dbus-unit.c | 2 +- src/core/dbus-util.h | 2 +- src/core/exec-credential.c | 2 +- src/core/exec-invoke.c | 4 ++-- src/core/execute.h | 1 - src/core/service.c | 2 +- src/core/socket.c | 1 - src/core/unit.c | 1 - src/core/varlink-manager.c | 1 - src/core/varlink-unit.c | 1 - src/coredump/coredump-backtrace.c | 2 -- src/coredump/coredump-context.c | 1 - src/coredump/coredump-kernel-helper.c | 1 - src/coredump/coredump-receive.c | 1 - src/cryptsetup/cryptsetup.c | 2 -- src/firstboot/firstboot.c | 1 - src/fundamental/iovec-util-fundamental.h | 2 +- src/fundamental/sha1-fundamental.c | 2 +- src/fundamental/sha256-fundamental.c | 2 +- src/fundamental/string-util-fundamental.h | 2 +- src/import/pull-tar.c | 2 -- src/include/override/linux/sctp.h | 7 +++++++ src/include/override/sched.h | 3 ++- src/libsystemd-network/sd-dns-resolver.c | 2 -- src/libsystemd/sd-journal/audit-type.c | 4 ---- src/libsystemd/sd-journal/audit-type.h | 2 +- .../sd-journal/audit_type-to-name.awk | 3 +++ src/libsystemd/sd-journal/journal-send.h | 2 +- .../sd-journal/test-journal-stream.c | 1 - src/libsystemd/sd-json/json-util.h | 2 +- .../sd-netlink/netlink-types-nfnl.c | 2 +- src/machine/machined-resolve-hook.c | 2 +- src/mountfsd/mountfsd-manager.c | 1 - .../bpf/sysctl-monitor/sysctl-monitor-skel.h | 4 ++-- src/network/networkd-resolve-hook.c | 1 - src/network/networkd-sysctl.c | 1 + src/network/test-network.c | 1 - src/nspawn/nspawn-oci.c | 1 - .../userns-restrict/userns-restrict-skel.h | 4 ++-- src/nsresourced/nsresourced-manager.c | 2 +- src/nsresourced/userns-restrict.c | 4 ++++ src/nsresourced/userns-restrict.h | 4 ---- src/oom/test-oomd-util.c | 1 + src/remount-fs/remount-fs.c | 1 - src/resolve/resolved-dns-delegate-bus.c | 2 +- src/resolve/resolved-resolv-conf.c | 3 +-- src/resolve/test-resolved-stream.c | 1 + src/shared/acl-util.c | 2 +- src/shared/apparmor-util.c | 3 ++- src/shared/blkid-util.c | 3 ++- src/shared/bus-get-properties.h | 2 +- src/shared/calendarspec.c | 2 -- src/shared/copy.c | 1 - src/shared/coredump-util.c | 2 +- src/shared/discover-image.c | 3 --- src/shared/dns-rr.c | 2 +- src/shared/efi-api.c | 2 +- src/shared/idn-util.c | 2 +- src/shared/libarchive-util.c | 2 +- src/shared/libcrypt-util.c | 2 +- src/shared/main-func.h | 2 +- src/shared/mkdir-label.c | 2 +- src/shared/password-quality-util-passwdqc.c | 9 +++++--- src/shared/password-quality-util-passwdqc.h | 2 -- src/shared/password-quality-util-pwquality.c | 8 ++++--- src/shared/password-quality-util-pwquality.h | 2 -- src/shared/reread-partition-table.c | 1 - src/shared/securebits-util.c | 2 -- src/shared/tests.c | 1 - src/shared/tests.h | 7 +++---- src/shared/tpm2-event-log.h | 2 +- src/shared/tpm2-util.c | 3 --- src/shared/varlink-io.systemd.Unit.c | 2 -- src/shutdown/detach-md.c | 2 +- src/shutdown/shutdown.c | 2 -- src/ssh-generator/ssh-issue.c | 1 - src/sysctl/sysctl.c | 2 -- src/sysext/sysext.c | 2 +- src/systemctl/systemctl-show.c | 1 - src/test/test-capability-list.c | 1 - src/test/test-chown-rec.c | 1 + src/test/test-clock.c | 1 + src/test/test-copy.c | 1 + src/test/test-dirent-util.c | 1 + src/test/test-exec-util.c | 1 + src/test/test-lock-util.c | 1 + src/test/test-mount-util.c | 1 + src/test/test-mountpoint-util.c | 1 + src/test/test-nsresource.c | 1 + src/test/test-path-util.c | 1 + src/test/test-reread-partition-table.c | 1 + src/test/test-serialize.c | 2 +- src/test/test-stat-util.c | 1 + src/test/test-tables.c | 1 - src/test/test-terminal-util.c | 1 + src/test/test-tests.c | 1 + src/test/test-varlink-idl.c | 2 +- src/test/test-xattr-util.c | 1 + src/timedate/timedatectl.c | 1 - src/tpm2-setup/tpm2-setup.c | 4 ---- src/udev/udev-rules.c | 2 +- src/udev/udevadm-util.c | 1 - src/vpick/vpick-tool.c | 1 - 123 files changed, 138 insertions(+), 147 deletions(-) create mode 100644 src/include/override/linux/sctp.h diff --git a/.clang-tidy b/.clang-tidy index 55bd0886d3..03d45185d9 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -6,6 +6,27 @@ Checks: ' readability-duplicate-include, bugprone-argument-comment ' +CheckOptions: + misc-include-cleaner.MissingIncludes: 'false' + # These all lead to common false positives by clang-tidy where it tries to + # remove these includes even though they're required in some situations (many + # of them related to musl). + misc-include-cleaner.IgnoreHeaders: ' + endian\.h; + getopt\.h; + sys/stat\.h; + sys/statvfs\.h; + sys/syscall\.h; + sys/timex\.h; + sys/uio\.h; + netinet/in\.h; + net/if\.h; + net/if_arp\.h; + runtime-scope\.h; + varlink-io\.systemd\..*; + varlink-idl-common\.h; + unistd\.h +' WarningsAsErrors: '*' HeaderFileExtensions: - h diff --git a/src/analyze/analyze-nvpcrs.c b/src/analyze/analyze-nvpcrs.c index 0fc7b163cf..546523175c 100644 --- a/src/analyze/analyze-nvpcrs.c +++ b/src/analyze/analyze-nvpcrs.c @@ -7,7 +7,6 @@ #include "constants.h" #include "format-table.h" #include "hexdecoct.h" -#include "string-util.h" #include "strv.h" #include "tpm2-util.h" diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h index 577a8174fa..cd062d5fe3 100644 --- a/src/basic/alloc-util.h +++ b/src/basic/alloc-util.h @@ -4,7 +4,7 @@ #include #include "basic-forward.h" -#include "memory-util.h" +#include "memory-util.h" /* IWYU pragma: keep */ #if HAS_FEATURE_MEMORY_SANITIZER # include diff --git a/src/basic/architecture.h b/src/basic/architecture.h index 261a9288e8..d7c3f23c3d 100644 --- a/src/basic/architecture.h +++ b/src/basic/architecture.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include /* IWYU pragma: keep */ +#include #include "basic-forward.h" diff --git a/src/basic/confidential-virt.c b/src/basic/confidential-virt.c index 3e07e3c3a2..a5996b244b 100644 --- a/src/basic/confidential-virt.c +++ b/src/basic/confidential-virt.c @@ -9,9 +9,9 @@ #include "confidential-virt.h" #include "confidential-virt-fundamental.h" -#include "errno-util.h" +#include "errno-util.h" /* IWYU pragma: keep */ #include "fd-util.h" -#include "fileio.h" +#include "fileio.h" /* IWYU pragma: keep */ #include "log.h" #include "string-table.h" #include "string-util.h" diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h index 521dbd5de7..76ae40eb5e 100644 --- a/src/basic/dirent-util.h +++ b/src/basic/dirent-util.h @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include /* IWYU pragma: export */ +#include /* IWYU pragma: export */ #include "basic-forward.h" -#include "path-util.h" +#include "path-util.h" /* IWYU pragma: keep */ bool dirent_is_file(const struct dirent *de) _pure_; bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) _pure_; diff --git a/src/basic/format-util.h b/src/basic/format-util.h index 16727c45bd..ac7f7b21a1 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "cgroup-util.h" #include "basic-forward.h" -#include "stdio-util.h" +#include "cgroup-util.h" +#include "stdio-util.h" /* IWYU pragma: keep */ assert_cc(sizeof(pid_t) == sizeof(int32_t)); #define PID_PRI PRIi32 diff --git a/src/basic/raw-clone.c b/src/basic/raw-clone.c index aa750acb6d..5f560178c8 100644 --- a/src/basic/raw-clone.c +++ b/src/basic/raw-clone.c @@ -4,9 +4,9 @@ Copyright © 2016 Michael Karcher ***/ -#include +#include /* IWYU pragma: keep */ #include -#include +#include /* IWYU pragma: keep */ #include #include "process-util.h" diff --git a/src/basic/string-table.h b/src/basic/string-table.h index 444de4161f..11f57d6fed 100644 --- a/src/basic/string-table.h +++ b/src/basic/string-table.h @@ -1,7 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ - #pragma once +#include + #include "basic-forward.h" const char* string_table_lookup_to_string(const char * const *table, size_t len, ssize_t i) _const_; diff --git a/src/basic/time-util.c b/src/basic/time-util.c index c612606a72..62f1fcaed8 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include #include @@ -10,15 +9,14 @@ #include "env-util.h" #include "errno-util.h" #include "extract-word.h" +#include "hexdecoct.h" /* IWYU pragma: keep */ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "hexdecoct.h" #include "io-util.h" #include "log.h" #include "parse-util.h" #include "path-util.h" -#include "process-util.h" #include "stat-util.h" #include "stdio-util.h" #include "string-table.h" diff --git a/src/basic/unit-def.c b/src/basic/unit-def.c index 9179897f3c..e8afaf1c3f 100644 --- a/src/basic/unit-def.c +++ b/src/basic/unit-def.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" #include "bus-label.h" #include "glyph-util.h" diff --git a/src/basic/virt.c b/src/basic/virt.c index 55d7c51270..2493ef8ac7 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -8,7 +8,7 @@ #include #include "alloc-util.h" -#include "dirent-util.h" +#include "dirent-util.h" /* IWYU pragma: keep */ #include "env-util.h" #include "extract-word.h" #include "fd-util.h" diff --git a/src/battery-check/battery-check.c b/src/battery-check/battery-check.c index 78636d7794..ef4038905e 100644 --- a/src/battery-check/battery-check.c +++ b/src/battery-check/battery-check.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include +#include /* IWYU pragma: keep */ #include "sd-messages.h" diff --git a/src/boot/efi-log.h b/src/boot/efi-log.h index 459838782b..2c340a4a9d 100644 --- a/src/boot/efi-log.h +++ b/src/boot/efi-log.h @@ -3,7 +3,7 @@ #include "efi.h" #include "efi-string.h" -#include "proto/simple-text-io.h" +#include "proto/simple-text-io.h" /* IWYU pragma: keep */ #if defined __has_attribute # if __has_attribute(no_stack_protector) diff --git a/src/core/apparmor-setup.c b/src/core/apparmor-setup.c index c4ea14b1d5..19b7282b37 100644 --- a/src/core/apparmor-setup.c +++ b/src/core/apparmor-setup.c @@ -1,9 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "apparmor-setup.h" + +#if HAVE_APPARMOR #include #include "alloc-util.h" -#include "apparmor-setup.h" #include "apparmor-util.h" #include "errno-util.h" #include "fd-util.h" @@ -11,6 +13,7 @@ #include "log.h" #include "string-util.h" #include "strv.h" +#endif int mac_apparmor_setup(void) { #if HAVE_APPARMOR diff --git a/src/core/automount.c b/src/core/automount.c index d312e2a427..b53d91dda1 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -2,7 +2,7 @@ #include #include -#include +#include /* IWYU pragma: keep */ #include #include diff --git a/src/core/bpf/restrict-fs/restrict-fs-skel.h b/src/core/bpf/restrict-fs/restrict-fs-skel.h index 796c85cf54..06935f2cd8 100644 --- a/src/core/bpf/restrict-fs/restrict-fs-skel.h +++ b/src/core/bpf/restrict-fs/restrict-fs-skel.h @@ -7,11 +7,11 @@ * fine given that LGPL-2.1-or-later downgrades to GPL if needed. */ -#include "bpf-dlopen.h" +#include "bpf-dlopen.h" /* IWYU pragma: keep */ /* libbpf is used via dlopen(), so rename symbols */ #define bpf_object__open_skeleton sym_bpf_object__open_skeleton #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton -#include "bpf/restrict-fs/restrict-fs.skel.h" +#include "bpf/restrict-fs/restrict-fs.skel.h" /* IWYU pragma: export */ diff --git a/src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h b/src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h index 7172929e41..53ba2e5b5a 100644 --- a/src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h +++ b/src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h @@ -7,11 +7,11 @@ * fine given that LGPL-2.1-or-later downgrades to GPL if needed. */ -#include "bpf-dlopen.h" +#include "bpf-dlopen.h" /* IWYU pragma: keep */ /* libbpf is used via dlopen(), so rename symbols */ #define bpf_object__open_skeleton sym_bpf_object__open_skeleton #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton -#include "bpf/restrict-ifaces/restrict-ifaces.skel.h" +#include "bpf/restrict-ifaces/restrict-ifaces.skel.h" /* IWYU pragma: export */ diff --git a/src/core/bpf/socket-bind/socket-bind-skel.h b/src/core/bpf/socket-bind/socket-bind-skel.h index b1dfa246ca..d83dd89e52 100644 --- a/src/core/bpf/socket-bind/socket-bind-skel.h +++ b/src/core/bpf/socket-bind/socket-bind-skel.h @@ -7,11 +7,11 @@ * fine given that LGPL-2.1-or-later downgrades to GPL if needed. */ -#include "bpf-dlopen.h" +#include "bpf-dlopen.h" /* IWYU pragma: keep */ /* libbpf is used via dlopen(), so rename symbols */ #define bpf_object__open_skeleton sym_bpf_object__open_skeleton #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton -#include "bpf/socket-bind/socket-bind.skel.h" +#include "bpf/socket-bind/socket-bind.skel.h" /* IWYU pragma: export */ diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 7242734e5a..374976edb1 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -51,10 +51,8 @@ #include "virt.h" #if BPF_FRAMEWORK -#include "bpf-dlopen.h" #include "bpf-link.h" #include "bpf-restrict-fs.h" -#include "bpf/restrict-fs/restrict-fs-skel.h" #endif #define CGROUP_CPU_QUOTA_DEFAULT_PERIOD_USEC (100 * USEC_PER_MSEC) diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index ed4646f75a..34ead16ee1 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -32,7 +32,7 @@ #include "special.h" #include "string-util.h" #include "strv.h" -#include "transaction.h" +#include "transaction.h" /* IWYU pragma: keep */ #include "unit-name.h" #include "web-util.h" diff --git a/src/core/dbus-util.h b/src/core/dbus-util.h index f28a1ca725..bccefdb58d 100644 --- a/src/core/dbus-util.h +++ b/src/core/dbus-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-bus.h" +#include "sd-bus.h" /* IWYU pragma: keep */ #include "core-forward.h" #include "string-util.h" diff --git a/src/core/exec-credential.c b/src/core/exec-credential.c index 7321868d5d..60b2a91fa0 100644 --- a/src/core/exec-credential.c +++ b/src/core/exec-credential.c @@ -22,12 +22,12 @@ #include "ordered-set.h" #include "path-lookup.h" #include "path-util.h" -#include "process-util.h" #include "random-util.h" #include "recurse-dir.h" #include "rm-rf.h" #include "siphash24.h" #include "stat-util.h" +#include "string-util.h" #include "strv.h" #include "user-util.h" diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c index bebb2f45a0..59808477d1 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include +#include #include #include #include @@ -15,7 +15,7 @@ #include "sd-messages.h" -#include "apparmor-util.h" +#include "apparmor-util.h" /* IWYU pragma: keep */ #include "argv-util.h" #include "ask-password-api.h" #include "barrier.h" diff --git a/src/core/execute.h b/src/core/execute.h index 62dd94e91d..7b6ace99b3 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -6,7 +6,6 @@ #include "sd-id128.h" #include "bus-unit-util.h" -#include "cgroup-util.h" #include "core-forward.h" #include "cpu-set-util.h" #include "exec-util.h" diff --git a/src/core/service.c b/src/core/service.c index 59a81028e6..a9d90354b6 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include /* IWYU pragma: keep */ #include #include #include diff --git a/src/core/socket.c b/src/core/socket.c index 3bb0149e62..971d297beb 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include diff --git a/src/core/unit.c b/src/core/unit.c index ddae43a673..b840370e24 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -11,7 +11,6 @@ #include "all-units.h" #include "alloc-util.h" #include "ansi-color.h" -#include "bpf-firewall.h" #include "bpf-restrict-fs.h" #include "bus-common-errors.h" #include "bus-internal.h" diff --git a/src/core/varlink-manager.c b/src/core/varlink-manager.c index 6c82ac05f1..7493c963e8 100644 --- a/src/core/varlink-manager.c +++ b/src/core/varlink-manager.c @@ -12,7 +12,6 @@ #include "json-util.h" #include "manager.h" #include "pidref.h" -#include "process-util.h" #include "selinux-access.h" #include "set.h" #include "strv.h" diff --git a/src/core/varlink-unit.c b/src/core/varlink-unit.c index b193753c01..634d2fadbf 100644 --- a/src/core/varlink-unit.c +++ b/src/core/varlink-unit.c @@ -17,7 +17,6 @@ #include "strv.h" #include "unit.h" #include "varlink-cgroup.h" -#include "varlink-common.h" #include "varlink-execute.h" #include "varlink-unit.h" #include "varlink-util.h" diff --git a/src/coredump/coredump-backtrace.c b/src/coredump/coredump-backtrace.c index 4ee38341c3..0a2dec2313 100644 --- a/src/coredump/coredump-backtrace.c +++ b/src/coredump/coredump-backtrace.c @@ -10,8 +10,6 @@ #include "format-util.h" #include "journal-importer.h" #include "log.h" -#include "string-util.h" -#include "user-util.h" int coredump_backtrace(int argc, char *argv[]) { _cleanup_(journal_importer_cleanup) JournalImporter importer = JOURNAL_IMPORTER_INIT(STDIN_FILENO); diff --git a/src/coredump/coredump-context.c b/src/coredump/coredump-context.c index 3b13289e42..399de7f0d9 100644 --- a/src/coredump/coredump-context.c +++ b/src/coredump/coredump-context.c @@ -3,7 +3,6 @@ #include "sd-login.h" #include "sd-messages.h" -#include "coredump-config.h" #include "coredump-context.h" #include "coredump-util.h" #include "dirent-util.h" diff --git a/src/coredump/coredump-kernel-helper.c b/src/coredump/coredump-kernel-helper.c index 105b943faa..21e7936f3c 100644 --- a/src/coredump/coredump-kernel-helper.c +++ b/src/coredump/coredump-kernel-helper.c @@ -10,7 +10,6 @@ #include "coredump-util.h" #include "fd-util.h" #include "format-util.h" -#include "iovec-wrapper.h" #include "log.h" #include "signal-util.h" diff --git a/src/coredump/coredump-receive.c b/src/coredump/coredump-receive.c index c1d2df4a7d..949789b76f 100644 --- a/src/coredump/coredump-receive.c +++ b/src/coredump/coredump-receive.c @@ -8,7 +8,6 @@ #include "coredump-submit.h" #include "iovec-util.h" #include "iovec-wrapper.h" -#include "fd-util.h" #include "log.h" #include "socket-util.h" diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 967994df3e..7c924980d3 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -28,7 +28,6 @@ #include "extract-word.h" #include "fileio.h" #include "fs-util.h" -#include "fstab-util.h" #include "hexdecoct.h" #include "json-util.h" #include "libfido2-util.h" @@ -36,7 +35,6 @@ #include "log.h" #include "main-func.h" #include "memory-util.h" -#include "mount-util.h" #include "nulstr-util.h" #include "parse-util.h" #include "path-util.h" diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 4c24d38716..9c0ec390f1 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -29,7 +29,6 @@ #include "hostname-util.h" #include "image-policy.h" #include "kbd-util.h" -#include "label.h" #include "label-util.h" #include "libcrypt-util.h" #include "locale-setup.h" diff --git a/src/fundamental/iovec-util-fundamental.h b/src/fundamental/iovec-util-fundamental.h index ef193a0dec..fbdd76398d 100644 --- a/src/fundamental/iovec-util-fundamental.h +++ b/src/fundamental/iovec-util-fundamental.h @@ -5,7 +5,7 @@ #include #endif -#include "assert-fundamental.h" +#include "assert-fundamental.h" /* IWYU pragma: keep */ #include "macro-fundamental.h" #if SD_BOOT diff --git a/src/fundamental/sha1-fundamental.c b/src/fundamental/sha1-fundamental.c index b8d100ff6b..b2af1e9888 100644 --- a/src/fundamental/sha1-fundamental.c +++ b/src/fundamental/sha1-fundamental.c @@ -77,7 +77,7 @@ modified for use with systemd */ #if SD_BOOT -# include "efi-string.h" +# include "efi-string.h" /* IWYU pragma: keep */ #else # include #endif diff --git a/src/fundamental/sha256-fundamental.c b/src/fundamental/sha256-fundamental.c index bbf84ee9d6..463b4ccde7 100644 --- a/src/fundamental/sha256-fundamental.c +++ b/src/fundamental/sha256-fundamental.c @@ -22,7 +22,7 @@ . */ #if SD_BOOT -# include "efi-string.h" +# include "efi-string.h" /* IWYU pragma: keep */ #else # include #endif diff --git a/src/fundamental/string-util-fundamental.h b/src/fundamental/string-util-fundamental.h index 98fcc0881f..2aa8d43bf9 100644 --- a/src/fundamental/string-util-fundamental.h +++ b/src/fundamental/string-util-fundamental.h @@ -8,7 +8,7 @@ # include #endif -#include "assert-fundamental.h" +#include "assert-fundamental.h" /* IWYU pragma: keep */ #include "macro-fundamental.h" /* What is interpreted as whitespace? */ diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index 05b58f7976..c01e5eafe2 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "sd-daemon.h" #include "sd-event.h" diff --git a/src/include/override/linux/sctp.h b/src/include/override/linux/sctp.h new file mode 100644 index 0000000000..8f4a558a5b --- /dev/null +++ b/src/include/override/linux/sctp.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +#pragma once + +/* The kernel header depends on being included. */ + +#include +#include_next /* IWYU pragma: export */ diff --git a/src/include/override/sched.h b/src/include/override/sched.h index 1810f52e3d..ce40c009b4 100644 --- a/src/include/override/sched.h +++ b/src/include/override/sched.h @@ -4,7 +4,8 @@ /* sched.h includes linux/sched/types.h since glibc-2.41 (21571ca0d70302909cf72707b2a7736cf12190a0), * to make struct sched_attr being defined. * Note, this must be included before sched.h, otherwise the headers conflict with each other. */ -#include +#include /* IWYU pragma: export */ +#include /* IWYU pragma: export */ #include_next /* IWYU pragma: export */ diff --git a/src/libsystemd-network/sd-dns-resolver.c b/src/libsystemd-network/sd-dns-resolver.c index f2283f0047..c8c6618c72 100644 --- a/src/libsystemd-network/sd-dns-resolver.c +++ b/src/libsystemd-network/sd-dns-resolver.c @@ -6,8 +6,6 @@ #include "errno-util.h" #include "siphash24.h" #include "socket-netlink.h" -#include "stdio-util.h" -#include "string-table.h" #include "string-util.h" #include "strv.h" #include "unaligned.h" diff --git a/src/libsystemd/sd-journal/audit-type.c b/src/libsystemd/sd-journal/audit-type.c index 097f725e87..a304ce8c4b 100644 --- a/src/libsystemd/sd-journal/audit-type.c +++ b/src/libsystemd/sd-journal/audit-type.c @@ -1,7 +1,3 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - -#include "audit-type.h" - #include "audit_type-to-name.inc" diff --git a/src/libsystemd/sd-journal/audit-type.h b/src/libsystemd/sd-journal/audit-type.h index f9ed66fdf8..dd74102049 100644 --- a/src/libsystemd/sd-journal/audit-type.h +++ b/src/libsystemd/sd-journal/audit-type.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include +#include /* IWYU pragma: keep */ #include "sd-forward.h" diff --git a/src/libsystemd/sd-journal/audit_type-to-name.awk b/src/libsystemd/sd-journal/audit_type-to-name.awk index a859c44d45..5dbba45af1 100644 --- a/src/libsystemd/sd-journal/audit_type-to-name.awk +++ b/src/libsystemd/sd-journal/audit_type-to-name.awk @@ -1,6 +1,9 @@ # SPDX-License-Identifier: LGPL-2.1-or-later BEGIN{ + print "#include " + print "" + print "#include \"audit-type.h\"" print "const char *audit_type_to_string(int type) {" print " switch (type) {" } diff --git a/src/libsystemd/sd-journal/journal-send.h b/src/libsystemd/sd-journal/journal-send.h index e5394e9471..7738efd395 100644 --- a/src/libsystemd/sd-journal/journal-send.h +++ b/src/libsystemd/sd-journal/journal-send.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "syslog-util.h" +#include "syslog-util.h" /* IWYU pragma: keep */ int journal_fd_nonblock(bool nonblock); void close_journal_fd(void); diff --git a/src/libsystemd/sd-journal/test-journal-stream.c b/src/libsystemd/sd-journal/test-journal-stream.c index 512ec132ef..efd4eb0a63 100644 --- a/src/libsystemd/sd-journal/test-journal-stream.c +++ b/src/libsystemd/sd-journal/test-journal-stream.c @@ -10,7 +10,6 @@ #include "iovec-util.h" #include "journal-file-util.h" #include "journal-internal.h" -#include "log.h" #include "parse-util.h" #include "rm-rf.h" #include "tests.h" diff --git a/src/libsystemd/sd-json/json-util.h b/src/libsystemd/sd-json/json-util.h index f4b9b4e7e1..753eb30f65 100644 --- a/src/libsystemd/sd-json/json-util.h +++ b/src/libsystemd/sd-json/json-util.h @@ -7,7 +7,7 @@ #include "sd-forward.h" #include "log.h" -#include "string-util.h" +#include "string-util.h" /* IWYU pragma: keep */ #define JSON_VARIANT_REPLACE(v, q) \ do { \ diff --git a/src/libsystemd/sd-netlink/netlink-types-nfnl.c b/src/libsystemd/sd-netlink/netlink-types-nfnl.c index 289040935b..3520961aed 100644 --- a/src/libsystemd/sd-netlink/netlink-types-nfnl.c +++ b/src/libsystemd/sd-netlink/netlink-types-nfnl.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include /* IWYU pragma: keep */ #include "netlink-types-internal.h" diff --git a/src/machine/machined-resolve-hook.c b/src/machine/machined-resolve-hook.c index c0bd5fda28..d022edc169 100644 --- a/src/machine/machined-resolve-hook.c +++ b/src/machine/machined-resolve-hook.c @@ -2,13 +2,13 @@ #include "sd-json.h" +#include "alloc-util.h" #include "dns-answer.h" #include "dns-domain.h" #include "dns-packet.h" #include "dns-question.h" #include "dns-rr.h" #include "hashmap.h" -#include "json-util.h" #include "local-addresses.h" #include "log.h" #include "machine.h" diff --git a/src/mountfsd/mountfsd-manager.c b/src/mountfsd/mountfsd-manager.c index bebf4104f6..5714f7c8c5 100644 --- a/src/mountfsd/mountfsd-manager.c +++ b/src/mountfsd/mountfsd-manager.c @@ -19,7 +19,6 @@ #include "set.h" #include "signal-util.h" #include "socket-util.h" -#include "stdio-util.h" #include "string-util.h" #include "time-util.h" #include "umask-util.h" diff --git a/src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h b/src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h index 7d664896c9..e1ebc3e509 100644 --- a/src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h +++ b/src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h @@ -7,11 +7,11 @@ * fine given that LGPL-2.1-or-later downgrades to GPL if needed. */ -#include "bpf-dlopen.h" +#include "bpf-dlopen.h" /* IWYU pragma: keep */ /* libbpf is used via dlopen(), so rename symbols */ #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__open_skeleton sym_bpf_object__open_skeleton -#include "bpf/sysctl-monitor/sysctl-monitor.skel.h" +#include "bpf/sysctl-monitor/sysctl-monitor.skel.h" /* IWYU pragma: export */ diff --git a/src/network/networkd-resolve-hook.c b/src/network/networkd-resolve-hook.c index 3abe8262e2..bac5cd5cfe 100644 --- a/src/network/networkd-resolve-hook.c +++ b/src/network/networkd-resolve-hook.c @@ -11,7 +11,6 @@ #include "dns-packet.h" #include "dns-question.h" #include "dns-rr.h" -#include "env-util.h" #include "errno-util.h" #include "fd-util.h" #include "networkd-link.h" diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c index 8131658829..f1a77dad00 100644 --- a/src/network/networkd-sysctl.c +++ b/src/network/networkd-sysctl.c @@ -5,6 +5,7 @@ #include "sd-messages.h" #include "af-list.h" +#include "bpf-dlopen.h" #include "conf-parser.h" #include "alloc-util.h" #include "cgroup-util.h" diff --git a/src/network/test-network.c b/src/network/test-network.c index 3831ee9e76..89435c609b 100644 --- a/src/network/test-network.c +++ b/src/network/test-network.c @@ -9,7 +9,6 @@ #include "network-internal.h" #include "networkd-manager.h" #include "networkd-route-util.h" -#include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c index b1a6e41cfb..70bea70c0b 100644 --- a/src/nspawn/nspawn-oci.c +++ b/src/nspawn/nspawn-oci.c @@ -13,7 +13,6 @@ #include "cpu-set-util.h" #include "device-util.h" #include "devnum-util.h" -#include "env-util.h" #include "hostname-util.h" #include "json-util.h" #include "nspawn-mount.h" diff --git a/src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h b/src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h index ef158e962b..7ed12dea95 100644 --- a/src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h +++ b/src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h @@ -7,7 +7,7 @@ * fine given that LGPL-2.1-or-later downgrades to GPL if needed. */ -#include "bpf-dlopen.h" +#include "bpf-dlopen.h" /* IWYU pragma: keep */ /* libbpf is used via dlopen(), so rename symbols */ #define bpf_object__attach_skeleton sym_bpf_object__attach_skeleton @@ -15,4 +15,4 @@ #define bpf_object__load_skeleton sym_bpf_object__load_skeleton #define bpf_object__open_skeleton sym_bpf_object__open_skeleton -#include "bpf/userns-restrict/userns-restrict.skel.h" +#include "bpf/userns-restrict/userns-restrict.skel.h" /* IWYU pragma: export */ diff --git a/src/nsresourced/nsresourced-manager.c b/src/nsresourced/nsresourced-manager.c index 96e63cdea1..5aa429a088 100644 --- a/src/nsresourced/nsresourced-manager.c +++ b/src/nsresourced/nsresourced-manager.c @@ -8,6 +8,7 @@ #include "bpf-dlopen.h" #if HAVE_VMLINUX_H #include "bpf-link.h" +#include "bpf/userns-restrict/userns-restrict-skel.h" #endif #include "build-path.h" #include "common-signal.h" @@ -26,7 +27,6 @@ #include "set.h" #include "signal-util.h" #include "socket-util.h" -#include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "time-util.h" diff --git a/src/nsresourced/userns-restrict.c b/src/nsresourced/userns-restrict.c index 4c2ee6f20f..c2119035bd 100644 --- a/src/nsresourced/userns-restrict.c +++ b/src/nsresourced/userns-restrict.c @@ -2,6 +2,10 @@ #include +#if HAVE_VMLINUX_H +#include "bpf/userns-restrict/userns-restrict-skel.h" +#endif + #include "bpf-dlopen.h" #include "bpf-link.h" #include "fd-util.h" diff --git a/src/nsresourced/userns-restrict.h b/src/nsresourced/userns-restrict.h index 0246b4600e..21a81feaff 100644 --- a/src/nsresourced/userns-restrict.h +++ b/src/nsresourced/userns-restrict.h @@ -3,11 +3,7 @@ #include "shared-forward.h" -#if HAVE_VMLINUX_H -#include "bpf/userns-restrict/userns-restrict-skel.h" -#else struct userns_restrict_bpf; -#endif int userns_restrict_install(bool pin, struct userns_restrict_bpf **ret); struct userns_restrict_bpf *userns_restrict_bpf_free(struct userns_restrict_bpf *obj); diff --git a/src/oom/test-oomd-util.c b/src/oom/test-oomd-util.c index 7e68525ba0..7ea69c0c4b 100644 --- a/src/oom/test-oomd-util.c +++ b/src/oom/test-oomd-util.c @@ -6,6 +6,7 @@ #include "alloc-util.h" #include "cgroup-setup.h" #include "cgroup-util.h" +#include "errno-util.h" #include "fd-util.h" #include "fileio.h" #include "oomd-util.h" diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c index 4f8f725864..5cff12b3a5 100644 --- a/src/remount-fs/remount-fs.c +++ b/src/remount-fs/remount-fs.c @@ -14,7 +14,6 @@ #include "log.h" #include "main-func.h" #include "mount-setup.h" -#include "mount-util.h" #include "path-util.h" #include "process-util.h" #include "signal-util.h" diff --git a/src/resolve/resolved-dns-delegate-bus.c b/src/resolve/resolved-dns-delegate-bus.c index c1ea2d1ebb..75c0b9d8b9 100644 --- a/src/resolve/resolved-dns-delegate-bus.c +++ b/src/resolve/resolved-dns-delegate-bus.c @@ -10,7 +10,7 @@ #include "resolved-dns-delegate.h" #include "resolved-dns-delegate-bus.h" #include "resolved-dns-search-domain.h" -#include "resolved-dns-server.h" +#include "resolved-dns-server.h" /* IWYU pragma: keep */ #include "resolved-manager.h" #include "strv.h" diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c index d0b5d7340d..5052bb531e 100644 --- a/src/resolve/resolved-resolv-conf.c +++ b/src/resolve/resolved-resolv-conf.c @@ -1,13 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include /* IWYU pragma: keep */ #include #include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "label-util.h" #include "log.h" #include "ordered-set.h" #include "path-util.h" diff --git a/src/resolve/test-resolved-stream.c b/src/resolve/test-resolved-stream.c index a952239d53..36c3c1ac31 100644 --- a/src/resolve/test-resolved-stream.c +++ b/src/resolve/test-resolved-stream.c @@ -16,6 +16,7 @@ #include "dns-packet.h" #include "dns-question.h" #include "dns-rr.h" +#include "errno-util.h" #include "fd-util.h" #include "log.h" #include "path-util.h" diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c index 1dff9646cc..bcac9a9bb8 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include "acl-util.h" #include "alloc-util.h" #include "errno-util.h" #include "extract-word.h" #include "fd-util.h" -#include "log.h" #include "string-util.h" #include "strv.h" #include "user-util.h" diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c index 74a03817bd..22e7d2d90d 100644 --- a/src/shared/apparmor-util.c +++ b/src/shared/apparmor-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#if HAVE_APPARMOR + #include #include "alloc-util.h" @@ -8,7 +10,6 @@ #include "log.h" #include "parse-util.h" -#if HAVE_APPARMOR static void *libapparmor_dl = NULL; DLSYM_PROTOTYPE(aa_change_onexec) = NULL; diff --git a/src/shared/blkid-util.c b/src/shared/blkid-util.c index 60f1332c26..ae20b47d9e 100644 --- a/src/shared/blkid-util.c +++ b/src/shared/blkid-util.c @@ -1,9 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "sd-id128.h" #include "blkid-util.h" -#include "log.h" #include "parse-util.h" #include "string-util.h" diff --git a/src/shared/bus-get-properties.h b/src/shared/bus-get-properties.h index b3d77867a7..23d68bd635 100644 --- a/src/shared/bus-get-properties.h +++ b/src/shared/bus-get-properties.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-bus.h" +#include "sd-bus.h" /* IWYU pragma: keep */ #include "shared-forward.h" diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c index ed8e202a2e..0f644d444a 100644 --- a/src/shared/calendarspec.c +++ b/src/shared/calendarspec.c @@ -2,7 +2,6 @@ #include #include -#include #include #include "alloc-util.h" @@ -11,7 +10,6 @@ #include "log.h" #include "memstream-util.h" #include "parse-util.h" -#include "process-util.h" #include "sort-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/shared/copy.c b/src/shared/copy.c index 7748d2cc53..f88d1617b1 100644 --- a/src/shared/copy.c +++ b/src/shared/copy.c @@ -27,7 +27,6 @@ #include "path-util.h" #include "rm-rf.h" #include "selinux-util.h" -#include "set.h" #include "signal-util.h" #include "stat-util.h" #include "stdio-util.h" diff --git a/src/shared/coredump-util.c b/src/shared/coredump-util.c index 37dfb2c91a..d979de1776 100644 --- a/src/shared/coredump-util.c +++ b/src/shared/coredump-util.c @@ -13,7 +13,7 @@ #include "stdio-util.h" #include "string-table.h" #include "string-util.h" -#include "unaligned.h" +#include "unaligned.h" /* IWYU pragma: keep */ #include "virt.h" int set_dumpable(SuidDumpMode mode) { diff --git a/src/shared/discover-image.c b/src/shared/discover-image.c index 3ed9958d72..4e26b287c2 100644 --- a/src/shared/discover-image.c +++ b/src/shared/discover-image.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include "sd-json.h" @@ -32,11 +31,9 @@ #include "hashmap.h" #include "hostname-setup.h" #include "id128-util.h" -#include "initrd-util.h" #include "lock-util.h" #include "log.h" #include "loop-util.h" -#include "mkdir.h" #include "namespace-util.h" #include "nsresource.h" #include "nulstr-util.h" diff --git a/src/shared/dns-rr.c b/src/shared/dns-rr.c index 515ab67b06..a9f66927f9 100644 --- a/src/shared/dns-rr.c +++ b/src/shared/dns-rr.c @@ -4,7 +4,7 @@ #include "alloc-util.h" #include "bitmap.h" -#include "dns-answer.h" +#include "dns-answer.h" /* IWYU pragma: keep */ #include "dns-domain.h" #include "dns-packet.h" #include "dns-rr.h" diff --git a/src/shared/efi-api.c b/src/shared/efi-api.c index ad9cbab74e..8a3a40cbec 100644 --- a/src/shared/efi-api.c +++ b/src/shared/efi-api.c @@ -15,7 +15,7 @@ #include "stat-util.h" #include "stdio-util.h" #include "string-util.h" -#include "tpm2-util.h" +#include "tpm2-util.h" /* IWYU pragma: keep */ #include "utf8.h" #define EFI_TCG2_BOOT_HASH_ALG_SHA1 0x01 diff --git a/src/shared/idn-util.c b/src/shared/idn-util.c index 6613023754..47f0bd5288 100644 --- a/src/shared/idn-util.c +++ b/src/shared/idn-util.c @@ -9,7 +9,7 @@ #include "dlfcn-util.h" #include "idn-util.h" -#include "log.h" +#include "log.h" /* IWYU pragma: keep */ #if HAVE_LIBIDN || HAVE_LIBIDN2 static void* idn_dl = NULL; diff --git a/src/shared/libarchive-util.c b/src/shared/libarchive-util.c index 35083a266f..d2714bd81c 100644 --- a/src/shared/libarchive-util.c +++ b/src/shared/libarchive-util.c @@ -3,7 +3,7 @@ #include #include "libarchive-util.h" -#include "user-util.h" +#include "user-util.h" /* IWYU pragma: keep */ #if HAVE_LIBARCHIVE static void *libarchive_dl = NULL; diff --git a/src/shared/libcrypt-util.c b/src/shared/libcrypt-util.c index 42c6feaabe..594963ac6b 100644 --- a/src/shared/libcrypt-util.c +++ b/src/shared/libcrypt-util.c @@ -7,7 +7,7 @@ #include "errno-util.h" #include "libcrypt-util.h" #include "log.h" -#include "random-util.h" +#include "random-util.h" /* IWYU pragma: keep */ #include "string-util.h" #include "strv.h" diff --git a/src/shared/main-func.h b/src/shared/main-func.h index 95a2ccbf18..db8c3fe67d 100644 --- a/src/shared/main-func.h +++ b/src/shared/main-func.h @@ -2,7 +2,7 @@ #pragma once #include "shared-forward.h" -#include "static-destruct.h" +#include "static-destruct.h" /* IWYU pragma: keep */ void main_prepare(int argc, char *argv[]); diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c index 71ecdffaa2..36473b1066 100644 --- a/src/shared/mkdir-label.c +++ b/src/shared/mkdir-label.c @@ -3,7 +3,7 @@ #include #include "errno-util.h" -#include "label-util.h" +#include "label-util.h" /* IWYU pragma: keep */ #include "mkdir-label.h" #include "selinux-util.h" #include "smack-util.h" diff --git a/src/shared/password-quality-util-passwdqc.c b/src/shared/password-quality-util-passwdqc.c index a161f5c8b0..c24c763967 100644 --- a/src/shared/password-quality-util-passwdqc.c +++ b/src/shared/password-quality-util-passwdqc.c @@ -1,15 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "password-quality-util-passwdqc.h" + +#if HAVE_PASSWDQC + +#include + #include "alloc-util.h" #include "dlfcn-util.h" #include "errno-util.h" #include "log.h" #include "memory-util.h" -#include "password-quality-util-passwdqc.h" #include "strv.h" -#if HAVE_PASSWDQC - static void *passwdqc_dl = NULL; DLSYM_PROTOTYPE(passwdqc_params_reset) = NULL; diff --git a/src/shared/password-quality-util-passwdqc.h b/src/shared/password-quality-util-passwdqc.h index 7e94df4318..e813829b63 100644 --- a/src/shared/password-quality-util-passwdqc.h +++ b/src/shared/password-quality-util-passwdqc.h @@ -4,8 +4,6 @@ #include "shared-forward.h" #if HAVE_PASSWDQC -#include - int suggest_passwords(void); int check_password_quality(const char *password, const char *old, const char *username, char **ret_error); #endif diff --git a/src/shared/password-quality-util-pwquality.c b/src/shared/password-quality-util-pwquality.c index dfb618a4ba..33cd162271 100644 --- a/src/shared/password-quality-util-pwquality.c +++ b/src/shared/password-quality-util-pwquality.c @@ -1,5 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "password-quality-util-pwquality.h" + +#if HAVE_PWQUALITY + +#include #include #include @@ -8,12 +13,9 @@ #include "errno-util.h" #include "log.h" #include "password-quality-util.h" -#include "password-quality-util-pwquality.h" #include "string-util.h" #include "strv.h" -#if HAVE_PWQUALITY - static void *pwquality_dl = NULL; DLSYM_PROTOTYPE(pwquality_check) = NULL; diff --git a/src/shared/password-quality-util-pwquality.h b/src/shared/password-quality-util-pwquality.h index aaede45c2f..829025a10d 100644 --- a/src/shared/password-quality-util-pwquality.h +++ b/src/shared/password-quality-util-pwquality.h @@ -4,8 +4,6 @@ #include "shared-forward.h" #if HAVE_PWQUALITY -#include - int suggest_passwords(void); int check_password_quality(const char *password, const char *old, const char *username, char **ret_error); #endif diff --git a/src/shared/reread-partition-table.c b/src/shared/reread-partition-table.c index d95e2864c4..70adf36db2 100644 --- a/src/shared/reread-partition-table.c +++ b/src/shared/reread-partition-table.c @@ -14,7 +14,6 @@ #include "errno-util.h" #include "fd-util.h" #include "log.h" -#include "parse-util.h" #include "reread-partition-table.h" #include "set.h" #include "string-util.h" diff --git a/src/shared/securebits-util.c b/src/shared/securebits-util.c index 783953aa60..bd682e6cbe 100644 --- a/src/shared/securebits-util.c +++ b/src/shared/securebits-util.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" #include "extract-word.h" #include "securebits-util.h" diff --git a/src/shared/tests.c b/src/shared/tests.c index 442fe83045..7aa27a88b6 100644 --- a/src/shared/tests.c +++ b/src/shared/tests.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include diff --git a/src/shared/tests.h b/src/shared/tests.h index 31b722829d..885460d6fe 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -4,14 +4,13 @@ #include #include "errno-list.h" -#include "errno-util.h" #include "shared-forward.h" #include "log.h" #include "log-assert-critical.h" -#include "static-destruct.h" -#include "signal-util.h" +#include "static-destruct.h" /* IWYU pragma: keep*/ +#include "signal-util.h" /* IWYU pragma: keep*/ #include "stdio-util.h" -#include "string-util.h" +#include "string-util.h" /* IWYU pragma: keep */ static inline void log_set_assert_return_is_criticalp(bool *p) { log_set_assert_return_is_critical(*p); diff --git a/src/shared/tpm2-event-log.h b/src/shared/tpm2-event-log.h index 50a8584c6e..a357016149 100644 --- a/src/shared/tpm2-event-log.h +++ b/src/shared/tpm2-event-log.h @@ -2,7 +2,7 @@ #pragma once #include "shared-forward.h" -#include "tpm2-util.h" +#include "tpm2-util.h" /* IWYU pragma: keep */ /* Definitions as per "TCG PC Client Specific Platform Firmware Profile Specification" * (https://trustedcomputinggroup.org/resource/pc-client-specific-platform-firmware-profile-specification/), diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c index f185c5ab8b..e51c789a3e 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c @@ -6,7 +6,6 @@ #include "alloc-util.h" #include "ansi-color.h" #include "bitfield.h" -#include "bootspec.h" #include "boot-entry.h" #include "constants.h" #include "creds-util.h" @@ -14,7 +13,6 @@ #include "dirent-util.h" #include "dlfcn-util.h" #include "efi-api.h" -#include "errno-util.h" #include "extract-word.h" #include "fd-util.h" #include "fileio.h" @@ -42,7 +40,6 @@ #include "sync-util.h" #include "time-util.h" #include "tpm2-pcr.h" -#include "tmpfile-util.h" #include "tpm2-util.h" #include "virt.h" diff --git a/src/shared/varlink-io.systemd.Unit.c b/src/shared/varlink-io.systemd.Unit.c index b93112479a..390e1b414b 100644 --- a/src/shared/varlink-io.systemd.Unit.c +++ b/src/shared/varlink-io.systemd.Unit.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "build.h" #include "varlink-idl-common.h" -#include "varlink-io.systemd.Unit.h" /* CGroupContext */ static SD_VARLINK_DEFINE_STRUCT_TYPE( diff --git a/src/shutdown/detach-md.c b/src/shutdown/detach-md.c index d65a876e39..7fd39d67c8 100644 --- a/src/shutdown/detach-md.c +++ b/src/shutdown/detach-md.c @@ -3,7 +3,7 @@ Copyright © 2010 ProFUSION embedded systems ***/ -#include +#include /* IWYU pragma: keep */ #include #include diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c index 97ae7d119c..25882970ef 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -26,7 +26,6 @@ #include "detach-swap.h" #include "errno-util.h" #include "exec-util.h" -#include "extract-word.h" #include "fd-util.h" #include "fileio.h" #include "format-util.h" @@ -44,7 +43,6 @@ #include "signal-util.h" #include "string-util.h" #include "switch-root.h" -#include "sysctl-util.h" #include "terminal-util.h" #include "time-util.h" #include "umount.h" diff --git a/src/ssh-generator/ssh-issue.c b/src/ssh-generator/ssh-issue.c index 61ac5c0240..852dabdb85 100644 --- a/src/ssh-generator/ssh-issue.c +++ b/src/ssh-generator/ssh-issue.c @@ -7,7 +7,6 @@ #include "alloc-util.h" #include "ansi-color.h" #include "build.h" -#include "errno-util.h" #include "fd-util.h" #include "fs-util.h" #include "log.h" diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c index d761c7375a..bc70509cab 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -10,8 +10,6 @@ #include "constants.h" #include "creds-util.h" #include "errno-util.h" -#include "fd-util.h" -#include "fileio.h" #include "glob-util.h" #include "hashmap.h" #include "log.h" diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index cb21a16fce..d9c89eef74 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -32,7 +32,7 @@ #include "hashmap.h" #include "image-policy.h" #include "initrd-util.h" -#include "label-util.h" +#include "label-util.h" /* IWYU pragma: keep */ #include "log.h" #include "loop-util.h" #include "main-func.h" diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index 97137ef170..245ffdde09 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -17,7 +17,6 @@ #include "errno-util.h" #include "exec-util.h" #include "exit-status.h" -#include "extract-word.h" #include "format-util.h" #include "hexdecoct.h" #include "hostname-setup.h" diff --git a/src/test/test-capability-list.c b/src/test/test-capability-list.c index 9996196426..d7fd7425b2 100644 --- a/src/test/test-capability-list.c +++ b/src/test/test-capability-list.c @@ -5,7 +5,6 @@ #include "alloc-util.h" #include "capability-list.h" #include "capability-util.h" -#include "parse-util.h" #include "random-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-chown-rec.c b/src/test/test-chown-rec.c index 4b3a6f5247..faeb1e1428 100644 --- a/src/test/test-chown-rec.c +++ b/src/test/test-chown-rec.c @@ -5,6 +5,7 @@ #include #include "chown-recursive.h" +#include "errno-util.h" #include "rm-rf.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-clock.c b/src/test/test-clock.c index f31b361324..72b99a9054 100644 --- a/src/test/test-clock.c +++ b/src/test/test-clock.c @@ -6,6 +6,7 @@ #include #include "clock-util.h" +#include "errno-util.h" #include "fd-util.h" #include "fileio.h" #include "log.h" diff --git a/src/test/test-copy.c b/src/test/test-copy.c index 58797b5926..e1bb7ae049 100644 --- a/src/test/test-copy.c +++ b/src/test/test-copy.c @@ -10,6 +10,7 @@ #include "argv-util.h" #include "chase.h" #include "copy.h" +#include "errno-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" diff --git a/src/test/test-dirent-util.c b/src/test/test-dirent-util.c index 48987703f0..5067cffcb3 100644 --- a/src/test/test-dirent-util.c +++ b/src/test/test-dirent-util.c @@ -7,6 +7,7 @@ #include #include "dirent-util.h" +#include "errno-util.h" #include "fs-util.h" #include "rm-rf.h" #include "string-util.h" diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c index e5258de812..b07b123565 100644 --- a/src/test/test-exec-util.c +++ b/src/test/test-exec-util.c @@ -7,6 +7,7 @@ #include "alloc-util.h" #include "constants.h" #include "env-util.h" +#include "errno-util.h" #include "exec-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/test/test-lock-util.c b/src/test/test-lock-util.c index b68086e3ae..8283f01ff2 100644 --- a/src/test/test-lock-util.c +++ b/src/test/test-lock-util.c @@ -3,6 +3,7 @@ #include #include +#include "errno-util.h" #include "fd-util.h" #include "lock-util.h" #include "rm-rf.h" diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c index 40ebf7e744..5d352a7df0 100644 --- a/src/test/test-mount-util.c +++ b/src/test/test-mount-util.c @@ -7,6 +7,7 @@ #include "alloc-util.h" #include "capability-util.h" +#include "errno-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c index 1da10e9ccc..04426365f8 100644 --- a/src/test/test-mountpoint-util.c +++ b/src/test/test-mountpoint-util.c @@ -6,6 +6,7 @@ #include #include "alloc-util.h" +#include "errno-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" diff --git a/src/test/test-nsresource.c b/src/test/test-nsresource.c index 804b63f8ee..aacd776d7f 100644 --- a/src/test/test-nsresource.c +++ b/src/test/test-nsresource.c @@ -2,6 +2,7 @@ #include +#include "errno-util.h" #include "fd-util.h" #include "namespace-util.h" #include "nsresource.h" diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 2251cd4fff..e1a43b8b64 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -6,6 +6,7 @@ #include "alloc-util.h" #include "argv-util.h" +#include "errno-util.h" #include "exec-util.h" #include "fd-util.h" #include "path-util.h" diff --git a/src/test/test-reread-partition-table.c b/src/test/test-reread-partition-table.c index 769d2a8d2f..c56e44d8ef 100644 --- a/src/test/test-reread-partition-table.c +++ b/src/test/test-reread-partition-table.c @@ -5,6 +5,7 @@ #include "blockdev-util.h" #include "capability-util.h" +#include "errno-util.h" #include "fd-util.h" #include "loop-util.h" #include "memfd-util.h" diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c index bd66722456..ac1d5de310 100644 --- a/src/test/test-serialize.c +++ b/src/test/test-serialize.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "extract-word.h" +#include "extract-word.h" /* IWYU pragma: keep */ #include "fd-util.h" #include "fileio.h" #include "log.h" diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c index cbaa29d5a9..86a93c487f 100644 --- a/src/test/test-stat-util.c +++ b/src/test/test-stat-util.c @@ -8,6 +8,7 @@ #include "alloc-util.h" #include "errno-list.h" +#include "errno-util.h" #include "fd-util.h" #include "fs-util.h" #include "mount-util.h" diff --git a/src/test/test-tables.c b/src/test/test-tables.c index 95ceb0e5ae..a70e5b342d 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -30,7 +30,6 @@ #include "show-status.h" #include "socket.h" #include "socket-label.h" -#include "socket-util.h" #include "swap.h" #include "test-tables.h" #include "tests.h" diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c index 358d578ccb..3ec8d0caff 100644 --- a/src/test/test-terminal-util.c +++ b/src/test/test-terminal-util.c @@ -9,6 +9,7 @@ #include "alloc-util.h" #include "ansi-color.h" +#include "errno-util.h" #include "fd-util.h" #include "path-util.h" #include "process-util.h" diff --git a/src/test/test-tests.c b/src/test/test-tests.c index 9a80f8e767..6f9fe04870 100644 --- a/src/test/test-tests.c +++ b/src/test/test-tests.c @@ -5,6 +5,7 @@ #include "sd-id128.h" +#include "errno-util.h" #include "tests.h" TEST(ASSERT) { diff --git a/src/test/test-varlink-idl.c b/src/test/test-varlink-idl.c index e3fe38f6ca..20e1c689db 100644 --- a/src/test/test-varlink-idl.c +++ b/src/test/test-varlink-idl.c @@ -8,8 +8,8 @@ #include "sd-varlink-idl.h" #include "bootspec.h" -#include "dissect-image.h" #include "fd-util.h" +#include "gpt.h" #include "json-util.h" #include "network-util.h" #include "pretty-print.h" diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c index 1c8667ec02..eeb0d8a8af 100644 --- a/src/test/test-xattr-util.c +++ b/src/test/test-xattr-util.c @@ -5,6 +5,7 @@ #include #include "alloc-util.h" +#include "errno-util.h" #include "fd-util.h" #include "fs-util.h" #include "nulstr-util.h" diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 0e8e705a50..b2d6c0718c 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -16,7 +16,6 @@ #include "bus-print-properties.h" #include "bus-util.h" #include "constants.h" -#include "env-util.h" #include "format-table.h" #include "in-addr-util.h" #include "log.h" diff --git a/src/tpm2-setup/tpm2-setup.c b/src/tpm2-setup/tpm2-setup.c index ac1b91909e..d33a41b893 100644 --- a/src/tpm2-setup/tpm2-setup.c +++ b/src/tpm2-setup/tpm2-setup.c @@ -9,7 +9,6 @@ #include "build.h" #include "conf-files.h" #include "constants.h" -#include "creds-util.h" #include "errno-util.h" #include "fd-util.h" #include "fileio.h" @@ -20,12 +19,9 @@ #include "mkdir.h" #include "parse-util.h" #include "pretty-print.h" -#include "recurse-dir.h" #include "set.h" #include "string-util.h" #include "strv.h" -#include "terminal-util.h" -#include "time-util.h" #include "tmpfile-util.h" #include "tpm2-util.h" diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 543ad9be06..76369f6906 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -8,7 +8,7 @@ #include "alloc-util.h" #include "architecture.h" -#include "chase.h" +#include "chase.h" /* IWYU pragma: keep */ #include "conf-files.h" #include "conf-parser.h" #include "confidential-virt.h" diff --git a/src/udev/udevadm-util.c b/src/udev/udevadm-util.c index 5c6663b16e..48c04aca5a 100644 --- a/src/udev/udevadm-util.c +++ b/src/udev/udevadm-util.c @@ -15,7 +15,6 @@ #include "extract-word.h" #include "log.h" #include "path-util.h" -#include "stat-util.h" #include "string-table.h" #include "string-util.h" #include "strv.h" diff --git a/src/vpick/vpick-tool.c b/src/vpick/vpick-tool.c index 2ed0762de2..5f114b168b 100644 --- a/src/vpick/vpick-tool.c +++ b/src/vpick/vpick-tool.c @@ -15,7 +15,6 @@ #include "stat-util.h" #include "string-table.h" #include "string-util.h" -#include "strv.h" #include "vpick.h" typedef enum { From 6d57f584de9ef0efd755db533bf766a09816a9c8 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 20 May 2025 12:28:15 +0200 Subject: [PATCH 3/3] clang-tidy: Enable misc-include-cleaner check The previous commit fixes all remaining violations of the check for a very specific setup (Fedora Rawhide with as many dependencies as possible installed). The linter job in CI runs that specific setup so we enable the check in the clang-tidy config but do not yet enable the clang-tidy test suite in meson by default as it will very likely still fail in different setups than the one in CI. --- .clang-tidy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index 03d45185d9..fe0cab6c98 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -4,7 +4,8 @@ Checks: ' -*, misc-header-include-cycle, readability-duplicate-include, - bugprone-argument-comment + bugprone-argument-comment, + misc-include-cleaner ' CheckOptions: misc-include-cleaner.MissingIncludes: 'false'