From e1a4c5422deec7970cc5ce0154fd4fc721ee8dc2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 28 Jul 2016 00:24:41 -0400 Subject: fix --- src/libsystemd/src/sd-bus/bus-control.c | 2 +- src/libsystemd/src/sd-bus/bus-convenience.c | 2 +- src/libsystemd/src/sd-bus/bus-creds.c | 2 +- src/libsystemd/src/sd-bus/bus-kernel.c | 2 +- src/libsystemd/src/sd-bus/bus-match.c | 2 +- src/libsystemd/src/sd-bus/bus-message.c | 2 +- src/libsystemd/src/sd-bus/bus-objects.c | 2 +- src/libsystemd/src/sd-bus/bus-track.c | 2 +- src/libsystemd/src/sd-bus/sd-bus.c | 2 +- src/libsystemd/src/sd-bus/test-bus-benchmark.c | 2 +- src/libsystemd/src/sd-bus/test-bus-chat.c | 2 +- src/libsystemd/src/sd-bus/test-bus-cleanup.c | 2 +- src/libsystemd/src/sd-bus/test-bus-creds.c | 2 +- src/libsystemd/src/sd-bus/test-bus-error.c | 2 +- src/libsystemd/src/sd-bus/test-bus-gvariant.c | 2 +- src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c | 2 +- src/libsystemd/src/sd-bus/test-bus-kernel.c | 2 +- src/libsystemd/src/sd-bus/test-bus-marshal.c | 2 +- src/libsystemd/src/sd-bus/test-bus-match.c | 2 +- src/libsystemd/src/sd-bus/test-bus-objects.c | 2 +- src/libsystemd/src/sd-bus/test-bus-server.c | 2 +- src/libsystemd/src/sd-journal/gcrypt-util.c | 2 +- src/libsystemd/src/sd-journal/gcrypt-util.h | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/libsystemd') diff --git a/src/libsystemd/src/sd-bus/bus-control.c b/src/libsystemd/src/sd-bus/bus-control.c index 33b5dbcda0..5582a17aae 100644 --- a/src/libsystemd/src/sd-bus/bus-control.c +++ b/src/libsystemd/src/sd-bus/bus-control.c @@ -31,7 +31,7 @@ #include "bus-control.h" #include "bus-internal.h" #include "bus-message.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/capability-util.h" #include "basic/stdio-util.h" #include "basic/string-util.h" diff --git a/src/libsystemd/src/sd-bus/bus-convenience.c b/src/libsystemd/src/sd-bus/bus-convenience.c index 78ef116fa1..12fcc89d92 100644 --- a/src/libsystemd/src/sd-bus/bus-convenience.c +++ b/src/libsystemd/src/sd-bus/bus-convenience.c @@ -21,7 +21,7 @@ #include "bus-message.h" #include "bus-signature.h" #include "bus-type.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/string-util.h" _public_ int sd_bus_emit_signal( diff --git a/src/libsystemd/src/sd-bus/bus-creds.c b/src/libsystemd/src/sd-bus/bus-creds.c index 72723f6cc2..30b80d88e0 100644 --- a/src/libsystemd/src/sd-bus/bus-creds.c +++ b/src/libsystemd/src/sd-bus/bus-creds.c @@ -25,7 +25,7 @@ #include "bus-creds.h" #include "basic/bus-label.h" #include "bus-message.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/capability-util.h" #include "basic/cgroup-util.h" #include "basic/fd-util.h" diff --git a/src/libsystemd/src/sd-bus/bus-kernel.c b/src/libsystemd/src/sd-bus/bus-kernel.c index 6fcbd2b68e..ef9fb87ee5 100644 --- a/src/libsystemd/src/sd-bus/bus-kernel.c +++ b/src/libsystemd/src/sd-bus/bus-kernel.c @@ -38,7 +38,7 @@ #include "bus-kernel.h" #include "basic/bus-label.h" #include "bus-message.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/capability-util.h" #include "basic/fd-util.h" #include "basic/fileio.h" diff --git a/src/libsystemd/src/sd-bus/bus-match.c b/src/libsystemd/src/sd-bus/bus-match.c index 45790e1ef6..be5a0975e3 100644 --- a/src/libsystemd/src/sd-bus/bus-match.c +++ b/src/libsystemd/src/sd-bus/bus-match.c @@ -21,7 +21,7 @@ #include "bus-internal.h" #include "bus-match.h" #include "bus-message.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/hexdecoct.h" diff --git a/src/libsystemd/src/sd-bus/bus-message.c b/src/libsystemd/src/sd-bus/bus-message.c index 9a50808e07..96f4213416 100644 --- a/src/libsystemd/src/sd-bus/bus-message.c +++ b/src/libsystemd/src/sd-bus/bus-message.c @@ -29,7 +29,7 @@ #include "bus-message.h" #include "bus-signature.h" #include "bus-type.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/io-util.h" #include "basic/memfd-util.h" diff --git a/src/libsystemd/src/sd-bus/bus-objects.c b/src/libsystemd/src/sd-bus/bus-objects.c index 04d0fc9bc3..f0e80017c5 100644 --- a/src/libsystemd/src/sd-bus/bus-objects.c +++ b/src/libsystemd/src/sd-bus/bus-objects.c @@ -25,7 +25,7 @@ #include "bus-signature.h" #include "bus-slot.h" #include "bus-type.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/set.h" #include "basic/string-util.h" #include "basic/strv.h" diff --git a/src/libsystemd/src/sd-bus/bus-track.c b/src/libsystemd/src/sd-bus/bus-track.c index f6c800439c..997afd9dc9 100644 --- a/src/libsystemd/src/sd-bus/bus-track.c +++ b/src/libsystemd/src/sd-bus/bus-track.c @@ -22,7 +22,7 @@ #include "basic/alloc-util.h" #include "bus-internal.h" #include "bus-track.h" -#include "bus-util.h" +#include "shared/bus-util.h" struct sd_bus_track { unsigned n_ref; diff --git a/src/libsystemd/src/sd-bus/sd-bus.c b/src/libsystemd/src/sd-bus/sd-bus.c index b60ae05394..748b46413d 100644 --- a/src/libsystemd/src/sd-bus/sd-bus.c +++ b/src/libsystemd/src/sd-bus/sd-bus.c @@ -40,7 +40,7 @@ #include "bus-socket.h" #include "bus-track.h" #include "bus-type.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/cgroup-util.h" #include "basic/def.h" #include "basic/fd-util.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-benchmark.c b/src/libsystemd/src/sd-bus/test-bus-benchmark.c index c2484ab4d3..08186870cb 100644 --- a/src/libsystemd/src/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/src/sd-bus/test-bus-benchmark.c @@ -24,7 +24,7 @@ #include "basic/alloc-util.h" #include "bus-internal.h" #include "bus-kernel.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/def.h" #include "basic/fd-util.h" #include "basic/time-util.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-chat.c b/src/libsystemd/src/sd-bus/test-bus-chat.c index fc40b365bb..353edc9c7c 100644 --- a/src/libsystemd/src/sd-bus/test-bus-chat.c +++ b/src/libsystemd/src/sd-bus/test-bus-chat.c @@ -28,7 +28,7 @@ #include "bus-error.h" #include "bus-internal.h" #include "bus-match.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/formats-util.h" #include "basic/log.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-cleanup.c b/src/libsystemd/src/sd-bus/test-bus-cleanup.c index 02c186e1d6..3a308453ed 100644 --- a/src/libsystemd/src/sd-bus/test-bus-cleanup.c +++ b/src/libsystemd/src/sd-bus/test-bus-cleanup.c @@ -23,7 +23,7 @@ #include "bus-internal.h" #include "bus-message.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/refcnt.h" static void test_bus_new(void) { diff --git a/src/libsystemd/src/sd-bus/test-bus-creds.c b/src/libsystemd/src/sd-bus/test-bus-creds.c index 0c0bda49ec..22fe1fa759 100644 --- a/src/libsystemd/src/sd-bus/test-bus-creds.c +++ b/src/libsystemd/src/sd-bus/test-bus-creds.c @@ -20,7 +20,7 @@ #include #include "bus-dump.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/cgroup-util.h" int main(int argc, char *argv[]) { diff --git a/src/libsystemd/src/sd-bus/test-bus-error.c b/src/libsystemd/src/sd-bus/test-bus-error.c index 45c039a885..348629c718 100644 --- a/src/libsystemd/src/sd-bus/test-bus-error.c +++ b/src/libsystemd/src/sd-bus/test-bus-error.c @@ -21,7 +21,7 @@ #include "bus-common-errors.h" #include "bus-error.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/errno-list.h" static void test_error(void) { diff --git a/src/libsystemd/src/sd-bus/test-bus-gvariant.c b/src/libsystemd/src/sd-bus/test-bus-gvariant.c index dd7218ce79..bffc7247c2 100644 --- a/src/libsystemd/src/sd-bus/test-bus-gvariant.c +++ b/src/libsystemd/src/sd-bus/test-bus-gvariant.c @@ -28,7 +28,7 @@ #include "bus-gvariant.h" #include "bus-internal.h" #include "bus-message.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/macro.h" #include "basic/util.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c index d5c8e7eba7..75874a6892 100644 --- a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c +++ b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c @@ -21,7 +21,7 @@ #include "basic/alloc-util.h" #include "bus-kernel.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/log.h" #include "basic/util.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel.c b/src/libsystemd/src/sd-bus/test-bus-kernel.c index c24c66b996..79ac9064d6 100644 --- a/src/libsystemd/src/sd-bus/test-bus-kernel.c +++ b/src/libsystemd/src/sd-bus/test-bus-kernel.c @@ -24,7 +24,7 @@ #include "basic/alloc-util.h" #include "bus-dump.h" #include "bus-kernel.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/log.h" #include "basic/util.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-marshal.c b/src/libsystemd/src/sd-bus/test-bus-marshal.c index f8ced127e6..59a11718d9 100644 --- a/src/libsystemd/src/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/src/sd-bus/test-bus-marshal.c @@ -34,7 +34,7 @@ #include "bus-dump.h" #include "basic/bus-label.h" #include "bus-message.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/hexdecoct.h" #include "basic/log.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-match.c b/src/libsystemd/src/sd-bus/test-bus-match.c index 4581d986fb..c73643ec37 100644 --- a/src/libsystemd/src/sd-bus/test-bus-match.c +++ b/src/libsystemd/src/sd-bus/test-bus-match.c @@ -20,7 +20,7 @@ #include "bus-match.h" #include "bus-message.h" #include "bus-slot.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/log.h" #include "basic/macro.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-objects.c b/src/libsystemd/src/sd-bus/test-bus-objects.c index 23f131e405..990dd196e2 100644 --- a/src/libsystemd/src/sd-bus/test-bus-objects.c +++ b/src/libsystemd/src/sd-bus/test-bus-objects.c @@ -26,7 +26,7 @@ #include "bus-dump.h" #include "bus-internal.h" #include "bus-message.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/strv.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-server.c b/src/libsystemd/src/sd-bus/test-bus-server.c index 3a53c909f0..596529b7e4 100644 --- a/src/libsystemd/src/sd-bus/test-bus-server.c +++ b/src/libsystemd/src/sd-bus/test-bus-server.c @@ -23,7 +23,7 @@ #include #include "bus-internal.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/util.h" diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.c b/src/libsystemd/src/sd-journal/gcrypt-util.c index 2bd8bde8da..56bb2382a6 120000 --- a/src/libsystemd/src/sd-journal/gcrypt-util.c +++ b/src/libsystemd/src/sd-journal/gcrypt-util.c @@ -1 +1 @@ -../../../libshared/gcrypt-util.c \ No newline at end of file +../../../libshared/src/gcrypt-util.c \ No newline at end of file diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.h b/src/libsystemd/src/sd-journal/gcrypt-util.h index 6de2527ac8..c1168ad265 120000 --- a/src/libsystemd/src/sd-journal/gcrypt-util.h +++ b/src/libsystemd/src/sd-journal/gcrypt-util.h @@ -1 +1 @@ -../../../libshared/gcrypt-util.h \ No newline at end of file +../../../libshared/include/shared/gcrypt-util.h \ No newline at end of file -- cgit v1.2.3-54-g00ecf