strv: Reduce transitive includes

diff --git a/src/analyze/analyze-calendar.c b/src/analyze/analyze-calendar.c
index b3afa1d4b0cd4abe2209764a39bfb0be3dd95389..21e7c79c8092d17c03e8b59d0ba7b9d9ee62d4c6 100644 (file)
--- a/src/analyze/analyze-calendar.c
+++ b/src/analyze/analyze-calendar.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-calendar.h"
 #include "calendarspec.h"

diff --git a/src/analyze/analyze-chid.c b/src/analyze/analyze-chid.c
index 43ca408af0e3f8e403750bd40cf19e002d2e2b0a..01e49965f8e53245719f66d8bdc1d5c3a4b6343f 100644 (file)
--- a/src/analyze/analyze-chid.c
+++ b/src/analyze/analyze-chid.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-chid.h"
 #include "chid-fundamental.h"

diff --git a/src/analyze/analyze-dot.c b/src/analyze/analyze-dot.c
index b93bf4a9a5bb0b1dbc01e0583f56746e035d2b9f..4a87c0c1f1b372e1c741e759d4d4d6b2e86e515d 100644 (file)
--- a/src/analyze/analyze-dot.c
+++ b/src/analyze/analyze-dot.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-dot.h"
 #include "bus-error.h"

diff --git a/src/analyze/analyze-fdstore.c b/src/analyze/analyze-fdstore.c
index 01ee241fc9010063581cf70e4aabfaaa8663a09a..8eb09dbd15b074406040f01e2250acfe664febab 100644 (file)
--- a/src/analyze/analyze-fdstore.c
+++ b/src/analyze/analyze-fdstore.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-fdstore.h"
 #include "bus-error.h"

diff --git a/src/analyze/analyze-filesystems.c b/src/analyze/analyze-filesystems.c
index 8ec542ec7a2571072f2aaba880642e6686f11039..4ba12ad3e388bc5128cadf233b2bc36ec6dd170a 100644 (file)
--- a/src/analyze/analyze-filesystems.c
+++ b/src/analyze/analyze-filesystems.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-filesystems.h"
 #include "fileio.h"

diff --git a/src/analyze/analyze-inspect-elf.c b/src/analyze/analyze-inspect-elf.c
index 0f78729c3accdf2bcd62d51fc9b482ddef95b537..df12f3b36fcfceb262e084c5ce5f8c9dc81310b5 100644 (file)
--- a/src/analyze/analyze-inspect-elf.c
+++ b/src/analyze/analyze-inspect-elf.c
@@ -2,6 +2,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-inspect-elf.h"
 #include "chase.h"

diff --git a/src/analyze/analyze-plot.c b/src/analyze/analyze-plot.c
index 0dc562b59602cb47d27b66d9a87573b5c6533d64..5e0df52aafa5f790c7ab67c36aee1fc15bc9f964 100644 (file)
--- a/src/analyze/analyze-plot.c
+++ b/src/analyze/analyze-plot.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-plot.h"
 #include "analyze-time-data.h"

diff --git a/src/analyze/analyze-smbios11.c b/src/analyze/analyze-smbios11.c
index e9d82bbbd36f8eb8b4a82177c53bfaa1d13ddc04..8deffe90f189e348116939993e7874810965cc73 100644 (file)
--- a/src/analyze/analyze-smbios11.c
+++ b/src/analyze/analyze-smbios11.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-smbios11.h"
 #include "escape.h"

diff --git a/src/analyze/analyze-syscall-filter.c b/src/analyze/analyze-syscall-filter.c
index b9522ca49d70a23c1f7da003deef8c3edcf2cd7e..593d6afb200da59abd4eab6b78cffaaa3ab81b75 100644 (file)
--- a/src/analyze/analyze-syscall-filter.c
+++ b/src/analyze/analyze-syscall-filter.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-syscall-filter.h"
 #include "fd-util.h"

diff --git a/src/analyze/analyze-time-data.c b/src/analyze/analyze-time-data.c
index 89198dff2d37969aec3aa98567bc79cb1307455f..ccc7dadbc1b197b4c349f7785bd1407cb77eb9d3 100644 (file)
--- a/src/analyze/analyze-time-data.c
+++ b/src/analyze/analyze-time-data.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-time-data.h"
 #include "bus-error.h"

diff --git a/src/analyze/analyze-time.c b/src/analyze/analyze-time.c
index 8135112dec42b1ae337e527c9a857546f0255414..390b1d8e7ee26bc6eeade5d72278815d14a87cc8 100644 (file)
--- a/src/analyze/analyze-time.c
+++ b/src/analyze/analyze-time.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-time.h"
 #include "analyze-time-data.h"

diff --git a/src/analyze/analyze-unit-files.c b/src/analyze/analyze-unit-files.c
index e0c4867c78d1c97c81bf405ccada143c57d033ed..e00c157abca31f75e8746272d864ef805553fa26 100644 (file)
--- a/src/analyze/analyze-unit-files.c
+++ b/src/analyze/analyze-unit-files.c
@@ -1,5 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-unit-files.h"
 #include "path-lookup.h"

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 85db567a5becfac5c94521ad21c2a4aaa1c92222..552b03a0d001301316cc407999287c9aa61ae623 100644 (file)
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "conf-files.h"
 #include "constants.h"

diff --git a/src/basic/glyph-util.c b/src/basic/glyph-util.c
index 330872bad37f0d4e861b438c5e52fe2dec3ae57f..87944a13d46005b7c18ef9839e5508c08646ffbf 100644 (file)
--- a/src/basic/glyph-util.c
+++ b/src/basic/glyph-util.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
+
 #include "env-util.h"
 #include "glyph-util.h"
 #include "locale-util.h"

diff --git a/src/basic/log-context.c b/src/basic/log-context.c
index 4ad0864ef7549f67e8adde2a58976d0befffe563..8ab468ed9d86d68bae22e97c5aae4c3d01654205 100644 (file)
--- a/src/basic/log-context.c
+++ b/src/basic/log-context.c
@@ -6,6 +6,7 @@
 #include "iovec-util.h"
 #include "log.h"
 #include "log-context.h"
+#include "string-util.h"
 #include "strv.h"
 
 static int saved_log_context_enabled = -1;

diff --git a/src/basic/log.c b/src/basic/log.c
index 3d2346f686994fa8cabb5622b1cd8e9bb8eaf4dd..982b247326740c0e8c2251b915c3827e13d61a0d 100644 (file)
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -21,6 +21,7 @@
 #include "argv-util.h"
 #include "env-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "iovec-util.h"

diff --git a/src/basic/nulstr-util.c b/src/basic/nulstr-util.c
index 7097a2cc128da1eb5638e26ae1c9459e3d081977..3a98c5e4448ace41899e4438cc0c4cc3e05735cf 100644 (file)
--- a/src/basic/nulstr-util.c
+++ b/src/basic/nulstr-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "nulstr-util.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/basic/strv.c b/src/basic/strv.c
index 76b86cbec8b8bb112279ea54a6f2e7fb24f1f321..67e3d4f4ccf9ec7609ae66d88663c271992d1f1f 100644 (file)
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -405,6 +405,15 @@ int strv_split_newlines_full(char ***ret, const char *s, ExtractFlags flags) {
         return n;
 }
 
