From: Daan De Meyer Date: Mon, 5 May 2025 11:27:39 +0000 (+0200) Subject: strv: Reduce transitive includes X-Git-Tag: v258-rc1~672^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6553db6063b6419c0bb157ca1148ad999aaa26a0;p=thirdparty%2Fsystemd.git strv: Reduce transitive includes --- diff --git a/src/analyze/analyze-calendar.c b/src/analyze/analyze-calendar.c index b3afa1d4b0c..21e7c79c809 100644 --- 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 43ca408af0e..01e49965f8e 100644 --- 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 b93bf4a9a5b..4a87c0c1f1b 100644 --- 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 01ee241fc90..8eb09dbd15b 100644 --- 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 8ec542ec7a2..4ba12ad3e38 100644 --- 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 0f78729c3ac..df12f3b36fc 100644 --- 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 0dc562b5960..5e0df52aafa 100644 --- 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 e9d82bbbd36..8deffe90f18 100644 --- 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 b9522ca49d7..593d6afb200 100644 --- 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 89198dff2d3..ccc7dadbc1b 100644 --- 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 8135112dec4..390b1d8e7ee 100644 --- 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 e0c4867c78d..e00c157abca 100644 --- 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 + +#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 85db567a5be..552b03a0d00 100644 --- a/src/basic/conf-files.c +++ b/src/basic/conf-files.c @@ -5,6 +5,7 @@ #include #include +#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 330872bad37..87944a13d46 100644 --- 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 + #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 4ad0864ef75..8ab468ed9d8 100644 --- 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 3d2346f6869..982b2473267 100644 --- 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 7097a2cc128..3a98c5e4448 100644 --- 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 76b86cbec8b..67e3d4f4ccf 100644 --- 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 0f2c251fe10..08bcaea8b9b 100644 --- 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 #include #include #include #include #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 6f1f17b77df..e59c8c2efe4 100644 --- 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 59fb371e9ff..86c8d71a4a2 100644 --- 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 96b8fb270c9..eed4bac8953 100644 --- 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 1dcb8694560..6021c1a5aed 100644 --- 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 #include #include diff --git a/src/core/apparmor-setup.c b/src/core/apparmor-setup.c index a9621995cab..2dbb63e603a 100644 --- a/src/core/apparmor-setup.c +++ b/src/core/apparmor-setup.c @@ -3,6 +3,7 @@ #include #include +#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 b6ae89e03a7..5cc8b9bcccf 100644 --- 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 9cb184b4d2a..e781d191298 100644 --- 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 + #include "build.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/core/taint.c b/src/core/taint.c index 541d1bd1339..a6b220455c6 100644 --- 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 6eda7b64aa6..d057b8ddc9f 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include #include diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c index fd57f11f76e..51e9b705916 100644 --- 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 348e42b3f7e..d513f5d0a98 100644 --- 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 c591cbeeebf..f873305637c 100644 --- 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 eb53999da90..a6c0a7c1f30 100644 --- 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 6ac292f1408..09cc90cf023 100644 --- 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 31c4c485c0f..9f4162023bf 100644 --- 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 561deb5977c..e3adb394f7d 100644 --- 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 10e50f20ad8..3f00810164f 100644 --- 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 cb96a7ab4ed..2e5343f0966 100644 --- 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 f4627875955..772edcf95b0 100644 --- 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 077fe8076ae..8c220666528 100644 --- 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 74f1fd702ff..5ea50ca66c1 100644 --- 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 d7cbb7b883c..732f6d5e9a9 100644 --- a/src/home/homed-home-bus.c +++ b/src/home/homed-home-bus.c @@ -2,6 +2,7 @@ #include +#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 a0ce2396151..ba6e602828c 100644 --- 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 107a1db3798..5ffe717e2eb 100644 --- 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 b1b76015b07..42e4976bfb7 100644 --- 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 f32d2fb2822..3bf6ffbae84 100644 --- 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 c60b5f0ea4b..4e480b16d24 100644 --- 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 7468a725128..13c7675faf4 100644 --- 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 ad81b723559..bee4d7262f8 100644 --- 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 ba7ec5a3103..7e739be594f 100644 --- 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 6f393f3ffdc..0e85c520caa 100644 --- 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 #include +#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 771b51b9c17..25c6401b8f9 100644 --- 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 0a62d994bc4..3774a129c49 100644 --- 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 ef06573d15f..fc6d6440be3 100644 --- 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 e867859bbe6..b7635a60b6b 100644 --- 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 b72a2463dab..d2faff4ae3a 100644 --- 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 +#include #include #include "sd-device.h" diff --git a/src/libsystemd/sd-device/device-filter.c b/src/libsystemd/sd-device/device-filter.c index 579c9440155..bf7d4d4be51 100644 --- a/src/libsystemd/sd-device/device-filter.c +++ b/src/libsystemd/sd-device/device-filter.c @@ -2,6 +2,7 @@ #include +#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 123629c3560..b6887217fc9 100644 --- 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 070e564a52c..6756f225969 100644 --- 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 25c6e44a779..30b3d041408 100644 --- 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 a4b432b6ee2..60213c2fcf5 100644 --- 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 06062783d77..3acb5a0eb6e 100644 --- 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 bc0b2b98784..067d0940209 100644 --- a/src/locale/localed-util.c +++ b/src/locale/localed-util.c @@ -5,11 +5,13 @@ #include #include +#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 7b1fd1b1480..d0533fc0e25 100644 --- 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 eaaff971da5..cc20820851d 100644 --- 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 ab3d2d8860a..eb66038c378 100644 --- 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 7a57b3ff29c..776aa5638d1 100644 --- 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 ba554ae0418..a174f872728 100644 --- 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 ac8b067fcdd..8e504a4c9b2 100644 --- 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 a607e892648..dcd04586775 100644 --- 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 68499fc5294..08cceb44e88 100644 --- a/src/network/networkctl-util.c +++ b/src/network/networkctl-util.c @@ -3,6 +3,7 @@ #include #include +#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 bb5969c425e..d142ec58037 100644 --- 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 bd6c9f1fc5e..cb0ebd3225b 100644 --- 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 950582b225b..51db3cade34 100644 --- 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 474b8d45cf6..7b9908b89eb 100644 --- a/src/nss-systemd/nss-systemd.c +++ b/src/nss-systemd/nss-systemd.c @@ -5,6 +5,7 @@ #include #include +#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 003f07a6d5d..8b7f0ed44a4 100644 --- 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 3c9fe0d45c4..db3341d083f 100644 --- 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 467fce9d6b2..15021ae2510 100644 --- a/src/shared/bootspec.c +++ b/src/shared/bootspec.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "bootspec.h" diff --git a/src/shared/bus-object.c b/src/shared/bus-object.c index 44984a4504c..1fa97a1ff2b 100644 --- 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 88e83497d3c..9ac6ddb3a9c 100644 --- 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 260b84ada09..8cb2d8ded4d 100644 --- 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 1e90cc2a1c0..f4afa746d5d 100644 --- a/src/shared/clean-ipc.c +++ b/src/shared/clean-ipc.c @@ -13,6 +13,7 @@ #include #include +#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 db7cbd44b3b..7d04e23cd24 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -4,6 +4,7 @@ #include #endif +#include #include #include #include @@ -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 3414572c31c..bca81b30a0f 100644 --- 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 b59e4838d80..82458536c57 100644 --- 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 36dc1397dfa..f7dd3b73a40 100644 --- 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 d62e803a37e..501338f188a 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -4,6 +4,7 @@ #include #include +#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 9fea61ff825..73c582475e3 100644 --- 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 fa06d8a9653..84031df7843 100644 --- 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 4e65b13548c..f01b0016d48 100644 --- 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 f3a10c5d828..3f23741bd77 100644 --- a/src/shared/locale-setup.c +++ b/src/shared/locale-setup.c @@ -3,6 +3,7 @@ #include #include +#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 d8b0fef3220..9c55be0526e 100644 --- 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 #include #include "condition.h" diff --git a/src/shared/password-quality-util-pwquality.c b/src/shared/password-quality-util-pwquality.c index 30d15fd45e7..f4aabd3510b 100644 --- a/src/shared/password-quality-util-pwquality.c +++ b/src/shared/password-quality-util-pwquality.c @@ -2,12 +2,14 @@ #include +#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 6e1f0f04f26..dcd9b4ce914 100644 --- 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 947ef582bd6..53f90aae273 100644 --- 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 b19bad43956..19a8dd033f3 100644 --- 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 83a8c45032c..c0f695b9bb4 100644 --- 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 5d8ce765e8f..404003d18ef 100644 --- 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 10b05048988..2dd590110e3 100644 --- a/src/shared/user-record.c +++ b/src/shared/user-record.c @@ -2,6 +2,7 @@ #include +#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 20c89bb5730..176cdddaafd 100644 --- 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 69d4ddf4851..210aab641e9 100644 --- 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 d130f0df51a..21c44a96b74 100644 --- 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 9451db84046..4b722faeab1 100644 --- 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 555fb9ff7cd..d6748f74922 100644 --- 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 ccde661ca52..9aa1bc6d582 100644 --- a/src/shared/vpick.c +++ b/src/shared/vpick.c @@ -2,6 +2,7 @@ #include +#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 eed7c652dd7..f936ba97d9d 100644 --- 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 815eb158e8c..f00ff25ab20 100644 --- 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 8e15608f143..99ceeb667ad 100644 --- 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 6420365bad8..80696aabf31 100644 --- 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 + #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 cc053504a0d..25c7c6f3578 100644 --- 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 #include #include "sd-login.h" diff --git a/src/systemctl/systemctl-list-unit-files.c b/src/systemctl/systemctl-list-unit-files.c index 40e0b46cfc3..2b6f9ddd2dc 100644 --- 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 + #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 6b51983fe9b..9a44fe158d1 100644 --- 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 9a3944fcf66..f81ca267ad5 100644 --- 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 #include #include diff --git a/src/sysupdate/sysupdate-transfer.c b/src/sysupdate/sysupdate-transfer.c index bd54c398eba..0247864eca4 100644 --- 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 ef476280fa6..5ba680d571e 100644 --- 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 #include #include #include diff --git a/src/test/test-hostname-setup.c b/src/test/test-hostname-setup.c index 9348313984e..fbb7de3689c 100644 --- 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 #include #include "alloc-util.h" diff --git a/src/test/test-strv.c b/src/test/test-strv.c index 63d30afe8f3..7c06e06bb43 100644 --- 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 + #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 b5e6f23c1b2..b598eb8bc06 100644 --- 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 #include #include diff --git a/src/udev/iocost/iocost.c b/src/udev/iocost/iocost.c index 2b2633e3c2b..2598975cae8 100644 --- 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 692b244cb81..103e4a39dbd 100644 --- 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 69465984e0a..506b49aa217 100644 --- 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 +#include #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 62db7752503..0e3ff2e1046 100644 --- 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 9735632704c..c8cdb17ab2b 100644 --- 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 35bf5fffb70..8f808b33e16 100644 --- 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 5700a0c893c..3fb8f8405b3 100644 --- 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 2f0710060a9..b822ab5aab1 100644 --- 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 a00b9d30634..23c6fb01ef2 100644 --- 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 +#include #include #include #include "conf-parser.h" #include "escape.h" +#include "extract-word.h" #include "fd-util.h" #include "fileio.h" #include "generator.h"