From 3b7d3320477452111464c85387b43876f0030a4e Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 5 May 2025 16:03:20 +0200 Subject: [PATCH] macro: Reduce transitive includes --- src/basic/alloc-util.h | 23 +++++++++++++ src/basic/architecture.h | 1 + src/basic/arphrd-util.c | 1 + src/basic/assert-util.c | 1 + src/basic/capsule-util.c | 2 ++ src/basic/cgroup-util.h | 1 + src/basic/confidential-virt.h | 1 + src/basic/devnum-util.c | 1 + src/basic/devnum-util.h | 1 + src/basic/dirent-util.h | 1 + src/basic/env-util.h | 1 + src/basic/errno-list.c | 1 + src/basic/errno-util.h | 9 +++-- src/basic/fd-util.h | 1 + src/basic/hash-funcs.c | 1 + src/basic/hexdecoct.c | 1 + src/basic/ioprio-util.c | 3 ++ src/basic/iovec-wrapper.c | 3 ++ src/basic/label.c | 1 + src/basic/locale-util.h | 1 + src/basic/log.h | 2 ++ src/basic/macro.h | 45 ------------------------- src/basic/memory-util.h | 1 + src/basic/nulstr-util.h | 1 + src/basic/percent-util.h | 1 + src/basic/pidref.h | 1 + src/basic/ratelimit.c | 2 ++ src/basic/sha256.c | 1 + src/basic/sort-util.h | 1 + src/basic/static-destruct.h | 2 ++ src/basic/string-table.c | 2 ++ src/basic/string-util.h | 1 + src/basic/syslog-util.c | 1 + src/basic/time-util.h | 1 + src/boot/boot.c | 2 ++ src/boot/efi-string.c | 2 ++ src/boot/pe.c | 2 ++ src/boot/stub.c | 2 ++ src/core/kill.h | 1 + src/core/unit-dependency-atom.c | 1 + src/fundamental/macro-fundamental.h | 1 - src/import/import-compress.h | 2 ++ src/import/qcow2-util.c | 1 + src/libsystemd/sd-bus/bus-signature.c | 1 + src/libsystemd/sd-journal/journal-def.h | 2 ++ src/libsystemd/sd-json/json-util.c | 2 ++ src/libudev/libudev-device.c | 1 + src/libudev/libudev-enumerate.c | 1 + src/libudev/libudev-hwdb.c | 2 ++ src/libudev/libudev-queue.c | 1 + src/libudev/libudev.c | 1 + src/network/netdev/netdev-util.h | 2 ++ src/network/tc/tc-util.c | 1 + src/resolve/dns-type.h | 2 ++ src/shared/apparmor-util.h | 1 + src/shared/blkid-util.c | 2 ++ src/shared/bond-util.h | 1 + src/shared/bus-locator.c | 1 + src/shared/color-util.c | 1 + src/shared/condition.h | 1 + src/shared/copy.c | 1 + src/shared/coredump-util.h | 3 ++ src/shared/dev-setup.c | 1 + src/shared/idn-util.h | 1 + src/shared/import-util.h | 1 + src/shared/ipvlan-util.h | 1 + src/shared/libarchive-util.h | 2 ++ src/shared/libfido2-util.h | 2 ++ src/shared/open-file.h | 2 ++ src/shared/recovery-key.c | 2 ++ src/shared/selinux-util.h | 1 + src/shared/smbios11.c | 1 + src/test/test-dirent-util.c | 1 + src/test/test-fs-util.c | 1 + src/test/test-json.c | 1 + src/test/test-sizeof.c | 1 + 76 files changed, 128 insertions(+), 48 deletions(-) diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h index f82530bdc2..900e798b57 100644 --- a/src/basic/alloc-util.h +++ b/src/basic/alloc-util.h @@ -137,6 +137,29 @@ static inline void *memdup_suffix0_multiply(const void *p, size_t need, size_t s return memdup_suffix0(p, size * need); } +static inline size_t GREEDY_ALLOC_ROUND_UP(size_t l) { + size_t m; + + /* Round up allocation sizes a bit to some reasonable, likely larger value. This is supposed to be + * used for cases which are likely called in an allocation loop of some form, i.e. that repetitively + * grow stuff, for example strv_extend() and suchlike. + * + * Note the difference to GREEDY_REALLOC() here, as this helper operates on a single size value only, + * and rounds up to next multiple of 2, needing no further counter. + * + * Note the benefits of direct ALIGN_POWER2() usage: type-safety for size_t, sane handling for very + * small (i.e. <= 2) and safe handling for very large (i.e. > SSIZE_MAX) values. */ + + if (l <= 2) + return 2; /* Never allocate less than 2 of something. */ + + m = ALIGN_POWER2(l); + if (m == 0) /* overflow? */ + return l; + + return m; +} + void* greedy_realloc(void **p, size_t need, size_t size); void* greedy_realloc0(void **p, size_t need, size_t size); void* greedy_realloc_append(void **p, size_t *n_p, const void *from, size_t n_from, size_t size); diff --git a/src/basic/architecture.h b/src/basic/architecture.h index 26aa9f405e..4d06e5c3a4 100644 --- a/src/basic/architecture.h +++ b/src/basic/architecture.h @@ -2,6 +2,7 @@ #pragma once #include +#include #include "macro.h" diff --git a/src/basic/arphrd-util.c b/src/basic/arphrd-util.c index 540d7d984e..2aa48182fc 100644 --- a/src/basic/arphrd-util.c +++ b/src/basic/arphrd-util.c @@ -7,6 +7,7 @@ #include #include "arphrd-util.h" +#include "assert-util.h" #include "macro.h" static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); diff --git a/src/basic/assert-util.c b/src/basic/assert-util.c index f4cf97ad28..add9e92c52 100644 --- a/src/basic/assert-util.c +++ b/src/basic/assert-util.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "assert-util.h" diff --git a/src/basic/capsule-util.c b/src/basic/capsule-util.c index d2d6b19448..83fcf7afbc 100644 --- a/src/basic/capsule-util.c +++ b/src/basic/capsule-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "alloc-util.h" #include "capsule-util.h" #include "path-util.h" diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 949de7f9e2..8434a094a0 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -2,6 +2,7 @@ #pragma once #include +#include #include #include #include diff --git a/src/basic/confidential-virt.h b/src/basic/confidential-virt.h index 097bbf7cfe..bbab123102 100644 --- a/src/basic/confidential-virt.h +++ b/src/basic/confidential-virt.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include "errno-list.h" diff --git a/src/basic/devnum-util.c b/src/basic/devnum-util.c index ab4da865f2..7be34ca0ef 100644 --- a/src/basic/devnum-util.c +++ b/src/basic/devnum-util.c @@ -2,6 +2,7 @@ #include #include +#include #include "alloc-util.h" #include "chase.h" diff --git a/src/basic/devnum-util.h b/src/basic/devnum-util.h index 0efca56780..0e07df5e8c 100644 --- a/src/basic/devnum-util.h +++ b/src/basic/devnum-util.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "stdio-util.h" diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h index f3007b6bc3..4c8d96788b 100644 --- a/src/basic/dirent-util.h +++ b/src/basic/dirent-util.h @@ -5,6 +5,7 @@ #include #include +#include "assert-util.h" #include "macro.h" #include "path-util.h" diff --git a/src/basic/env-util.h b/src/basic/env-util.h index 52771ecc81..14f2e71823 100644 --- a/src/basic/env-util.h +++ b/src/basic/env-util.h @@ -6,6 +6,7 @@ #include #include +#include "assert-util.h" #include "macro.h" #include "string.h" diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c index 897f630307..677b906cc5 100644 --- a/src/basic/errno-list.c +++ b/src/basic/errno-list.c @@ -3,6 +3,7 @@ #include #include +#include "assert-util.h" #include "errno-list.h" #include "macro.h" diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h index e7dcad3b44..2a5a5abb8a 100644 --- a/src/basic/errno-util.h +++ b/src/basic/errno-util.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include @@ -42,6 +43,12 @@ static inline void _reset_errno_(int *saved_errno) { PROTECT_ERRNO; \ errno = ABS(value) +#define return_with_errno(r, err) \ + do { \ + errno = ABS(err); \ + return r; \ + } while (false) + static inline int negative_errno(void) { /* This helper should be used to shut up gcc if you know 'errno' is * negative. Instead of "return -errno;", use "return negative_errno();" @@ -103,8 +110,6 @@ static inline int errno_or_else(int fallback) { return ERRNO_IS_NEG_##name(-ABS(r)); \ } -assert_cc(INT_MAX <= INTMAX_MAX); - /* For send()/recv() or read()/write(). */ static inline bool ERRNO_IS_NEG_TRANSIENT(intmax_t r) { return IN_SET(r, diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h index 59c43e8140..82dd9d31e7 100644 --- a/src/basic/fd-util.h +++ b/src/basic/fd-util.h @@ -2,6 +2,7 @@ #pragma once #include +#include #include #include #include diff --git a/src/basic/hash-funcs.c b/src/basic/hash-funcs.c index b122c300b8..6540fa5dfc 100644 --- a/src/basic/hash-funcs.c +++ b/src/basic/hash-funcs.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include "hash-funcs.h" #include "path-util.h" diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c index 1d8e60330c..a08a4697ac 100644 --- a/src/basic/hexdecoct.c +++ b/src/basic/hexdecoct.c @@ -2,6 +2,7 @@ #include #include +#include #include #include diff --git a/src/basic/ioprio-util.c b/src/basic/ioprio-util.c index 3add1bddd0..49cd0f67e1 100644 --- a/src/basic/ioprio-util.c +++ b/src/basic/ioprio-util.c @@ -1,5 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + +#include "assert-util.h" #include "ioprio-util.h" #include "parse-util.h" #include "string-table.h" diff --git a/src/basic/iovec-wrapper.c b/src/basic/iovec-wrapper.c index 5cc3cc2f93..27b84d2cdb 100644 --- a/src/basic/iovec-wrapper.c +++ b/src/basic/iovec-wrapper.c @@ -1,5 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include +#include + #include "alloc-util.h" #include "iovec-util.h" #include "iovec-wrapper.h" diff --git a/src/basic/label.c b/src/basic/label.c index 6bae653188..b922fd2f19 100644 --- a/src/basic/label.c +++ b/src/basic/label.c @@ -3,6 +3,7 @@ #include #include +#include "assert-util.h" #include "label.h" #include "macro.h" diff --git a/src/basic/locale-util.h b/src/basic/locale-util.h index 81fe8d1084..da84799cf1 100644 --- a/src/basic/locale-util.h +++ b/src/basic/locale-util.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include #include diff --git a/src/basic/log.h b/src/basic/log.h index 845a458f3e..b0e8ef2989 100644 --- a/src/basic/log.h +++ b/src/basic/log.h @@ -1,12 +1,14 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include #include #include #include +#include "assert-util.h" #include "macro.h" /* Some structures we reference but don't want to pull in headers for */ diff --git a/src/basic/macro.h b/src/basic/macro.h index 9cee1868a5..9391fc5e88 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -1,13 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include -#include -#include -#include -#include -#include - #include "constants.h" #include "macro-fundamental.h" @@ -32,15 +25,6 @@ /* test harness */ #define EXIT_TEST_SKIP 77 -/* builtins */ -#if __SIZEOF_INT__ == 4 -#define BUILTIN_FFS_U32(x) __builtin_ffs(x); -#elif __SIZEOF_LONG__ == 4 -#define BUILTIN_FFS_U32(x) __builtin_ffsl(x); -#else -#error "neither int nor long are four bytes long?!?" -#endif - static inline uint64_t u64_multiply_safe(uint64_t a, uint64_t b) { if (_unlikely_(a != 0 && b > (UINT64_MAX / a))) return 0; /* overflow */ @@ -66,29 +50,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { return 1UL << (sizeof(u) * 8 - __builtin_clzl(u - 1UL)); } -static inline size_t GREEDY_ALLOC_ROUND_UP(size_t l) { - size_t m; - - /* Round up allocation sizes a bit to some reasonable, likely larger value. This is supposed to be - * used for cases which are likely called in an allocation loop of some form, i.e. that repetitively - * grow stuff, for example strv_extend() and suchlike. - * - * Note the difference to GREEDY_REALLOC() here, as this helper operates on a single size value only, - * and rounds up to next multiple of 2, needing no further counter. - * - * Note the benefits of direct ALIGN_POWER2() usage: type-safety for size_t, sane handling for very - * small (i.e. <= 2) and safe handling for very large (i.e. > SSIZE_MAX) values. */ - - if (l <= 2) - return 2; /* Never allocate less than 2 of something. */ - - m = ALIGN_POWER2(l); - if (m == 0) /* overflow? */ - return l; - - return m; -} - /* * container_of - cast a member of a structure out to the containing structure * @ptr: the pointer to the member. @@ -102,12 +63,6 @@ static inline size_t GREEDY_ALLOC_ROUND_UP(size_t l) { (type*)( (char *)UNIQ_T(A, uniq) - offsetof(type, member) ); \ }) -#define return_with_errno(r, err) \ - do { \ - errno = ABS(err); \ - return r; \ - } while (false) - #define PTR_TO_INT(p) ((int) ((intptr_t) (p))) #define INT_TO_PTR(u) ((void *) ((intptr_t) (u))) #define PTR_TO_UINT(p) ((unsigned) ((uintptr_t) (p))) diff --git a/src/basic/memory-util.h b/src/basic/memory-util.h index 443fc3a8ab..7a86cac5bc 100644 --- a/src/basic/memory-util.h +++ b/src/basic/memory-util.h @@ -2,6 +2,7 @@ #pragma once #include +#include #include #include #include diff --git a/src/basic/nulstr-util.h b/src/basic/nulstr-util.h index d6f2f58e9f..6a6c15a2e4 100644 --- a/src/basic/nulstr-util.h +++ b/src/basic/nulstr-util.h @@ -6,6 +6,7 @@ #include #include +#include "assert-util.h" #include "set.h" #define NULSTR_FOREACH(i, l) \ diff --git a/src/basic/percent-util.h b/src/basic/percent-util.h index e975d6e3e3..dd70d59dba 100644 --- a/src/basic/percent-util.h +++ b/src/basic/percent-util.h @@ -3,6 +3,7 @@ #include #include +#include #include "macro.h" diff --git a/src/basic/pidref.h b/src/basic/pidref.h index 59a4e39204..6084f9cf89 100644 --- a/src/basic/pidref.h +++ b/src/basic/pidref.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include "macro.h" diff --git a/src/basic/ratelimit.c b/src/basic/ratelimit.c index df8c95c562..351fcac3bd 100644 --- a/src/basic/ratelimit.c +++ b/src/basic/ratelimit.c @@ -1,7 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include +#include "assert-util.h" #include "macro.h" #include "ratelimit.h" diff --git a/src/basic/sha256.c b/src/basic/sha256.c index 1017a550fc..c4c2e85cec 100644 --- a/src/basic/sha256.c +++ b/src/basic/sha256.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "alloc-util.h" diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h index 9c818bd747..2820f2327c 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -3,6 +3,7 @@ #include +#include "assert-util.h" #include "macro.h" /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the diff --git a/src/basic/static-destruct.h b/src/basic/static-destruct.h index 2c7c75628f..f167d6413e 100644 --- a/src/basic/static-destruct.h +++ b/src/basic/static-destruct.h @@ -2,6 +2,8 @@ #pragma once +#include + #include "macro.h" #include "memory-util.h" diff --git a/src/basic/string-table.c b/src/basic/string-table.c index 8f2b4cb15b..30c912adb6 100644 --- a/src/basic/string-table.c +++ b/src/basic/string-table.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "parse-util.h" #include "string-table.h" #include "string-util.h" diff --git a/src/basic/string-util.h b/src/basic/string-util.h index e00a5f5977..17fac1bfab 100644 --- a/src/basic/string-util.h +++ b/src/basic/string-util.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "alloc-util.h" #include "macro.h" diff --git a/src/basic/syslog-util.c b/src/basic/syslog-util.c index 0371922e39..18194f70d9 100644 --- a/src/basic/syslog-util.c +++ b/src/basic/syslog-util.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "sd-id128.h" diff --git a/src/basic/time-util.h b/src/basic/time-util.h index 3f6e3c9f41..83d7e660ac 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include #include diff --git a/src/boot/boot.c b/src/boot/boot.c index c7f354506c..99d83f5462 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "bcd.h" #include "bootspec-fundamental.h" #include "console.h" diff --git a/src/boot/efi-string.c b/src/boot/efi-string.c index e8dbe297ed..4b9c3181c0 100644 --- a/src/boot/efi-string.c +++ b/src/boot/efi-string.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "efi-string.h" #if SD_BOOT diff --git a/src/boot/pe.c b/src/boot/pe.c index 1a0feb633e..c5cd6a57ca 100644 --- a/src/boot/pe.c +++ b/src/boot/pe.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "chid.h" #include "devicetree.h" #include "efi-firmware.h" diff --git a/src/boot/stub.c b/src/boot/stub.c index 4793391b06..9cc115a1f6 100644 --- a/src/boot/stub.c +++ b/src/boot/stub.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "cpio.h" #include "device-path-util.h" #include "devicetree.h" diff --git a/src/core/kill.h b/src/core/kill.h index 97a295e1e5..ffa2280e60 100644 --- a/src/core/kill.h +++ b/src/core/kill.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include diff --git a/src/core/unit-dependency-atom.c b/src/core/unit-dependency-atom.c index aba58612f7..06def183b9 100644 --- a/src/core/unit-dependency-atom.c +++ b/src/core/unit-dependency-atom.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "assert-util.h" #include "unit-dependency-atom.h" static const UnitDependencyAtom atom_map[_UNIT_DEPENDENCY_MAX] = { diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h index 597228f139..54b3e6a651 100644 --- a/src/fundamental/macro-fundamental.h +++ b/src/fundamental/macro-fundamental.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include #include #include diff --git a/src/import/import-compress.h b/src/import/import-compress.h index 6ad6cf7a67..160d9e62a6 100644 --- a/src/import/import-compress.h +++ b/src/import/import-compress.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include + #if HAVE_BZIP2 #include #endif diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c index fc34f30603..6c186f6128 100644 --- a/src/import/qcow2-util.c +++ b/src/import/qcow2-util.c @@ -3,6 +3,7 @@ #include #include "alloc-util.h" +#include "assert-util.h" #include "btrfs-util.h" #include "qcow2-util.h" #include "sparse-endian.h" diff --git a/src/libsystemd/sd-bus/bus-signature.c b/src/libsystemd/sd-bus/bus-signature.c index 78c743648b..16693bcad6 100644 --- a/src/libsystemd/sd-bus/bus-signature.c +++ b/src/libsystemd/sd-bus/bus-signature.c @@ -2,6 +2,7 @@ #include "sd-bus.h" +#include "assert-util.h" #include "bus-signature.h" #include "bus-type.h" diff --git a/src/libsystemd/sd-journal/journal-def.h b/src/libsystemd/sd-journal/journal-def.h index 02576077b0..28cccca21a 100644 --- a/src/libsystemd/sd-journal/journal-def.h +++ b/src/libsystemd/sd-journal/journal-def.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include + #include "sd-id128.h" #include "macro.h" diff --git a/src/libsystemd/sd-json/json-util.c b/src/libsystemd/sd-json/json-util.c index 0fb5e87df7..a4beb54cba 100644 --- a/src/libsystemd/sd-json/json-util.c +++ b/src/libsystemd/sd-json/json-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "alloc-util.h" #include "devnum-util.h" #include "env-util.h" diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index ae62138c8f..4ad1489307 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -22,6 +22,7 @@ #include "alloc-util.h" #include "device-private.h" #include "device-util.h" +#include "errno-util.h" #include "libudev-device-internal.h" #include "libudev-list-internal.h" #include "parse-util.h" diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c index 270df0fa66..6afcc68256 100644 --- a/src/libudev/libudev-enumerate.c +++ b/src/libudev/libudev-enumerate.c @@ -16,6 +16,7 @@ #include "alloc-util.h" #include "device-enumerator-private.h" #include "device-util.h" +#include "errno-util.h" #include "libudev-device-internal.h" #include "libudev-list-internal.h" diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c index 7144905e85..edc1c664a8 100644 --- a/src/libudev/libudev-hwdb.c +++ b/src/libudev/libudev-hwdb.c @@ -5,6 +5,8 @@ #include "sd-hwdb.h" #include "alloc-util.h" +#include "assert-util.h" +#include "errno-util.h" #include "hwdb-util.h" #include "libudev-list-internal.h" #include "log.h" diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c index 1d5a024b79..c4aa78dd65 100644 --- a/src/libudev/libudev-queue.c +++ b/src/libudev/libudev-queue.c @@ -9,6 +9,7 @@ #include "libudev.h" #include "alloc-util.h" +#include "errno-util.h" #include "fd-util.h" #include "io-util.h" #include "udev-util.h" diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index a6004e3999..ae3260633a 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -9,6 +9,7 @@ #include "libudev.h" #include "alloc-util.h" +#include "errno-util.h" #include "fd-util.h" #include "log.h" #include "string-util.h" diff --git a/src/network/netdev/netdev-util.h b/src/network/netdev/netdev-util.h index 7c8c397d6c..089326c396 100644 --- a/src/network/netdev/netdev-util.h +++ b/src/network/netdev/netdev-util.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include + #include "in-addr-util.h" #include "macro.h" diff --git a/src/network/tc/tc-util.c b/src/network/tc/tc-util.c index 3781182946..ce9b5ecdae 100644 --- a/src/network/tc/tc-util.c +++ b/src/network/tc/tc-util.c @@ -2,6 +2,7 @@ * Copyright © 2019 VMware, Inc. */ #include "alloc-util.h" +#include "assert-util.h" #include "extract-word.h" #include "fileio.h" #include "parse-util.h" diff --git a/src/resolve/dns-type.h b/src/resolve/dns-type.h index 657526b470..590e8f4008 100644 --- a/src/resolve/dns-type.h +++ b/src/resolve/dns-type.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include + #include "macro.h" /* DNS record types, taken from diff --git a/src/shared/apparmor-util.h b/src/shared/apparmor-util.h index e88bf9d111..b1b511aed5 100644 --- a/src/shared/apparmor-util.h +++ b/src/shared/apparmor-util.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include "dlfcn-util.h" diff --git a/src/shared/blkid-util.c b/src/shared/blkid-util.c index 377a277851..5446eb0f91 100644 --- a/src/shared/blkid-util.c +++ b/src/shared/blkid-util.c @@ -2,6 +2,8 @@ #if HAVE_BLKID +#include + #include "blkid-util.h" #include "string-util.h" diff --git a/src/shared/bond-util.h b/src/shared/bond-util.h index 557912c73f..84b18942ee 100644 --- a/src/shared/bond-util.h +++ b/src/shared/bond-util.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include diff --git a/src/shared/bus-locator.c b/src/shared/bus-locator.c index 80d2b5371c..9ceb976b0b 100644 --- a/src/shared/bus-locator.c +++ b/src/shared/bus-locator.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "assert-util.h" #include "bus-locator.h" #include "macro.h" diff --git a/src/shared/color-util.c b/src/shared/color-util.c index 9d714c0fff..e8258de95d 100644 --- a/src/shared/color-util.c +++ b/src/shared/color-util.c @@ -2,6 +2,7 @@ #include +#include "assert-util.h" #include "color-util.h" #include "macro.h" diff --git a/src/shared/condition.h b/src/shared/condition.h index 84b9273841..0644ec28f5 100644 --- a/src/shared/condition.h +++ b/src/shared/condition.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include diff --git a/src/shared/copy.c b/src/shared/copy.c index fb006e38ed..2f153a9732 100644 --- a/src/shared/copy.c +++ b/src/shared/copy.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/src/shared/coredump-util.h b/src/shared/coredump-util.h index 4f54bb94c0..a72db4b4e5 100644 --- a/src/shared/coredump-util.h +++ b/src/shared/coredump-util.h @@ -1,6 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include +#include + #include "macro.h" typedef enum CoredumpFilter { diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c index e0e0f7aac1..0ac195c86f 100644 --- a/src/shared/dev-setup.c +++ b/src/shared/dev-setup.c @@ -2,6 +2,7 @@ #include #include +#include #include #include "alloc-util.h" diff --git a/src/shared/idn-util.h b/src/shared/idn-util.h index 822800cc22..986f2cfd9e 100644 --- a/src/shared/idn-util.h +++ b/src/shared/idn-util.h @@ -8,6 +8,7 @@ # include #endif +#include #include #if HAVE_LIBIDN2 || HAVE_LIBIDN diff --git a/src/shared/import-util.h b/src/shared/import-util.h index 98b99e371f..91bc3083e4 100644 --- a/src/shared/import-util.h +++ b/src/shared/import-util.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include "macro.h" diff --git a/src/shared/ipvlan-util.h b/src/shared/ipvlan-util.h index ca7b0b40f5..bc286d9d88 100644 --- a/src/shared/ipvlan-util.h +++ b/src/shared/ipvlan-util.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include diff --git a/src/shared/libarchive-util.h b/src/shared/libarchive-util.h index 1efdacdd36..2695b18a7f 100644 --- a/src/shared/libarchive-util.h +++ b/src/shared/libarchive-util.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include + #include "dlfcn-util.h" #if HAVE_LIBARCHIVE diff --git a/src/shared/libfido2-util.h b/src/shared/libfido2-util.h index 4a0d8f8cbe..18aec372a7 100644 --- a/src/shared/libfido2-util.h +++ b/src/shared/libfido2-util.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include + #include "iovec-util.h" #include "macro.h" diff --git a/src/shared/open-file.h b/src/shared/open-file.h index fe38801001..d6cab52359 100644 --- a/src/shared/open-file.h +++ b/src/shared/open-file.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include + #include "list.h" #include "macro.h" #include "memory-util.h" diff --git a/src/shared/recovery-key.c b/src/shared/recovery-key.c index 3233f05dfc..6c73370076 100644 --- a/src/shared/recovery-key.c +++ b/src/shared/recovery-key.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "alloc-util.h" #include "memory-util.h" #include "random-util.h" diff --git a/src/shared/selinux-util.h b/src/shared/selinux-util.h index 4ed4a33198..979c3f5be9 100644 --- a/src/shared/selinux-util.h +++ b/src/shared/selinux-util.h @@ -6,6 +6,7 @@ #include #include +#include "assert-util.h" #include "label-util.h" #include "macro.h" diff --git a/src/shared/smbios11.c b/src/shared/smbios11.c index bea4f7f1ee..bd095992e9 100644 --- a/src/shared/smbios11.c +++ b/src/shared/smbios11.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" +#include "assert-util.h" #include "fileio.h" #include "macro.h" #include "smbios11.h" diff --git a/src/test/test-dirent-util.c b/src/test/test-dirent-util.c index 44e26e8e24..cb31edcdc6 100644 --- a/src/test/test-dirent-util.c +++ b/src/test/test-dirent-util.c @@ -4,6 +4,7 @@ #include #include #include +#include #include "alloc-util.h" #include "dirent-util.h" diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c index 0670bb7f8e..e3c3149db1 100644 --- a/src/test/test-fs-util.c +++ b/src/test/test-fs-util.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include "alloc-util.h" diff --git a/src/test/test-json.c b/src/test/test-json.c index 8dd5746495..3fe2f26274 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include "sd-json.h" diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index c3f1bdee89..fe90341dc8 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include