From: Daan De Meyer Date: Mon, 5 May 2025 11:32:55 +0000 (+0200) Subject: device-util: Reduce transitive includes X-Git-Tag: v258-rc1~672^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e548ca38b91888e66e7ff6e477826f1fd215a3d8;p=thirdparty%2Fsystemd.git device-util: Reduce transitive includes --- diff --git a/src/libsystemd/sd-device/device-util.c b/src/libsystemd/sd-device/device-util.c index b6887217fc9..b0475c5ca34 100644 --- a/src/libsystemd/sd-device/device-util.c +++ b/src/libsystemd/sd-device/device-util.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "alloc-util.h" #include "device-private.h" #include "device-util.h" #include "devnum-util.h" diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h index 6756f225969..0a740ede32f 100644 --- a/src/libsystemd/sd-device/device-util.h +++ b/src/libsystemd/sd-device/device-util.h @@ -10,7 +10,6 @@ #include "alloc-util.h" #include "log.h" #include "macro.h" -#include "strv.h" #define device_unref_and_replace(a, b) \ unref_and_replace_full(a, b, sd_device_ref, sd_device_unref) @@ -107,4 +106,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); -bool device_property_can_set(const char *property); +bool device_property_can_set(const char *property) _pure_; diff --git a/src/shared/blockdev-list.c b/src/shared/blockdev-list.c index 120f7201df8..d38f1e4b2cc 100644 --- a/src/shared/blockdev-list.c +++ b/src/shared/blockdev-list.c @@ -7,6 +7,7 @@ #include "blockdev-util.h" #include "device-util.h" #include "macro.h" +#include "strv.h" #include "terminal-util.h" int blockdev_list(BlockDevListFlags flags) { diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c index 978ce42341c..47cf4df98de 100644 --- a/src/shared/netif-util.c +++ b/src/shared/netif-util.c @@ -3,6 +3,7 @@ #include #include +#include "alloc-util.h" #include "arphrd-util.h" #include "device-util.h" #include "hexdecoct.h" diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c index d3dabf13ebe..6b931a60d83 100644 --- a/src/shared/udev-util.c +++ b/src/shared/udev-util.c @@ -19,6 +19,7 @@ #include "signal-util.h" #include "stat-util.h" #include "string-util.h" +#include "strv.h" #include "udev-util.h" #include "utf8.h" diff --git a/src/sleep/battery-capacity.c b/src/sleep/battery-capacity.c index 5667a592232..7ddef523502 100644 --- a/src/sleep/battery-capacity.c +++ b/src/sleep/battery-capacity.c @@ -2,6 +2,7 @@ #include "sd-device.h" +#include "alloc-util.h" #include "battery-capacity.h" #include "battery-util.h" #include "device-private.h" diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c index 4bc69178874..2af2ee47406 100644 --- a/src/storagetm/storagetm.c +++ b/src/storagetm/storagetm.c @@ -28,6 +28,7 @@ #include "random-util.h" #include "recurse-dir.h" #include "socket-util.h" +#include "strv.h" #include "terminal-util.h" #include "udev-util.h" diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c index 368d4c5c975..045af007a54 100644 --- a/src/sysupdate/sysupdate-resource.c +++ b/src/sysupdate/sysupdate-resource.c @@ -24,6 +24,7 @@ #include "process-util.h" #include "sort-util.h" #include "string-table.h" +#include "strv.h" #include "sysupdate.h" #include "sysupdate-cache.h" #include "sysupdate-instance.h" diff --git a/src/udev/iocost/iocost.c b/src/udev/iocost/iocost.c index 2598975cae8..58242a33e74 100644 --- a/src/udev/iocost/iocost.c +++ b/src/udev/iocost/iocost.c @@ -17,6 +17,7 @@ #include "path-util.h" #include "pretty-print.h" #include "string-util.h" +#include "strv.h" #include "udev-util.h" #include "verbs.h" diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c index 103e4a39dbd..5f559f5c9a1 100644 --- a/src/udev/udev-builtin.c +++ b/src/udev/udev-builtin.c @@ -3,6 +3,7 @@ #include #include +#include "alloc-util.h" #include "bitfield.h" #include "device-private.h" #include "device-util.h" diff --git a/src/udev/udev-dump.c b/src/udev/udev-dump.c index d8329898055..accca6df7f6 100644 --- a/src/udev/udev-dump.c +++ b/src/udev/udev-dump.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include "alloc-util.h" #include "ansi-color.h" #include "device-private.h" #include "device-util.h" @@ -8,6 +9,7 @@ #include "fs-util.h" #include "json-util.h" #include "parse-util.h" +#include "strv.h" #include "udev-builtin.h" #include "udev-dump.h" #include "udev-event.h" diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c index d422008c3ad..dc684d4b95b 100644 --- a/src/udev/udev-manager.c +++ b/src/udev/udev-manager.c @@ -21,6 +21,7 @@ #include "signal-util.h" #include "socket-util.h" #include "string-util.h" +#include "strv.h" #include "syslog-util.h" #include "udev-builtin.h" #include "udev-config.h" diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 2df5d54feef..08ce26a0c54 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -24,6 +24,7 @@ #include "smack-util.h" #include "stat-util.h" #include "string-util.h" +#include "strv.h" #include "udev-node.h" #include "user-util.h" diff --git a/src/udev/udev-worker.c b/src/udev/udev-worker.c index 82085e86c48..f6b86e5e4f5 100644 --- a/src/udev/udev-worker.c +++ b/src/udev/udev-worker.c @@ -18,6 +18,7 @@ #include "process-util.h" #include "signal-util.h" #include "string-util.h" +#include "strv.h" #include "udev-error.h" #include "udev-event.h" #include "udev-rules.h" diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index c8cdb17ab2b..ea66a2ad226 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -30,6 +30,7 @@ #include "static-destruct.h" #include "string-table.h" #include "string-util.h" +#include "strv.h" #include "terminal-util.h" #include "udev-util.h" #include "udevadm.h" diff --git a/src/validatefs/validatefs.c b/src/validatefs/validatefs.c index db32fe3c230..2f841aa4e68 100644 --- a/src/validatefs/validatefs.c +++ b/src/validatefs/validatefs.c @@ -16,6 +16,7 @@ #include "path-util.h" #include "pretty-print.h" #include "string-util.h" +#include "strv.h" #include "utf8.h" #include "xattr-util.h"