From: Yu Watanabe Date: Thu, 31 Dec 2020 23:57:37 +0000 (+0900) Subject: test: drop bus-util.h from sd-bus X-Git-Tag: v248-rc1~304^2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6969a671d9fdd409e6b2715f6d78314a7d51d0c0;p=thirdparty%2Fsystemd.git 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 3ee22c9638b..943877f0ea0 100644 --- 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 0314642f3ee..3e1143b187c 100644 --- 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 3896d94111c..3134d8ef172 100644 --- 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 6bba446932c..ba8ffae5229 100644 --- 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 d7da4bf009f..fd74867afa3 100644 --- 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 99b1704aeec..f358a8699e8 100644 --- 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 275c4318a1e..bfd42aea7da 100644 --- 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 5f8716e2aa6..bc36673b839 100644 --- 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 857193943a7..6b1f25cc028 100644 --- 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 8c6711797a4..13c08fe2955 100644 --- 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 c3c31c65e63..a1d7ba173f8 100644 --- 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 ece0a12babc..f563db74e6d 100644 --- 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 6551e692f85..13801becc90 100644 --- 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 2e3803c9b23..958884d56ff 100644 --- 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 b0033f1d133..edd8301d458 100644 --- 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 aa6ddd336a9..031e42ff46b 100644 --- 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 9116211886f..80d2a5d98b5 100644 --- 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 5cb100b2f0b..e7a14716bcc 100644 --- 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];