path-util: Reduce transitive includes

diff --git a/src/basic/btrfs.c b/src/basic/btrfs.c
index dc2d6a5ddbd3b14621cd48a56d344603a43ba268..7d5c35605de45bb885fd23e7930c0c6f0dc2e10e 100644 (file)
--- a/src/basic/btrfs.c
+++ b/src/basic/btrfs.c
@@ -3,11 +3,13 @@
 #include <linux/btrfs.h>
 #include <sys/ioctl.h>
 
+#include "alloc-util.h"
 #include "btrfs.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "path-util.h"
+#include "string-util.h"
 
 int btrfs_validate_subvolume_name(const char *name) {
 

diff --git a/src/basic/capsule-util.c b/src/basic/capsule-util.c
index 3689a78a8bfd7fd4f25020baec69b62b384212ec..d2d6b19448533e107c069a9ba44c9d9e0f656efa 100644 (file)
--- a/src/basic/capsule-util.c
+++ b/src/basic/capsule-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "capsule-util.h"
 #include "path-util.h"
 #include "user-util.h"

diff --git a/src/basic/chase.c b/src/basic/chase.c
index 954586dbf034f4fda823526fade7ebbe72b1d929..88cd840544b046e6d2fe81bc0e6ee7336acf0f73 100644 (file)
--- a/src/basic/chase.c
+++ b/src/basic/chase.c
@@ -12,6 +12,7 @@
 #include "log.h"
 #include "path-util.h"
 #include "string-util.h"
+#include "strv.h"
 #include "user-util.h"
 
 bool unsafe_transition(const struct stat *a, const struct stat *b) {

diff --git a/src/basic/devnum-util.c b/src/basic/devnum-util.c
index 652740cea757a1a0944e908ee5da863e262e68e0..ab4da865f28d380bbd6dbde1c5296b15ca85e58d 100644 (file)
--- a/src/basic/devnum-util.c
+++ b/src/basic/devnum-util.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "devnum-util.h"
 #include "parse-util.h"

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index c5eedc312b384a2948cdbb0b532743bd716ec5de..509514512d9fc8b1e3e23ff7b08ee1a2ddf2ed8c 100644 (file)
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -29,6 +29,7 @@
 #include "socket-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
+#include "strv.h"
 #include "sync-util.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index dff1b0ebe4e530f1523faf7b504fef94cb6463ad..64e42b2a23e48e0353015e76f6fb6a71fc94d60a 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -22,6 +22,13 @@
 #include "strv.h"
 #include "time-util.h"
 
+bool is_path(const char *p) {
+        if (!p) /* A NULL pointer is definitely not a path */
+                return false;
+
+        return strchr(p, '/');
+}
+
 int path_split_and_make_absolute(const char *p, char ***ret) {
         _cleanup_strv_free_ char **l = NULL;
         int r;
@@ -345,6 +352,10 @@ char** path_strv_resolve_uniq(char **l, const char *root) {
         return strv_uniq(l);
 }
 
+char* skip_leading_slash(const char *p) {
+        return skip_leading_chars(p, "/");
+}
+
 char* path_simplify_full(char *path, PathSimplifyFlags flags) {
         bool add_slash = false, keep_trailing_slash, absolute, beginning = true;
         char *f = path;
@@ -406,6 +417,22 @@ char* path_simplify_full(char *path, PathSimplifyFlags flags) {
         return path;
 }
 
+int path_simplify_alloc(const char *path, char **ret) {
+        assert(ret);
+
+        if (!path) {
+                *ret = NULL;
+                return 0;
+        }
+
+        char *t = strdup(path);
+        if (!t)
+                return -ENOMEM;
+
+        *ret = path_simplify(t);
+        return 0;
+}
+
 char* path_startswith_full(const char *path, const char *prefix, bool accept_dot_dot) {
         assert(path);
         assert(prefix);
@@ -1361,6 +1388,10 @@ bool empty_or_root(const char *path) {
         return path_equal(path, "/");
 }
 
+const char* empty_to_root(const char *path) {
+        return isempty(path) ? "/" : path;
+}
+
 bool path_strv_contains(char * const *l, const char *path) {
         assert(path);
 

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 74406d7698afd162a4afb3a739668c286f142300..647a884e39844f6ae19a2d99f09646ff05a10e10 100644 (file)
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -1,14 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <alloca.h>
 #include <stdbool.h>
 #include <stddef.h>
 
 #include "macro.h"
-#include "stat-util.h"
-#include "string-util.h"
-#include "strv.h"
 #include "time-util.h"
 
 #define PATH_SPLIT_BIN(x) x "sbin:" x "bin"
@@ -32,12 +28,7 @@ static inline const char* default_user_PATH(void) {
 #endif
 }
 
-static inline bool is_path(const char *p) {
-        if (!p) /* A NULL pointer is definitely not a path */
-                return false;
-
-        return strchr(p, '/');
-}
+bool is_path(const char *p) _pure_;
 
 static inline bool path_is_absolute(const char *p) {
         if (!p) /* A NULL pointer is definitely not an absolute path */
@@ -76,9 +67,7 @@ char* path_extend_internal(char **x, ...);
 #define path_extend(x, ...) path_extend_internal(x, __VA_ARGS__, POINTER_MAX)
 #define path_join(...) path_extend_internal(NULL, __VA_ARGS__, POINTER_MAX)
 
-static inline char* skip_leading_slash(const char *p) {
-        return skip_leading_chars(p, "/");
-}
+char* skip_leading_slash(const char *p) _pure_;
 
 typedef enum PathSimplifyFlags {
         PATH_SIMPLIFY_KEEP_TRAILING_SLASH = 1 << 0,
@@ -89,21 +78,7 @@ static inline char* path_simplify(char *path) {
         return path_simplify_full(path, 0);
 }
 
-static inline int path_simplify_alloc(const char *path, char **ret) {
-        assert(ret);
-
-        if (!path) {
-                *ret = NULL;
-                return 0;
-        }
-
-        char *t = strdup(path);
-        if (!t)
-                return -ENOMEM;
-
-        *ret = path_simplify(t);
-        return 0;
-}
+int path_simplify_alloc(const char *path, char **ret);
 
 /* Note: the search terminates on the first NULL item. */
 #define PATH_IN_SET(p, ...) path_strv_contains(STRV_MAKE(__VA_ARGS__), p)
@@ -195,9 +170,7 @@ static inline const char* skip_dev_prefix(const char *p) {
 }
 
 bool empty_or_root(const char *path);
-static inline const char* empty_to_root(const char *path) {
-        return isempty(path) ? "/" : path;
-}
+const char* empty_to_root(const char *path) _pure_;
 
 bool path_strv_contains(char * const *l, const char *path);
 bool prefixed_path_strv_contains(char * const *l, const char *path);

diff --git a/src/basic/sync-util.c b/src/basic/sync-util.c
index 4f0d41848a6f74d07e3af9bfaf32e2e251f10207..eb9c9f1a6e8b5b11becce2c2a4f961cb74fc6a22 100644 (file)
--- a/src/basic/sync-util.c
+++ b/src/basic/sync-util.c
@@ -3,11 +3,13 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "log.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "sync-util.h"
 
 int fsync_directory_of_file(int fd) {

diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c
index da6e4c58d431daaeb1af0fae5db8e211f6c88f1b..5ffb31ec012c260c1effa91ad1a0f1eb3d349926 100644 (file)
--- a/src/basic/sysctl-util.c
+++ b/src/basic/sysctl-util.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 
 #include "af-list.h"
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"

diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 5554f04bb754a46cd713db6adb5e122ec8ef3cc0..f38f6386c129fc488a65990373c4dd049a27a7f8 100644 (file)
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -9,6 +9,7 @@
 
 #include "alloc-util.h"
 #include "glob-util.h"
+#include "hash-funcs.h"
 #include "hexdecoct.h"
 #include "log.h"
 #include "memory-util.h"

diff --git a/src/basic/virt.c b/src/basic/virt.c
index dbb035a94a7d91f7c11243f2391373438e81131a..e07cee72cf5b8259e20c807647b0365255f7a758 100644 (file)
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -13,6 +13,7 @@
 #include "dirent-util.h"
 #include "env-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"

diff --git a/src/bless-boot/bless-boot.c b/src/bless-boot/bless-boot.c
index 61b882c5050a6731f684efc839e3652513b37fa3..b3205dec3631a3ebe5d4bd97d366d6eb0ff313cd 100644 (file)
--- a/src/bless-boot/bless-boot.c
+++ b/src/bless-boot/bless-boot.c
@@ -18,6 +18,7 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
+#include "strv.h"
 #include "sync-util.h"
 #include "terminal-util.h"
 #include "verbs.h"

diff --git a/src/core/ipe-setup.c b/src/core/ipe-setup.c
index 60396f7bdd66e256b130e1280c1c40cf665a5e0e..b6ae89e03a76be381b510718edfc582430f03f38 100644 (file)
--- a/src/core/ipe-setup.c
+++ b/src/core/ipe-setup.c
@@ -8,6 +8,7 @@
 #include "log.h"
 #include "nulstr-util.h"
 #include "path-util.h"
+#include "strv.h"
 
 #define IPE_SECFS_DIR "/sys/kernel/security/ipe"
 #define IPE_SECFS_NEW_POLICY IPE_SECFS_DIR "/new_policy"

diff --git a/src/creds/creds.c b/src/creds/creds.c
index 343030b5fbe241e6ae1284ad15f37afb3124dea5..7295bb7bd136ec718f7cc1f496ef9873a8994a9b 100644 (file)
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -29,6 +29,7 @@
 #include "process-util.h"
 #include "stat-util.h"
 #include "string-table.h"
+#include "strv.h"
 #include "terminal-util.h"
 #include "tpm2-pcr.h"
 #include "tpm2-util.h"

diff --git a/src/journal/journalctl-catalog.c b/src/journal/journalctl-catalog.c
index 55a8c3d26d7823bf768dbe7700a282f83266ecf5..a35b0a64a38bde564062824923b497b94bfc6950 100644 (file)
--- a/src/journal/journalctl-catalog.c
+++ b/src/journal/journalctl-catalog.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "catalog.h"
 #include "journalctl.h"
 #include "journalctl-catalog.h"

diff --git a/src/journal/journalctl-filter.c b/src/journal/journalctl-filter.c
index 2d8981ac77fc096bc06729a91f35c1dfb9142f97..ba7ec5a3103801b9693c75df83b9eebe0d928d3b 100644 (file)
--- a/src/journal/journalctl-filter.c
+++ b/src/journal/journalctl-filter.c
@@ -14,6 +14,7 @@
 #include "logs-show.h"
 #include "missing_sched.h"
 #include "path-util.h"
+#include "strv.h"
 #include "unit-name.h"
 
 static int add_invocation(sd_journal *j) {

diff --git a/src/journal/journalctl-misc.c b/src/journal/journalctl-misc.c
index 4e8ecda33b94bfdfe5f9598361aec46334cfea2c..e8dc135e77120189ddb5f90ce9a985a541f7c239 100644 (file)
--- a/src/journal/journalctl-misc.c
+++ b/src/journal/journalctl-misc.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "format-table.h"
@@ -11,6 +12,7 @@
 #include "journalctl-util.h"
 #include "log.h"
 #include "logs-show.h"
+#include "strv.h"
 #include "syslog-util.h"
 
 int action_print_header(void) {

diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 0600102d327966d5d4e6ce9ed835769e641806c1..2cb6e9e988494528880f8f755a3c75010da1e296 100644 (file)
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -27,6 +27,7 @@
 #include "process-util.h"
 #include "selinux-util.h"
 #include "socket-util.h"
+#include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "unaligned.h"

diff --git a/src/libsystemd/sd-device/device-filter.c b/src/libsystemd/sd-device/device-filter.c
index 4101e7d2baa4be2423a789258ca698ada0cc1fcb..579c9440155e24bad75b36218fdf99905cdaaef0 100644 (file)
--- a/src/libsystemd/sd-device/device-filter.c
+++ b/src/libsystemd/sd-device/device-filter.c
@@ -4,6 +4,7 @@
 
 #include "device-filter.h"
 #include "path-util.h"
+#include "strv.h"
 
 int update_match_strv(Hashmap **match_strv, const char *key, const char *value, bool clear_on_null) {
         char **strv;

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 3f9e21505a4ef99c8b1e363251e31b288f71633d..5e055330e017593858e9cf2aa1663e7a2c5ac0da 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -38,6 +38,7 @@
 #include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"
+#include "strv.h"
 #include "strxcpyx.h"
 #include "time-util.h"
 

diff --git a/src/libsystemd/sd-json/json-util.c b/src/libsystemd/sd-json/json-util.c
index 9bc12febe7782125880d2fd9b53403c2510f6cb4..0fb5e87df710bcc594c40352bc02d26f17d77809 100644 (file)
--- a/src/libsystemd/sd-json/json-util.c
+++ b/src/libsystemd/sd-json/json-util.c
@@ -14,7 +14,9 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
+#include "stat-util.h"
 #include "string-util.h"
+#include "strv.h"
 #include "syslog-util.h"
 #include "user-util.h"
 

diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
index 0b3e977d5c35770682fda99774eec2db06ec4ecb..63a0a166c0ac2707435f996489305a7e7f8cc435 100644 (file)
--- a/src/login/user-runtime-dir.c
+++ b/src/login/user-runtime-dir.c
@@ -26,6 +26,7 @@
 #include "rm-rf.h"
 #include "selinux-util.h"
 #include "smack-util.h"
+#include "stat-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/network/networkctl-config-file.c b/src/network/networkctl-config-file.c
index 782cc6a4e80c826599974d9d10c0fd3869b32644..7a57b3ff29c2c538b7fbe8e797f37ed961316a8f 100644 (file)
--- a/src/network/networkctl-config-file.c
+++ b/src/network/networkctl-config-file.c
@@ -25,6 +25,7 @@
 #include "path-util.h"
 #include "pretty-print.h"
 #include "selinux-util.h"
+#include "stat-util.h"
 #include "string-table.h"
 #include "strv.h"
 #include "virt.h"

diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c
index c898dbe76ea4dc1d0137993a7cadcb8cb6537ccb..5e39c3844e52d98a0fbe3ebdc80df54279c4958b 100644 (file)
--- a/src/nsresourced/userns-registry.c
+++ b/src/nsresourced/userns-registry.c
@@ -13,6 +13,7 @@
 #include "path-util.h"
 #include "recurse-dir.h"
 #include "rm-rf.h"
+#include "strv.h"
 #include "user-util.h"
 #include "userns-registry.h"
 

diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c
index 8dcea2052014ee1aec7af9d48fc48b96ab2597e9..a5cf892953ed9c7736192d77e05b1b4c7e44e77d 100644 (file)
--- a/src/pcrlock/pcrlock.c
+++ b/src/pcrlock/pcrlock.c
@@ -49,6 +49,7 @@
 #include "recovery-key.h"
 #include "sort-util.h"
 #include "string-table.h"
+#include "strv.h"
 #include "terminal-util.h"
 #include "tpm2-util.h"
 #include "unaligned.h"

diff --git a/src/shared/boot-entry.c b/src/shared/boot-entry.c
index ea474d0dca1b54cd057e3c2f24e481f000bb009e..cbade699a22391a8d8675a1197f5912c89f8534b 100644 (file)
--- a/src/shared/boot-entry.c
+++ b/src/shared/boot-entry.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "boot-entry.h"
 #include "chase.h"
 #include "fd-util.h"
@@ -10,6 +11,7 @@
 #include "path-util.h"
 #include "string-table.h"
 #include "string-util.h"
+#include "strv.h"
 #include "utf8.h"
 
 bool boot_entry_token_valid(const char *p) {

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 764548339d327e01a3414b9c9d01679ca3f29dd3..82153b1451d9dcadd77cedf0b3d03ed8f181f71d 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -14,6 +14,7 @@
 #include "sd-event.h"
 #include "sd-id128.h"
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-internal.h"
 #include "bus-label.h"
@@ -31,6 +32,7 @@
 #include "socket-util.h"
 #include "stdio-util.h"
 #include "string-table.h"
+#include "strv.h"
 #include "uid-classification.h"
 
 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index eb72793c04b4283bb9638452fe67faf5c6108fd5..e0e0f7aac11f9d9d1a811048a88babec99b367af 100644 (file)
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -14,6 +14,7 @@
 #include "mkdir-label.h"
 #include "nulstr-util.h"
 #include "path-util.h"
+#include "stat-util.h"
 #include "terminal-util.h"
 #include "umask-util.h"
 #include "user-util.h"

diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index 42dd583fcdf33f35509942cabfed0715148302e4..7c3539abaa58358f35ed36728ce82e51602c7738 100644 (file)
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -30,6 +30,7 @@
 #include "sort-util.h"
 #include "stat-util.h"
 #include "string-util.h"
+#include "strv.h"
 #include "strxcpyx.h"
 #include "terminal-util.h"
 #include "time-util.h"

diff --git a/src/shared/journal-file-util.c b/src/shared/journal-file-util.c
index 43ebe0a12fcc30030dd518de322409760c9d2d12..74f85fadced77f8711bb998ce53eabdc9c0fdca3 100644 (file)
--- a/src/shared/journal-file-util.c
+++ b/src/shared/journal-file-util.c
@@ -3,6 +3,7 @@
 #include <pthread.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "chattr-util.h"
 #include "copy.h"
 #include "errno-util.h"

diff --git a/src/shared/numa-util.c b/src/shared/numa-util.c
index b479e5f776efab59ba49daa2298578ad5dd8cf9c..8cc315061dea64a67b3ce31ef4703f0258d17607 100644 (file)
--- a/src/shared/numa-util.c
+++ b/src/shared/numa-util.c
@@ -15,6 +15,7 @@
 #include "parse-util.h"
 #include "stdio-util.h"
 #include "string-table.h"
+#include "string-util.h"
 
 bool numa_policy_is_valid(const NUMAPolicy *policy) {
         assert(policy);

diff --git a/src/shared/open-file.c b/src/shared/open-file.c
index a9c2a11032742eb617f3e372608deaf1ac4b5313..a06a78a4a7b1a0728dfcfa54485243a2fa1ae225 100644 (file)
--- a/src/shared/open-file.c
+++ b/src/shared/open-file.c
@@ -2,6 +2,7 @@
 
 #include <fcntl.h>
 
+#include "alloc-util.h"
 #include "escape.h"
 #include "extract-word.h"
 #include "fd-util.h"

diff --git a/src/shared/parse-argument.c b/src/shared/parse-argument.c
index 288b68ceed3a16d4773d4e8294dfd42b47ccb882..701802ec0ca6171117dac9abf7a876a01325d5f6 100644 (file)
--- a/src/shared/parse-argument.c
+++ b/src/shared/parse-argument.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "format-table.h"
 #include "log.h"
 #include "parse-argument.h"

diff --git a/src/shared/parse-helpers.c b/src/shared/parse-helpers.c
index 348dce50590081829b5f2e11f1ebd4544344551e..c6ee92afc565c315e3791911d79a525267161821 100644 (file)
--- a/src/shared/parse-helpers.c
+++ b/src/shared/parse-helpers.c
@@ -3,6 +3,7 @@
 #include <sys/socket.h>
 
 #include "af-list.h"
+#include "alloc-util.h"
 #include "extract-word.h"
 #include "ip-protocol-list.h"
 #include "log.h"
@@ -10,6 +11,7 @@
 #include "parse-helpers.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "utf8.h"
 
 static bool validate_api_vfs(const char *path, PathSimplifyWarnFlags flags) {

diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
index bf97dcf53e9278b02b2573057e0e0b974e69d18a..c0c0e332e25a7c3c0b49cc60460c8dc970af33ed 100644 (file)
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -27,6 +27,7 @@
 #include "path-util.h"
 #include "selinux-util.h"
 #include "stdio-util.h"
+#include "string-util.h"
 #include "time-util.h"
 
 #if HAVE_SELINUX

diff --git a/src/shared/shift-uid.c b/src/shared/shift-uid.c
index d723fa911be23e584a7f28ee0f3cb1738eb6afde..96f22cdf50249cb89d266f7c82b81647771b8823 100644 (file)
--- a/src/shared/shift-uid.c
+++ b/src/shared/shift-uid.c
@@ -3,6 +3,7 @@
 #include <sys/statvfs.h>
 
 #include "acl-util.h"
+#include "alloc-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/shared/vpick.c b/src/shared/vpick.c
index 2652633f372cc2568b2a78b26b92f6f4c346b5a5..ccde661ca5230936ab756883b72d73c287b857ac 100644 (file)
--- a/src/shared/vpick.c
+++ b/src/shared/vpick.c
@@ -11,6 +11,8 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "recurse-dir.h"
+#include "string-util.h"
+#include "strv.h"
 #include "vpick.h"
 
 void pick_result_done(PickResult *p) {

diff --git a/src/shared/wall.c b/src/shared/wall.c
index 11048f39aaddb812063fa5c3cf76551d39a9050a..eed7c652dd709e696e7c6001b0a11329065f3afc 100644 (file)
--- a/src/shared/wall.c
+++ b/src/shared/wall.c
@@ -12,6 +12,7 @@
 #include "io-util.h"
 #include "path-util.h"
 #include "string-util.h"
+#include "strv.h"
 #include "terminal-util.h"
 #include "user-util.h"
 #include "utmp-wtmp.h"

diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index 3466d1aa070b09d9f4d0a213ebe14f64b0ded314..815eb158e8c936cf275d9c46fa1afce6b6a24dd8 100644 (file)
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -17,6 +17,7 @@
 #include "path-util.h"
 #include "ratelimit.h"
 #include "string-util.h"
+#include "strv.h"
 #include "time-util.h"
 #include "watchdog.h"
 

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index 8be8879decd6ce9329799450ef214742a8cda62e..d76437745b48d776900dfe5f22fb39e8f7d8e1f8 100644 (file)
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -11,6 +11,7 @@
 #include "proc-cmdline.h"
 #include "special.h"
 #include "string-util.h"
+#include "strv.h"
 #include "unit-file.h"
 
 /*

diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 363a7beeafd1ce4448bf532a94b5652724c21fff..8ca6eb1b9da72e34fa3a060e6ece12921fab1857 100644 (file)
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -8,6 +8,7 @@
 #include "fd-util.h"
 #include "path-util.h"
 #include "process-util.h"
+#include "stat-util.h"
 #include "string-util.h"
 #include "tests.h"
 

diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c
index 32a3b927e59f4ca2ce778f38608386f563b4209e..51d3e69be77289a21dad76ccb7b5ed1f6a1b787b 100644 (file)
--- a/src/test/test-mountpoint-util.c
+++ b/src/test/test-mountpoint-util.c
@@ -14,6 +14,7 @@
 #include "mountpoint-util.h"
 #include "path-util.h"
 #include "rm-rf.h"
+#include "stat-util.h"
 #include "string-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"

diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c
index 907a6c5c732a520abfa7ac6ec23c693ef01e8862..4b7f23cf51037048dabe83905679827a8bdbdbc8 100644 (file)
--- a/src/test/test-terminal-util.c
+++ b/src/test/test-terminal-util.c
@@ -15,6 +15,7 @@
 #include "macro.h"
 #include "path-util.h"
 #include "process-util.h"
+#include "stat-util.h"
 #include "strv.h"
 #include "terminal-util.h"
 #include "tests.h"

diff --git a/src/tmpfiles/offline-passwd.c b/src/tmpfiles/offline-passwd.c
index b4b16fcd5247190678216f9808a89403214c1ae5..48244d18b863057e32c314cb4b9df7f99847c91b 100644 (file)
--- a/src/tmpfiles/offline-passwd.c
+++ b/src/tmpfiles/offline-passwd.c
@@ -1,10 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "fd-util.h"
 #include "log.h"
 #include "offline-passwd.h"
 #include "path-util.h"
+#include "strv.h"
 #include "user-util.h"
 
 DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(uid_gid_hash_ops, char, string_hash_func, string_compare_func, free);

diff --git a/src/udev/udevadm-util.c b/src/udev/udevadm-util.c
index ed69dd17958985be38b65dfbe5db291c94deb9a7..5bede0e4daa015ed1d7e94f113ccfed2cdfe1987 100644 (file)
--- a/src/udev/udevadm-util.c
+++ b/src/udev/udevadm-util.c
@@ -12,6 +12,7 @@
 #include "log.h"
 #include "path-util.h"
 #include "string-table.h"
+#include "strv.h"
 #include "udev-ctrl.h"
 #include "udev-rules.h"
 #include "udev-varlink.h"

diff --git a/src/varlinkctl/varlinkctl.c b/src/varlinkctl/varlinkctl.c
index 75c656d13cf98f4422130cdc22b050af83e3f9e5..e5ce16d1cdc2f0cea9e667c4e40f929d7b3cee81 100644 (file)
--- a/src/varlinkctl/varlinkctl.c
+++ b/src/varlinkctl/varlinkctl.c
@@ -19,6 +19,7 @@
 #include "path-util.h"
 #include "pretty-print.h"
 #include "process-util.h"
+#include "strv.h"
 #include "terminal-util.h"
 #include "varlink-idl-util.h"
 #include "varlink-util.h"

diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index 6335775d437771bf35bcf1fe54f9c2fd0f776c1c..5ec997052945f06b7421204070fbbefef356a189 100644 (file)
--- a/src/veritysetup/veritysetup-generator.c
+++ b/src/veritysetup/veritysetup-generator.c
@@ -20,6 +20,7 @@
 #include "proc-cmdline.h"
 #include "specifier.h"
 #include "string-util.h"
+#include "strv.h"
 #include "unit-name.h"
 
 static const char *arg_dest = NULL;

diff --git a/src/vmspawn/vmspawn-mount.c b/src/vmspawn/vmspawn-mount.c
index 1845a872f2371a9d43110f5e69731ff245816893..a57baaa3e8a197bf0c4b27afac9b073a500d7a24 100644 (file)
--- a/src/vmspawn/vmspawn-mount.c
+++ b/src/vmspawn/vmspawn-mount.c
@@ -5,6 +5,7 @@
 #include "macro.h"
 #include "parse-argument.h"
 #include "path-util.h"
+#include "stat-util.h"
 #include "string-util.h"
 #include "vmspawn-mount.h"