device-util: Reduce transitive includes

diff --git a/src/libsystemd/sd-device/device-util.c b/src/libsystemd/sd-device/device-util.c
index b6887217fc918d786e14efb91dfefb946f2d51aa..b0475c5ca348edb7f3a8638ecc238ea4faa9f445 100644 (file)
--- 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 6756f225969fcf9e116d1f1b04faf06d705e10e4..0a740ede32f9524508d7ed051e41fffa2b39dee1 100644 (file)
--- 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 120f7201df8570d6494f3fe9d1667e0c2037a95b..d38f1e4b2ccb8ffe98df1ee7083c039aa47de96d 100644 (file)
--- 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 978ce42341c4821b7c0e103852868339afb0599d..47cf4df98dedb2d7caa80bc123da5890fd86ed77 100644 (file)
--- a/src/shared/netif-util.c
+++ b/src/shared/netif-util.c
@@ -3,6 +3,7 @@
 #include <linux/if.h>
 #include <linux/if_arp.h>
 
+#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 d3dabf13ebee713622e575e26376528a933a4936..6b931a60d8302a79ae935846a75b812850e7c287 100644 (file)
--- 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 5667a592232ab4e200b3cf2daf7758f7992f113e..7ddef5235029604ec97f71fdb03bf9f985232ea7 100644 (file)
--- 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 4bc69178874a1144305b9e3803f2f0e1e3a43e20..2af2ee47406ff85ca714120ecc29a15e96440515 100644 (file)
--- 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 368d4c5c9753d2796e5782a5c0c2792ab3d807a2..045af007a54012dda627c84024e065a8399e1e8c 100644 (file)
--- 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 2598975cae8516aee0715e6991d9463f7070a58b..58242a33e745771891259f87f5bd707598cc7572 100644 (file)
--- 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 103e4a39dbd38028c416d52f9a850e1494f2904a..5f559f5c9a10c8a19c6b1297549c77e6e6631075 100644 (file)
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <stdio.h>
 
+#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 d8329898055ee04d17b8d16d0f8c512cc90e6fbe..accca6df7f6e4888edabafb6564088f13fd38cd8 100644 (file)
--- 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 d422008c3ada79549a0fcfb38be99781af4c2cc7..dc684d4b95b62705ae526f44c5e9e818616a34cc 100644 (file)
--- 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 2df5d54feefcb3e6ed95c491e83e6947a15fd47c..08ce26a0c54d037c5fbb93f72cb549b2f7f2d059 100644 (file)
--- 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 82085e86c48bf045244f59b5cb51bacfa7c24d5d..f6b86e5e4f5236bdbea59904725f55773494d1cc 100644 (file)
--- 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 c8cdb17ab2b2fa5de7fa59c89f86251eb70bd1b0..ea66a2ad226b394a09b2a94a721d8362a1e14eb5 100644 (file)
--- 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 db32fe3c230ec697f3b5d7ad06f62ed87c4b65f6..2f841aa4e68f121c2d640c6185af77a3d190e171 100644 (file)
--- 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"