test: drop bus-util.h from sd-bus

To drop src/shared from include directories to build libsystemd.so later.

diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index 3ee22c9638b7f31e2e5459bcafde69be1104d796..943877f0ea0b95f2033b23660f0ecdb31cd1e98f 100644 (file)
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -13,7 +13,6 @@
 #include "bus-control.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "capability-util.h"
 #include "process-util.h"
 #include "stdio-util.h"

diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c
index 0314642f3ee2318032486a425c6481701c65cbd6..3e1143b187c1db2b01eb0b52ebb2d675f3d5ff29 100644 (file)
--- a/src/libsystemd/sd-bus/bus-convenience.c
+++ b/src/libsystemd/sd-bus/bus-convenience.c
@@ -7,7 +7,6 @@
 #include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
-#include "bus-util.h"
 #include "string-util.h"
 
 _public_ int sd_bus_emit_signalv(

diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index 3896d94111c73863719abfce814c98788d55c9e6..3134d8ef1723aac663de573ab174c3ccf535b1b1 100644 (file)
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -8,7 +8,6 @@
 #include "bus-creds.h"
 #include "bus-label.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "capability-util.h"
 #include "cgroup-util.h"
 #include "errno-util.h"

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 6bba446932c7b298621189c048796024164969d3..ba8ffae52297011465d0e7eed1f5f2d60cc6fb5f 100644 (file)
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -20,7 +20,6 @@
 #include "bus-kernel.h"
 #include "bus-label.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "capability-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
index d7da4bf009fcc387c2b9767d3c9de4f81631946a..fd74867afa3716272326e109e473e0f2107e5c28 100644 (file)
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libsystemd/sd-bus/bus-match.c
@@ -4,7 +4,6 @@
 #include "bus-internal.h"
 #include "bus-match.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hexdecoct.h"

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 99b1704aeec8a18492791ca330cc458ac4d3a0f5..f358a8699e8de7dc8005ef4df2886943900d55d9 100644 (file)
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -12,7 +12,6 @@
 #include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
-#include "bus-util.h"
 #include "fd-util.h"
 #include "io-util.h"
 #include "memfd-util.h"

diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
index 275c4318a1e61a372b79181da01abf6de27c028c..bfd42aea7da6b50758dae330c35c2906f50d926e 100644 (file)
--- a/src/libsystemd/sd-bus/bus-objects.c
+++ b/src/libsystemd/sd-bus/bus-objects.c
@@ -8,7 +8,6 @@
 #include "bus-signature.h"
 #include "bus-slot.h"
 #include "bus-type.h"
-#include "bus-util.h"
 #include "missing_capability.h"
 #include "set.h"
 #include "string-util.h"

diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c
index 5f8716e2aa6381e92424896f2aa7e83dad22091a..bc36673b839b718d1b733c887b32be05a6cc506b 100644 (file)
--- a/src/libsystemd/sd-bus/bus-track.c
+++ b/src/libsystemd/sd-bus/bus-track.c
@@ -5,7 +5,6 @@
 #include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-track.h"
-#include "bus-util.h"
 #include "string-util.h"
 
 struct track_item {

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 857193943a7e152992ce02ed3c835feac70f1811..6b1f25cc0286a75866f005c5502eab01ff743312 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -26,7 +26,6 @@
 #include "bus-socket.h"
 #include "bus-track.h"
 #include "bus-type.h"
-#include "bus-util.h"
 #include "cgroup-util.h"
 #include "def.h"
 #include "errno-util.h"

diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index 8c6711797a44b0eedca6cf2dc0c8f8681849d5ed..13c08fe2955c21f3666c07051155497d6135e25d 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -8,10 +8,10 @@
 #include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
-#include "bus-util.h"
 #include "def.h"
 #include "fd-util.h"
 #include "missing_resource.h"
+#include "string-util.h"
 #include "time-util.h"
 #include "util.h"
 

diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index c3c31c65e6367b312d1a023bd2abeba0fcddba41..a1d7ba173f8e24d9df66583c73668f547ec61495 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -11,12 +11,12 @@
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-match.h"
-#include "bus-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "log.h"
 #include "macro.h"
+#include "string-util.h"
 #include "tests.h"
 #include "util.h"
 

diff --git a/src/libsystemd/sd-bus/test-bus-cleanup.c b/src/libsystemd/sd-bus/test-bus-cleanup.c
index ece0a12babc0ff816f3f5e648b7c07e3336949ea..f563db74e6d00ebe492fd2af951f205f5297f0cd 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-cleanup.c
+++ b/src/libsystemd/sd-bus/test-bus-cleanup.c
@@ -6,7 +6,6 @@
 
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "tests.h"
 
 static bool use_system_bus = false;

diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c
index 6551e692f85969a0c162105f6ccdb886f4d298e7..13801becc90565a39f3946c8f52fd9b624557608 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/sd-bus/test-bus-creds.c
@@ -3,7 +3,6 @@
 #include "sd-bus.h"
 
 #include "bus-dump.h"
-#include "bus-util.h"
 #include "cgroup-util.h"
 #include "tests.h"
 

diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
index 2e3803c9b23dcfa0dc3f95b5156a562a6aa1446f..958884d56ffd1ba16e47ff5ec2ae308c7e1ae282 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-error.c
+++ b/src/libsystemd/sd-bus/test-bus-error.c
@@ -2,11 +2,12 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
-#include "bus-util.h"
 #include "errno-list.h"
 #include "errno-util.h"
+#include "string-util.h"
 
 static void test_error(void) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL, second = SD_BUS_ERROR_NULL;

diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libsystemd/sd-bus/test-bus-gvariant.c
index b0033f1d133ff0fc8af10c58386cc0fa4303efea..edd8301d4585cb15372438121db985d41936e4fa 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/sd-bus/test-bus-gvariant.c
@@ -11,7 +11,6 @@
 #include "bus-gvariant.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "macro.h"
 #include "tests.h"
 #include "util.h"

diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c
index aa6ddd336a9e6e132292af9c640fdf0ab3c4619f..031e42ff46bebb1998c2ac31d250fd112bdd1898 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-match.c
+++ b/src/libsystemd/sd-bus/test-bus-match.c
@@ -3,7 +3,6 @@
 #include "bus-match.h"
 #include "bus-message.h"
 #include "bus-slot.h"
-#include "bus-util.h"
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"

diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c
index 9116211886f039de54eb32f963e45fa0b947124b..80d2a5d98b5846600209ffb49dd26d5c668ccc28 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/sd-bus/test-bus-objects.c
@@ -9,7 +9,6 @@
 #include "bus-dump.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "log.h"
 #include "macro.h"
 #include "strv.h"

diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c
index 5cb100b2f0b84d2bec774daf39e243d9464e4a86..e7a14716bcc50ce6269c93768eed5f1989d37b7b 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-server.c
+++ b/src/libsystemd/sd-bus/test-bus-server.c
@@ -6,10 +6,10 @@
 #include "sd-bus.h"
 
 #include "bus-internal.h"
-#include "bus-util.h"
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
+#include "string-util.h"
 
 struct context {
         int fds[2];