+char** strv_split_newlines(const char *s) {
+        char **ret;
+
+        if (strv_split_newlines_full(&ret, s, 0) < 0)
+                return NULL;
+
+        return ret;
+}
+
 int strv_split_full(char ***t, const char *s, const char *separators, ExtractFlags flags) {
         _cleanup_strv_free_ char **l = NULL;
         size_t n = 0;
@@ -440,6 +449,15 @@ int strv_split_full(char ***t, const char *s, const char *separators, ExtractFla
         return (int) n;
 }
 
+char** strv_split(const char *s, const char *separators) {
+        char **ret;
+
+        if (strv_split_full(&ret, s, separators, EXTRACT_RETAIN_ESCAPE) < 0)
+                return NULL;
+
+        return ret;
+}
+
 int strv_split_and_extend_full(char ***t, const char *s, const char *separators, bool filter_duplicates, ExtractFlags flags) {
         char **l;
         int r;
@@ -458,6 +476,10 @@ int strv_split_and_extend_full(char ***t, const char *s, const char *separators,
         return (int) strv_length(*t);
 }
 
+int strv_split_and_extend(char ***t, const char *s, const char *separators, bool filter_duplicates) {
+        return strv_split_and_extend_full(t, s, separators, filter_duplicates, 0);
+}
+
 int strv_split_colon_pairs(char ***t, const char *s) {
         _cleanup_strv_free_ char **l = NULL;
         size_t n = 0;

diff --git a/src/basic/strv.h b/src/basic/strv.h
index 0f2c251fe106bbbeffad2df36d60aa784f8ca1de..08bcaea8b9bdff4c26e5603d95151d23ecbc4ccf 100644 (file)
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -1,17 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <fnmatch.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 
 #include "alloc-util.h"
-#include "extract-word.h"
 #include "hashmap.h"
-#include "macro.h"
-#include "string-util.h"
+#include "memory-util.h"
+
+typedef enum ExtractFlags ExtractFlags;
 
 char* strv_find(char * const *l, const char *name) _pure_;
 char* strv_find_case(char * const *l, const char *name) _pure_;
@@ -113,27 +112,13 @@ static inline bool strv_isempty(char * const *l) {
 }
 
 int strv_split_full(char ***t, const char *s, const char *separators, ExtractFlags flags);
-static inline char** strv_split(const char *s, const char *separators) {
-        char **ret;
-
-        if (strv_split_full(&ret, s, separators, EXTRACT_RETAIN_ESCAPE) < 0)
-                return NULL;
-
-        return ret;
-}
+char** strv_split(const char *s, const char *separators);
 
 int strv_split_and_extend_full(char ***t, const char *s, const char *separators, bool filter_duplicates, ExtractFlags flags);
-#define strv_split_and_extend(t, s, sep, dup) strv_split_and_extend_full(t, s, sep, dup, 0)
+int strv_split_and_extend(char ***t, const char *s, const char *separators, bool filter_duplicates);
 
 int strv_split_newlines_full(char ***ret, const char *s, ExtractFlags flags);
-static inline char** strv_split_newlines(const char *s) {
-        char **ret;
-
-        if (strv_split_newlines_full(&ret, s, 0) < 0)
-                return NULL;
-
-        return ret;
-}
+char** strv_split_newlines(const char *s);
 
 /* Given a string containing white-space separated tuples of words themselves separated by ':',
  * returns a vector of strings. If the second element in a tuple is missing, the corresponding

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 6f1f17b77dfb44d76bc7fca620855645e8e040ff..e59c8c2efe4e34b2d608e9ea93c89d6d719770ca 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -27,6 +27,7 @@
 #include "devnum-util.h"
 #include "env-util.h"
 #include "errno-list.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 59fb371e9fffd6b62baa080f28c48564333d81fd..86c8d71a4a28f7166ecf2f29e9db4dcd01bf1c7a 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -13,6 +13,7 @@
 
 #include "alloc-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 96b8fb270c9818b389f772d2afce94e4caf3c4ef..eed4bac8953a13d888fd43162163344a37b4bf9e 100644 (file)
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -16,6 +16,7 @@
 #include "alloc-util.h"
 #include "chase.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"

diff --git a/src/bootctl/bootctl-status.c b/src/bootctl/bootctl-status.c
index 1dcb8694560e4169bca0be82e7112eb504596d86..6021c1a5aede9b9634ba3ca574786d98f74c054c 100644 (file)
--- a/src/bootctl/bootctl-status.c
+++ b/src/bootctl/bootctl-status.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <sys/mman.h>
 #include <unistd.h>
 

diff --git a/src/core/apparmor-setup.c b/src/core/apparmor-setup.c
index a9621995cab2dbd1e4a469188a9cd665c2517912..2dbb63e603af69c12c84f1a9a247ce865c99a101 100644 (file)
--- a/src/core/apparmor-setup.c
+++ b/src/core/apparmor-setup.c
@@ -3,6 +3,7 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "apparmor-setup.h"
 #include "apparmor-util.h"
 #include "errno-util.h"

diff --git a/src/core/ipe-setup.c b/src/core/ipe-setup.c
index b6ae89e03a76be381b510718edfc582430f03f38..5cc8b9bcccfa64d3bfc9ca15c4d21562031f2dad 100644 (file)
--- a/src/core/ipe-setup.c
+++ b/src/core/ipe-setup.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "conf-files.h"
 #include "copy.h"
 #include "fd-util.h"
@@ -8,6 +9,7 @@
 #include "log.h"
 #include "nulstr-util.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 #define IPE_SECFS_DIR "/sys/kernel/security/ipe"

diff --git a/src/core/manager-dump.c b/src/core/manager-dump.c
index 9cb184b4d2a80007ee1c936f43c2265371e52b41..e781d1912980fe898049c3e8db692badaf5d8606 100644 (file)
--- a/src/core/manager-dump.c
+++ b/src/core/manager-dump.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
 #include "build.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/core/taint.c b/src/core/taint.c
index 541d1bd1339802a04ea3ae8a2a19a355d32728b1..a6b220455c6992c5716df4841024317ab6c1eeda 100644 (file)
--- a/src/core/taint.c
+++ b/src/core/taint.c
@@ -11,6 +11,7 @@
 #include "log.h"
 #include "os-util.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "taint.h"
 #include "uid-range.h"

diff --git a/src/core/unit.c b/src/core/unit.c
index 6eda7b64aa62f27aeb89184d4769906e907559ca..d057b8ddc9faedc4bdcf519c04359227c22f84da 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
+#include <fnmatch.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
 #include <unistd.h>

diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c
index fd57f11f76e89af44402f8fe4021d97a1e21aff4..51e9b705916bdc1cbb872198b2652e05fd30a0c6 100644 (file)
--- a/src/cryptenroll/cryptenroll.c
+++ b/src/cryptenroll/cryptenroll.c
@@ -19,6 +19,7 @@
 #include "devnum-util.h"
 #include "env-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fileio.h"
 #include "libfido2-util.h"
 #include "main-func.h"

diff --git a/src/cryptsetup/cryptsetup-keyfile.c b/src/cryptsetup/cryptsetup-keyfile.c
index 348e42b3f7eff7e5e704b99bdf08b87f80ce9717..d513f5d0a9851f86bafedc7090ac550134f48963 100644 (file)
--- a/src/cryptsetup/cryptsetup-keyfile.c
+++ b/src/cryptsetup/cryptsetup-keyfile.c
@@ -4,6 +4,7 @@
 #include "fileio.h"
 #include "log.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 int find_key_file(const char *key_file, char **search_path, const char *bindname, struct iovec *ret_key) {

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index c591cbeeebf596c06b66cc6735fcc99a01259bfe..f873305637c5f5d029e60ffccaacc48f51973fa4 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -26,6 +26,7 @@
 #include "efi-loader.h"
 #include "env-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fileio.h"
 #include "fs-util.h"
 #include "fstab-util.h"

diff --git a/src/delta/delta.c b/src/delta/delta.c
index eb53999da904126a880bcdcb7ca444ce3a13580c..a6c0a7c1f3081484d7dab1264f9bb58bbf122f79 100644 (file)
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -10,6 +10,7 @@
 #include "chase.h"
 #include "dirent-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "glyph-util.h"

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 6ac292f1408f36383016133fb0d7d82a521221a0..09cc90cf0237b3622e785cf9a77d0a58f32c0980 100644 (file)
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -22,6 +22,7 @@
 #include "dissect-image.h"
 #include "env-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-table.h"

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 31c4c485c0fc55de4f959a5c3cf4b5094cbda4a5..9f4162023bf08c7017a588fcd823cdffb893cad1 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -14,6 +14,7 @@
 #include "creds-util.h"
 #include "efi-loader.h"
 #include "env-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fstab-util.h"

diff --git a/src/fuzz/fuzz-bootspec.c b/src/fuzz/fuzz-bootspec.c
index 561deb5977c1163075892154aca9a88b22aabf3c..e3adb394f7d96770f869e1138e24e56e959dacfb 100644 (file)
--- a/src/fuzz/fuzz-bootspec.c
+++ b/src/fuzz/fuzz-bootspec.c
@@ -4,6 +4,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "bootspec.h"
 #include "env-util.h"
 #include "escape.h"

diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 10e50f20ad8cc30ea44d4e596203756beceda767..3f00810164fe5bbe74ea5e7428ecbbe9784cddec 100644 (file)
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -7,6 +7,7 @@
 #include "alloc-util.h"
 #include "creds-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"

diff --git a/src/home/home-util.c b/src/home/home-util.c
index cb96a7ab4ed2fa1f10dd3e361ce58cd6f0dc8759..2e5343f096690539bb3ce05b2a3f03c8905bb2e2 100644 (file)
--- a/src/home/home-util.c
+++ b/src/home/home-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "dns-domain.h"
 #include "fd-util.h"
 #include "home-util.h"

diff --git a/src/home/homectl-fido2.c b/src/home/homectl-fido2.c
index f4627875955992a461f464dfa076a9e0cd12540e..772edcf95b037648f14c845e946250636898c95e 100644 (file)
--- a/src/home/homectl-fido2.c
+++ b/src/home/homectl-fido2.c
@@ -19,6 +19,7 @@
 #include "log.h"
 #include "memory-util.h"
 #include "random-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 #if HAVE_LIBFIDO2

diff --git a/src/home/homectl.c b/src/home/homectl.c
index 077fe8076ae6a9a607a2f8163755be6e847a545d..8c22066652816ab74db1ad1b0b6004bc2b25f57b 100644 (file)
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -18,6 +18,7 @@
 #include "dirent-util.h"
 #include "dns-domain.h"
 #include "env-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-table.h"

diff --git a/src/home/homed-bus.c b/src/home/homed-bus.c
index 74f1fd702ff4817d69356104c9e3036081941781..5ea50ca66c1e43be8d8a8c9594c544f2a28eb94a 100644 (file)
--- a/src/home/homed-bus.c
+++ b/src/home/homed-bus.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "home-util.h"
 #include "homed-bus.h"

diff --git a/src/home/homed-home-bus.c b/src/home/homed-home-bus.c
index d7cbb7b883c52dee96967453108fff385484a7ad..732f6d5e9a9683eb6ce4a27b015433b541037d4e 100644 (file)
--- a/src/home/homed-home-bus.c
+++ b/src/home/homed-home-bus.c
@@ -2,6 +2,7 @@
 
 #include <linux/capability.h>
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-polkit.h"
 #include "fd-util.h"

diff --git a/src/home/homed-operation.c b/src/home/homed-operation.c
index a0ce2396151d614f1ee31b70de3ad6e0271718c7..ba6e602828c1d1b052e0da8ff6264e2a27ffaf26 100644 (file)
--- a/src/home/homed-operation.c
+++ b/src/home/homed-operation.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "homed-operation.h"
 #include "log.h"

diff --git a/src/home/homework-password-cache.c b/src/home/homework-password-cache.c
index 107a1db3798d33845e21ea00169f215ece38cf2f..5ffe717e2eb891f619711d70732874f72b68777c 100644 (file)
--- a/src/home/homework-password-cache.c
+++ b/src/home/homework-password-cache.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "homework-password-cache.h"
 #include "keyring-util.h"
 #include "log.h"

diff --git a/src/home/homework-pkcs11.c b/src/home/homework-pkcs11.c
index b1b76015b07c8fe61a36ded2b07aac6a88edd03d..42e4976bfb730cb8a3baf39a16f7363e28813f12 100644 (file)
--- a/src/home/homework-pkcs11.c
+++ b/src/home/homework-pkcs11.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "hexdecoct.h"
 #include "homework-pkcs11.h"
 #include "log.h"

diff --git a/src/home/pam_systemd_home.c b/src/home/pam_systemd_home.c
index f32d2fb2822dc1d03bfb604a80fcdfd2782297e1..3bf6ffbae84c430fe9b386978759451bac470ec1 100644 (file)
--- a/src/home/pam_systemd_home.c
+++ b/src/home/pam_systemd_home.c
@@ -6,6 +6,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-locator.h"
 #include "bus-util.h"

diff --git a/src/home/user-record-password-quality.c b/src/home/user-record-password-quality.c
index c60b5f0ea4b57de8cf83698dc540087dba423d5c..4e480b16d247651ac275ad16036db4742a1bf19d 100644 (file)
--- a/src/home/user-record-password-quality.c
+++ b/src/home/user-record-password-quality.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "errno-util.h"
 #include "home-util.h"

diff --git a/src/home/user-record-util.c b/src/home/user-record-util.c
index 7468a7251280e21c8f3634011a1add3cc0a01df6..13c7675faf49cbb4e169b31a847436f2c1c4b569 100644 (file)
--- a/src/home/user-record-util.c
+++ b/src/home/user-record-util.c
@@ -4,6 +4,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "home-util.h"

diff --git a/src/import/import-generator.c b/src/import/import-generator.c
index ad81b72355940e5ee16b07339ecada00fe57b3c2..bee4d7262f8d9ea97cf9829febb5dfebe6159b95 100644 (file)
--- a/src/import/import-generator.c
+++ b/src/import/import-generator.c
@@ -5,6 +5,7 @@
 #include "creds-util.h"
 #include "discover-image.h"
 #include "efivars.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"

diff --git a/src/journal/journalctl-filter.c b/src/journal/journalctl-filter.c
index ba7ec5a3103801b9693c75df83b9eebe0d928d3b..7e739be594fe5e6e01fad2994845820ed313e911 100644 (file)
--- a/src/journal/journalctl-filter.c
+++ b/src/journal/journalctl-filter.c
@@ -2,6 +2,7 @@
 
 #include "sd-device.h"
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "devnum-util.h"
 #include "fileio.h"

diff --git a/src/journal/journalctl-util.c b/src/journal/journalctl-util.c
index 6f393f3ffdcb7c6973fd97fef1794c4b3bc3d423..0e85c520caa8b95e7c4e88128539307e06bd7e82 100644 (file)
--- a/src/journal/journalctl-util.c
+++ b/src/journal/journalctl-util.c
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "glob-util.h"
 #include "id128-util.h"
 #include "journal-util.h"

diff --git a/src/journal/journald-client.c b/src/journal/journald-client.c
index 771b51b9c17a92b623b2b113804a38a1d1711166..25c6401b8f98cb8abfff23549b09f7a7be78c7e1 100644 (file)
--- a/src/journal/journald-client.c
+++ b/src/journal/journald-client.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "cgroup-util.h"
 #include "errno-util.h"
 #include "journald-client.h"

diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c
index 0a62d994bc4582c0cc94d950d871c9fe23bc1823..3774a129c49ac9a4bc0d4a9370201bafc75ed65f 100644 (file)
--- a/src/kernel-install/kernel-install.c
+++ b/src/kernel-install/kernel-install.c
@@ -13,6 +13,7 @@
 #include "env-file.h"
 #include "env-util.h"
 #include "exec-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "find-esp.h"

diff --git a/src/libsystemd-network/sd-dns-resolver.c b/src/libsystemd-network/sd-dns-resolver.c
index ef06573d15f8a09dec9438d1f4a6244cb3d097b6..fc6d6440be367e80faaeb47df58474db1e18b399 100644 (file)
--- a/src/libsystemd-network/sd-dns-resolver.c
+++ b/src/libsystemd-network/sd-dns-resolver.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "dns-resolver-internal.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index e867859bbe685e4f7b0385c1e3ad1ce069857521..b7635a60b6bec21affc794f6162a85a43c316843 100644 (file)
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -16,6 +16,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "io-util.h"

diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
index b72a2463dab4a1a592d2a2b9664ad6cedd1aabd8..d2faff4ae3a9f81ad7698ab2b656e30877271d14 100644 (file)
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
+#include <fnmatch.h>
 #include <unistd.h>
 
 #include "sd-device.h"

diff --git a/src/libsystemd/sd-device/device-filter.c b/src/libsystemd/sd-device/device-filter.c
index 579c9440155e24bad75b36218fdf99905cdaaef0..bf7d4d4be517f398b07b80750e5a34c0ccc7afac 100644 (file)
--- a/src/libsystemd/sd-device/device-filter.c
+++ b/src/libsystemd/sd-device/device-filter.c
@@ -2,6 +2,7 @@
 
 #include <fnmatch.h>
 
+#include "alloc-util.h"
 #include "device-filter.h"
 #include "path-util.h"
 #include "strv.h"

diff --git a/src/libsystemd/sd-device/device-util.c b/src/libsystemd/sd-device/device-util.c
index 123629c35608c1174fee1c88e96f0f9767b0ec4d..b6887217fc918d786e14efb91dfefb946f2d51aa 100644 (file)
--- a/src/libsystemd/sd-device/device-util.c
+++ b/src/libsystemd/sd-device/device-util.c
@@ -148,3 +148,23 @@ bool device_is_devtype(sd_device *device, const char *devtype) {
         (void) sd_device_get_devtype(device, &s);
         return streq_ptr(s, devtype);
 }
+
+bool device_property_can_set(const char *property) {
+        return property &&
+                !STR_IN_SET(property,
+                            /* basic properties set by kernel, only in netlink event */
+                            "ACTION", "SEQNUM", "SYNTH_UUID",
+                            /* basic properties set by kernel, both in netlink event and uevent file */
+                            "DEVPATH", "DEVPATH_OLD", "SUBSYSTEM", "DEVTYPE", "DRIVER", "MODALIAS",
+                            /* device node */
+                            "DEVNAME", "DEVMODE", "DEVUID", "DEVGID", "MAJOR", "MINOR",
+                            /* block device */
+                            "DISKSEQ", "PARTN",
+                            /* network interface (INTERFACE_OLD is set by udevd) */
+                            "IFINDEX", "INTERFACE", "INTERFACE_OLD",
+                            /* basic properties set by udevd */
+                            "DEVLINKS", "TAGS", "CURRENT_TAGS", "USEC_INITIALIZED", "UDEV_DATABASE_VERSION") &&
+                /* Similar to SYNTH_UUID, but set based on KEY=VALUE arguments passed by userspace.
+                 * See kernel's f36776fafbaa0094390dd4e7e3e29805e0b82730 (v4.13) */
+                !startswith(property, "SYNTH_ARG_");
+}

diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h
index 070e564a52cac0671269b856056a6ea7247f256f..6756f225969fcf9e116d1f1b04faf06d705e10e4 100644 (file)
--- a/src/libsystemd/sd-device/device-util.h
+++ b/src/libsystemd/sd-device/device-util.h
@@ -107,22 +107,4 @@ char** device_make_log_fields(sd_device *device);
 bool device_in_subsystem(sd_device *device, const char *subsystem);
 bool device_is_devtype(sd_device *device, const char *devtype);
 
-static inline bool device_property_can_set(const char *property) {
-        return property &&
-                !STR_IN_SET(property,
-                            /* basic properties set by kernel, only in netlink event */
-                            "ACTION", "SEQNUM", "SYNTH_UUID",
-                            /* basic properties set by kernel, both in netlink event and uevent file */
-                            "DEVPATH", "DEVPATH_OLD", "SUBSYSTEM", "DEVTYPE", "DRIVER", "MODALIAS",
-                            /* device node */
-                            "DEVNAME", "DEVMODE", "DEVUID", "DEVGID", "MAJOR", "MINOR",
-                            /* block device */
-                            "DISKSEQ", "PARTN",
-                            /* network interface (INTERFACE_OLD is set by udevd) */
-                            "IFINDEX", "INTERFACE", "INTERFACE_OLD",
-                            /* basic properties set by udevd */
-                            "DEVLINKS", "TAGS", "CURRENT_TAGS", "USEC_INITIALIZED", "UDEV_DATABASE_VERSION") &&
-                /* Similar to SYNTH_UUID, but set based on KEY=VALUE arguments passed by userspace.
-                 * See kernel's f36776fafbaa0094390dd4e7e3e29805e0b82730 (v4.13) */
-                !startswith(property, "SYNTH_ARG_");
-}
+bool device_property_can_set(const char *property);

diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/sd-network/network-util.c
index 25c6e44a7791cdd95eb1a1b5fbba10bb86881470..30b3d041408328b785cd369c3edcdd5b648642a8 100644 (file)
--- a/src/libsystemd/sd-network/network-util.c
+++ b/src/libsystemd/sd-network/network-util.c
@@ -5,6 +5,7 @@
 #include "alloc-util.h"
 #include "network-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
 
 bool network_is_online(void) {

diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index a4b432b6ee2e90306233c23db2bd5fcc755990b4..60213c2fcf5adac27246e02972a27b852e16d441 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -9,6 +9,7 @@
 #include "alloc-util.h"
 #include "env-file.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "inotify-util.h"

diff --git a/src/libsystemd/sd-varlink/sd-varlink-idl.c b/src/libsystemd/sd-varlink/sd-varlink-idl.c
index 06062783d773fe76abf7f3d57d7892a9ee16e4a8..3acb5a0eb6ef01d0b596264ff6c9cd1d9d58bfa4 100644 (file)
--- a/src/libsystemd/sd-varlink/sd-varlink-idl.c
+++ b/src/libsystemd/sd-varlink/sd-varlink-idl.c
@@ -2,6 +2,7 @@
 
 #include "sd-varlink-idl.h"
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "json-util.h"
 #include "log.h"

diff --git a/src/locale/localed-util.c b/src/locale/localed-util.c
index bc0b2b9878413ca7b940652f7e76d392ce1efcce..067d094020911061f07805fc2388772b59d0e27b 100644 (file)
--- a/src/locale/localed-util.c
+++ b/src/locale/localed-util.c
@@ -5,11 +5,13 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "copy.h"
 #include "env-file.h"
 #include "env-file-label.h"
 #include "env-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "kbd-util.h"

diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index 7b1fd1b1480dac9e3a17a675d245d0f49c85c9e6..d0533fc0e25ea51b0b20848fee48324e5497a7ac 100644 (file)
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -34,6 +34,7 @@
 #include "creds-util.h"
 #include "devnum-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"

diff --git a/src/login/pam_systemd_loadkey.c b/src/login/pam_systemd_loadkey.c
index eaaff971da5d6ae32e659313111be9abc7bc824d..cc20820851d72c135b5456cbaf77fb35f10c0c2c 100644 (file)
--- a/src/login/pam_systemd_loadkey.c
+++ b/src/login/pam_systemd_loadkey.c
@@ -13,6 +13,7 @@
 #include "missing_syscall.h"
 #include "nulstr-util.h"
 #include "pam-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 /* By default, this module retrieves the key stored by systemd-cryptsetup.

diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
index ab3d2d8860a9af3f7ada0cc1e749afbb44518362..eb66038c3784ee001b62366f9cb271dd2affd1b9 100644 (file)
--- a/src/network/generator/network-generator.c
+++ b/src/network/generator/network-generator.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hostname-util.h"

diff --git a/src/network/networkctl-config-file.c b/src/network/networkctl-config-file.c
index 7a57b3ff29c2c538b7fbe8e797f37ed961316a8f..776aa5638d1b734d9608169fab8adce6d446f4e9 100644 (file)
--- a/src/network/networkctl-config-file.c
+++ b/src/network/networkctl-config-file.c
@@ -7,12 +7,14 @@
 #include "sd-netlink.h"
 #include "sd-network.h"
 
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
 #include "bus-wait-for-jobs.h"
 #include "conf-files.h"
 #include "edit-util.h"
+#include "extract-word.h"
 #include "log.h"
 #include "mkdir-label.h"
 #include "netlink-util.h"

diff --git a/src/network/networkctl-dump-util.c b/src/network/networkctl-dump-util.c
index ba554ae0418a839eb00a31dc930742728cd05234..a174f8727280b6e506ed2ce32cf10c9473189e1a 100644 (file)
--- a/src/network/networkctl-dump-util.c
+++ b/src/network/networkctl-dump-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "format-ifname.h"
 #include "in-addr-util.h"
 #include "local-addresses.h"

diff --git a/src/network/networkctl-status-link.c b/src/network/networkctl-status-link.c
index ac8b067fcdda5525ad45c698683787be30f616f2..8e504a4c9b2ae9d21f5ca3ae0ad10b92b0158292 100644 (file)
--- a/src/network/networkctl-status-link.c
+++ b/src/network/networkctl-status-link.c
@@ -9,6 +9,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "format-util.h"
 #include "geneve-util.h"
 #include "glyph-util.h"

diff --git a/src/network/networkctl-status-system.c b/src/network/networkctl-status-system.c
index a607e892648e55ba1d9644ee3ee2abf7b3059517..dcd04586775eaa7e055ecefa297e6af6bf8b403e 100644 (file)
--- a/src/network/networkctl-status-system.c
+++ b/src/network/networkctl-status-system.c
@@ -2,6 +2,7 @@
 
 #include "sd-network.h"
 
+#include "alloc-util.h"
 #include "fs-util.h"
 #include "glyph-util.h"
 #include "log.h"

diff --git a/src/network/networkctl-util.c b/src/network/networkctl-util.c
index 68499fc5294d6a90b25437d2cfbbd746b42275fc..08cceb44e883ed1aa1281cdfcb872b935875d51a 100644 (file)
--- a/src/network/networkctl-util.c
+++ b/src/network/networkctl-util.c
@@ -3,6 +3,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "log.h"
 #include "networkctl.h"

diff --git a/src/nspawn/nspawn-bind-user.c b/src/nspawn/nspawn-bind-user.c
index bb5969c425eb8b3e45261b3301f5358032ed393e..d142ec5803768e2090d2377778681bdf8292455a 100644 (file)
--- a/src/nspawn/nspawn-bind-user.c
+++ b/src/nspawn/nspawn-bind-user.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index bd6c9f1fc5ec94616584845bfbc70e0e6cc174cf..cb0ebd3225b080aa5b7aabb51901614d44c0fc08 100644 (file)
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -15,6 +15,7 @@
 #include "device-private.h"
 #include "device-util.h"
 #include "ether-addr-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "hexdecoct.h"
 #include "lock-util.h"

diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 950582b225bac885ead3d618005530ba8912dc73..51db3cade343ed3319c9a72d74199c54af02b117 100644 (file)
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -7,6 +7,7 @@
 #include "alloc-util.h"
 #include "constants.h"
 #include "errno.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"

diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c
index 474b8d45cf6de7d64d187605ef93a81cc4890bee..7b9908b89eb8a1f2c4f3f22219e7617cd071ad8f 100644 (file)
--- a/src/nss-systemd/nss-systemd.c
+++ b/src/nss-systemd/nss-systemd.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <threads.h>
 
+#include "alloc-util.h"
 #include "env-util.h"
 #include "errno-util.h"
 #include "fd-util.h"

diff --git a/src/resolve/resolved-util.c b/src/resolve/resolved-util.c
index 003f07a6d5decd7470e8fb8d79e313454c9dcf94..8b7f0ed44a4219db844054e33e65b0bab5ba27bb 100644 (file)
--- a/src/resolve/resolved-util.c
+++ b/src/resolve/resolved-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "dns-def.h"
 #include "dns-domain.h"
 #include "hostname-setup.h"

diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 3c9fe0d45c4c855828150928d2280d99aa00b276..db3341d083f36c1b17142a212dde677beef427a6 100644 (file)
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -8,6 +8,7 @@
 #include "acl-util.h"
 #include "alloc-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "log.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 467fce9d6b2c43bb63c5de57e0023e278927782f..15021ae2510e41b1b7cdf5061c7751c029cd851e 100644 (file)
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <unistd.h>
 
 #include "bootspec.h"

diff --git a/src/shared/bus-object.c b/src/shared/bus-object.c
index 44984a4504cf4eccf95eccf8a58d2bee7021cab4..1fa97a1ff2b60af59e6deabd4f44d658eab8e85a 100644 (file)
--- a/src/shared/bus-object.c
+++ b/src/shared/bus-object.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bus-introspect.h"
 #include "bus-object.h"
 #include "log.h"

diff --git a/src/shared/bus-print-properties.c b/src/shared/bus-print-properties.c
index 88e83497d3c84305bd3149a01cc8f855c3862a9e..9ac6ddb3a9c64c3622f2ebfe221cf10bf5298e39 100644 (file)
--- a/src/shared/bus-print-properties.c
+++ b/src/shared/bus-print-properties.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bus-print-properties.h"
 #include "cap-list.h"
 #include "cgroup-util.h"

diff --git a/src/shared/bus-wait-for-units.c b/src/shared/bus-wait-for-units.c
index 260b84ada09205aa8b7a5a9061a3d08306864024..8cb2d8ded4d858f9c7cf72b691468ce22f53120b 100644 (file)
--- a/src/shared/bus-wait-for-units.c
+++ b/src/shared/bus-wait-for-units.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-map-properties.h"
 #include "bus-wait-for-units.h"

diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 1e90cc2a1c053253993c61e3664e22fcd84535b3..f4afa746d5d13480c30afca92980a3db865ed13f 100644 (file)
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -13,6 +13,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "clean-ipc.h"
 #include "dirent-util.h"
 #include "fd-util.h"

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index db7cbd44b3bdd4dbb4892ab6ea829fe43e63effc..7d04e23cd24fe4ca11877817db9d7cc55a797e45 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -4,6 +4,7 @@
 #include <valgrind/memcheck.h>
 #endif
 
+#include <fnmatch.h>
 #include <linux/dm-ioctl.h>
 #include <linux/loop.h>
 #include <sys/file.h>
@@ -43,6 +44,7 @@
 #include "env-file.h"
 #include "env-util.h"
 #include "extension-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

diff --git a/src/shared/fdisk-util.c b/src/shared/fdisk-util.c
index 3414572c31c364a2408173650f758b19d989bd47..bca81b30a0f0111d4f17cf58d967b30f2364c255 100644 (file)
--- a/src/shared/fdisk-util.c
+++ b/src/shared/fdisk-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "dissect-image.h"
 #include "extract-word.h"

diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index b59e4838d806d4398659baf0c690ec1156a851c3..82458536c57991a13e3a7f2921627b4472c59e4d 100644 (file)
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -7,6 +7,7 @@
 #include "alloc-util.h"
 #include "device-nodes.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fstab-util.h"
 #include "initrd-util.h"
 #include "libmount-util.h"

diff --git a/src/shared/group-record.c b/src/shared/group-record.c
index 36dc1397dfad0d5313b830798a27d15e78381084..f7dd3b73a40155fe5dfbc96ebb499c6ecd41f6a3 100644 (file)
--- a/src/shared/group-record.c
+++ b/src/shared/group-record.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "group-record.h"
 #include "json-util.h"

diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index d62e803a37ea4334812bc849ee4c0ec13e954038..501338f188adbcf0d5f20bd08b8346bac106fad2 100644 (file)
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "format-util.h"
 #include "install.h"
 #include "install-printf.h"

diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c
index 9fea61ff8255588b234d928ad0d73465c4be0fe8..73c582475e32dc7274188eb440d430578e99c7aa 100644 (file)
--- a/src/shared/journal-util.c
+++ b/src/shared/journal-util.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "acl-util.h"
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"

diff --git a/src/shared/kbd-util.c b/src/shared/kbd-util.c
index fa06d8a96532a003aa1888cbfc47a7b2b3de13c8..84031df78435431cabf9c7ad1157a78de595778d 100644 (file)
--- a/src/shared/kbd-util.c
+++ b/src/shared/kbd-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "env-util.h"
 #include "errno-util.h"
 #include "kbd-util.h"

diff --git a/src/shared/libfido2-util.c b/src/shared/libfido2-util.c
index 4e65b13548c73205b94fa4a7a370d2eb1c1c83d6..f01b0016d48d77c2decc0888480e401556d4c943 100644 (file)
--- a/src/shared/libfido2-util.c
+++ b/src/shared/libfido2-util.c
@@ -12,6 +12,7 @@
 #include "glyph-util.h"
 #include "memory-util.h"
 #include "plymouth-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "unistd.h"
 

diff --git a/src/shared/locale-setup.c b/src/shared/locale-setup.c
index f3a10c5d828f3ebab7e9a88d48035da369a0eec8..3f23741bd777f88ab888cf156f6815aadb9abf29 100644 (file)
--- a/src/shared/locale-setup.c
+++ b/src/shared/locale-setup.c
@@ -3,6 +3,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "env-file.h"
 #include "env-file-label.h"
 #include "env-util.h"

diff --git a/src/shared/net-condition.c b/src/shared/net-condition.c
index d8b0fef322092569709c4e67b9dfe524990b176a..9c55be0526e034eb483842c6de7ac648957ba5e0 100644 (file)
--- a/src/shared/net-condition.c
+++ b/src/shared/net-condition.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <netinet/ether.h>
 
 #include "condition.h"

diff --git a/src/shared/password-quality-util-pwquality.c b/src/shared/password-quality-util-pwquality.c
index 30d15fd45e765dcbff84d96064aa0cfc75a6ce4e..f4aabd3510b390a6b68f6e4808df13b90b13285d 100644 (file)
--- a/src/shared/password-quality-util-pwquality.c
+++ b/src/shared/password-quality-util-pwquality.c
@@ -2,12 +2,14 @@
 
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "dlfcn-util.h"
 #include "errno-util.h"
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "password-quality-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 #if HAVE_PWQUALITY

diff --git a/src/shared/pcrextend-util.c b/src/shared/pcrextend-util.c
index 6e1f0f04f2699b4c4fbfa9ff40c31cbc7e3a75ba..dcd9b4ce914b45c6eb3d01634b88894ddb50bdf5 100644 (file)
--- a/src/shared/pcrextend-util.c
+++ b/src/shared/pcrextend-util.c
@@ -2,6 +2,7 @@
 
 #include "sd-device.h"
 
+#include "alloc-util.h"
 #include "blkid-util.h"
 #include "blockdev-util.h"
 #include "chase.h"

diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 947ef582bd6b619bd9baf57ffbb0353e875a67ed..53f90aae273aac9b8f7d9c2063375a9b79557452 100644 (file)
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -8,6 +8,7 @@
 #include "device-util.h"
 #include "devnum-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hibernate-util.h"

diff --git a/src/shared/tests.h b/src/shared/tests.h
index b19bad439569560a61244c5fbe126b41c38b7455..19a8dd033f36e67448f333106745cba97bd32943 100644 (file)
--- a/src/shared/tests.h
+++ b/src/shared/tests.h
@@ -9,6 +9,7 @@
 
 #include "argv-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "log.h"
 #include "macro.h"
 #include "process-util.h"

diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c
index 83a8c45032c93f3017906c8c0e280a81a07238be..c0f695b9bb4fd50c8e84a159d49b1eaa6d8391cb 100644 (file)
--- a/src/shared/unit-file.c
+++ b/src/shared/unit-file.c
@@ -2,6 +2,7 @@
 
 #include "sd-id128.h"
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "dirent-util.h"
 #include "fd-util.h"

diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c
index 5d8ce765e8f3a68168d5e1b8bf67fe480641fb98..404003d18ef00f818580a2f3ec063d77f3e7709c 100644 (file)
--- a/src/shared/user-record-nss.c
+++ b/src/shared/user-record-nss.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "format-util.h"
 #include "libcrypt-util.h"

diff --git a/src/shared/user-record.c b/src/shared/user-record.c
index 10b05048988789cc86eab37cbaf1cb30a6592937..2dd590110e34d3f06125cfad651a27a320a2d296 100644 (file)
--- a/src/shared/user-record.c
+++ b/src/shared/user-record.c
@@ -2,6 +2,7 @@
 
 #include <sys/mount.h>
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "cap-list.h"
 #include "cgroup-util.h"

diff --git a/src/shared/userdb-dropin.c b/src/shared/userdb-dropin.c
index 20c89bb5730b40ab4a8802f4095114972942d12c..176cdddaafd53944ad0f5af07cfba7102710e19f 100644 (file)
--- a/src/shared/userdb-dropin.c
+++ b/src/shared/userdb-dropin.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index 69d4ddf48511e4a382d725fd4bc678c26cc77ca5..210aab641e99e5a475f6e11cac28f2a6112d2b89 100644 (file)
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -4,6 +4,7 @@
 
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "conf-files.h"
 #include "dirent-util.h"

diff --git a/src/shared/varlink-io.systemd.service.c b/src/shared/varlink-io.systemd.service.c
index d130f0df51a5e441c0d69882a00d25c792d54b27..21c44a96b74163a327e0aa1783a4107aebbb2191 100644 (file)
--- a/src/shared/varlink-io.systemd.service.c
+++ b/src/shared/varlink-io.systemd.service.c
@@ -5,6 +5,7 @@
 #include "env-util.h"
 #include "json-util.h"
 #include "log.h"
+#include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "varlink-io.systemd.service.h"

diff --git a/src/shared/vconsole-util.c b/src/shared/vconsole-util.c
index 9451db84046ca6eb274c57c96d60bbe18e04b365..4b722faeab1e99aed2e53276d33e157d843879ac 100644 (file)
--- a/src/shared/vconsole-util.c
+++ b/src/shared/vconsole-util.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "env-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "kbd-util.h"

diff --git a/src/shared/verb-log-control.c b/src/shared/verb-log-control.c
index 555fb9ff7cd44498213775c63b06d2bee2fc4beb..d6748f749227c36172e81afb03764538dbdc1d1a 100644 (file)
--- a/src/shared/verb-log-control.c
+++ b/src/shared/verb-log-control.c
@@ -3,6 +3,7 @@
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "log.h"
+#include "string-util.h"
 #include "strv.h"
 #include "syslog-util.h"
 #include "verb-log-control.h"

diff --git a/src/shared/vpick.c b/src/shared/vpick.c
index ccde661ca5230936ab756883b72d73c287b857ac..9aa1bc6d58261161420a3dbe3283e09d2def0caf 100644 (file)
--- a/src/shared/vpick.c
+++ b/src/shared/vpick.c
@@ -2,6 +2,7 @@
 
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "architecture.h"
 #include "bitfield.h"
 #include "chase.h"

diff --git a/src/shared/wall.c b/src/shared/wall.c
index eed7c652dd709e696e7c6001b0a11329065f3afc..f936ba97d9dc7441aae9c1367ab0cbcdeb9819c3 100644 (file)
--- a/src/shared/wall.c
+++ b/src/shared/wall.c
@@ -6,6 +6,7 @@
 
 #include "sd-login.h"
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "hostname-setup.h"

diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index 815eb158e8c936cf275d9c46fa1afce6b6a24dd8..f00ff25ab20a7f6ad40dc82782a6302145d99a2d 100644 (file)
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -9,6 +9,7 @@
 
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "devnum-util.h"
 #include "errno-util.h"
 #include "fd-util.h"

diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c
index 8e15608f143776d6b27182ea9c6ce068d454c0ad..99ceeb667ad387b6bf39255a994dcf744eb638f2 100644 (file)
--- a/src/ssh-generator/ssh-generator.c
+++ b/src/ssh-generator/ssh-generator.c
@@ -16,6 +16,7 @@
 #include "socket-netlink.h"
 #include "socket-util.h"
 #include "special.h"
+#include "string-util.h"
 #include "virt.h"
 
 /* A small generator binding potentially five or more SSH sockets:

diff --git a/src/systemctl/systemctl-list-jobs.c b/src/systemctl/systemctl-list-jobs.c
index 6420365bad8fb5fa5f2f52d8c750ef9b1e185973..80696aabf31099b5aec50803c98ac4eed5cf437a 100644 (file)
--- a/src/systemctl/systemctl-list-jobs.c
+++ b/src/systemctl/systemctl-list-jobs.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
 #include "ansi-color.h"
 #include "bus-error.h"
 #include "bus-locator.h"

diff --git a/src/systemctl/systemctl-list-machines.c b/src/systemctl/systemctl-list-machines.c
index cc053504a0dff392ca15a78563044acd828d295b..25c7c6f3578e2c4cbd05e5da352c399e8f8a49f3 100644 (file)
--- a/src/systemctl/systemctl-list-machines.c
+++ b/src/systemctl/systemctl-list-machines.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <unistd.h>
 
 #include "sd-login.h"

diff --git a/src/systemctl/systemctl-list-unit-files.c b/src/systemctl/systemctl-list-unit-files.c
index 40e0b46cfc339e0036af79a4c897f40e2272368b..2b6f9ddd2dcbdc54ad3ed62207d511ea5b67e145 100644 (file)
--- a/src/systemctl/systemctl-list-unit-files.c
+++ b/src/systemctl/systemctl-list-unit-files.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
 #include "ansi-color.h"
 #include "bus-error.h"
 #include "bus-locator.h"

diff --git a/src/systemctl/systemctl-mount.c b/src/systemctl/systemctl-mount.c
index 6b51983fe9b07cd374e8a512850fd67ca17740c2..9a44fe158d19e4c558aba3e2f64877c15ef3bbd8 100644 (file)
--- a/src/systemctl/systemctl-mount.c
+++ b/src/systemctl/systemctl-mount.c
@@ -3,6 +3,7 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "dissect-image.h"
+#include "extract-word.h"
 #include "systemctl.h"
 #include "systemctl-mount.h"
 #include "systemctl-util.h"

diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c
index 9a3944fcf6679dc9bee1e146408270b7ce470646..f81ca267ad5d39c690c1bd9a2c21d6bc96a322c6 100644 (file)
--- a/src/systemctl/systemctl-util.c
+++ b/src/systemctl/systemctl-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <sys/reboot.h>
 #include <unistd.h>
 

diff --git a/src/sysupdate/sysupdate-transfer.c b/src/sysupdate/sysupdate-transfer.c
index bd54c398eba729671970c47ba2af055062a1f5a5..0247864eca448ead1890f32ff065111c2286a0b9 100644 (file)
--- a/src/sysupdate/sysupdate-transfer.c
+++ b/src/sysupdate/sysupdate-transfer.c
@@ -9,6 +9,7 @@
 #include "conf-parser.h"
 #include "dirent-util.h"
 #include "event-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "glyph-util.h"
 #include "gpt.h"

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index ef476280fa6ce4bb2c86792da5ec34b370846ae3..5ba680d571e6adfd3d2c6c102a9a4a3d925e388b 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <linux/prctl.h>
 #include <stdio.h>
 #include <sys/mount.h>

diff --git a/src/test/test-hostname-setup.c b/src/test/test-hostname-setup.c
index 9348313984eb46a5f71a21957264df913ebabd81..fbb7de3689ccd33e959e65d21c20699efd1a2cab 100644 (file)
--- a/src/test/test-hostname-setup.c
+++ b/src/test/test-hostname-setup.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <unistd.h>
 
 #include "alloc-util.h"

diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 63d30afe8f38a1d78cdccd4768bbf8182cb6f018..7c06e06bb43c3a3c1fa1383c11bb609f638ef052 100644 (file)
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
 #include "alloc-util.h"
 #include "escape.h"
 #include "string-util.h"

diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index b5e6f23c1b297ca1c4949f89aacd4a7b45971e7e..b598eb8bc069012750d6ea408cd2a28e903d385f 100644 (file)
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/src/udev/iocost/iocost.c b/src/udev/iocost/iocost.c
index 2b2633e3c2bb071a69a43782f978bbcb1a66f784..2598975cae8516aee0715e6991d9463f7070a58b 100644 (file)
--- a/src/udev/iocost/iocost.c
+++ b/src/udev/iocost/iocost.c
@@ -16,6 +16,7 @@
 #include "main-func.h"
 #include "path-util.h"
 #include "pretty-print.h"
+#include "string-util.h"
 #include "udev-util.h"
 #include "verbs.h"
 

diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 692b244cb8124f5ac7e5afc06a35b7e2fa4941ab..103e4a39dbd38028c416d52f9a850e1494f2904a 100644 (file)
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -6,6 +6,7 @@
 #include "bitfield.h"
 #include "device-private.h"
 #include "device-util.h"
+#include "extract-word.h"
 #include "string-util.h"
 #include "strv.h"
 #include "udev-builtin.h"

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 69465984e0a6a3ac0c8e069b556186b9f0da1c07..506b49aa217cf8a49cb443fb47aecae93e1ec861 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <ctype.h>
+#include <fnmatch.h>
 
 #include "alloc-util.h"
 #include "architecture.h"
@@ -12,6 +13,7 @@
 #include "device-util.h"
 #include "dirent-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"

diff --git a/src/udev/udev-spawn.c b/src/udev/udev-spawn.c
index 62db775250311037822f9eedf28e28d62eab0cf2..0e3ff2e104644679f915e76d8e13cc5afba1ff0e 100644 (file)
--- a/src/udev/udev-spawn.c
+++ b/src/udev/udev-spawn.c
@@ -7,6 +7,7 @@
 #include "device-util.h"
 #include "event-util.h"
 #include "exec-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 9735632704c217ded63eed8f718780c7b1c61c9b..c8cdb17ab2b2fa5de7fa59c89f86251eb70bd1b0 100644 (file)
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -20,6 +20,7 @@
 #include "devnum-util.h"
 #include "dirent-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "glyph-util.h"

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 35bf5fffb7099b9790e3c822ea58b09a9b4ef889..8f808b33e165fe7245a704d1148b52fe7e4286c4 100644 (file)
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -9,6 +9,7 @@
 #include "alloc-util.h"
 #include "argv-util.h"
 #include "cryptsetup-util.h"
+#include "extract-word.h"
 #include "fileio.h"
 #include "fstab-util.h"
 #include "hexdecoct.h"

diff --git a/src/vmspawn/vmspawn-util.c b/src/vmspawn/vmspawn-util.c
index 5700a0c893c31889a094566efd309be875db4098..3fb8f8405b336456daa9b013cd25891201644a99 100644 (file)
--- a/src/vmspawn/vmspawn-util.c
+++ b/src/vmspawn/vmspawn-util.c
@@ -6,6 +6,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "architecture.h"
 #include "conf-files.h"
 #include "errno-util.h"

diff --git a/src/xdg-autostart-generator/xdg-autostart-condition.c b/src/xdg-autostart-generator/xdg-autostart-condition.c
index 2f0710060a9b7e4f761bc4121f76e91953be142b..b822ab5aab19d8a2f05eef8b3e827c5d5cd92e24 100644 (file)
--- a/src/xdg-autostart-generator/xdg-autostart-condition.c
+++ b/src/xdg-autostart-generator/xdg-autostart-condition.c
@@ -2,6 +2,7 @@
 
 #include "log.h"
 #include "main-func.h"
+#include "string-util.h"
 #include "strv.h"
 
 /*

diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c
index a00b9d30634261376ed60fbfd748ad915ae01159..23c6fb01ef29823b00d8fdcf9d110e6d67acd04c 100644 (file)
--- a/src/xdg-autostart-generator/xdg-autostart-service.c
+++ b/src/xdg-autostart-generator/xdg-autostart-service.c
@@ -1,11 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
+#include <fnmatch.h>
 #include <stdio.h>
 #include <unistd.h>
 
 #include "conf-parser.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"