diff options
103 files changed, 109 insertions, 104 deletions
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index 3328a3c0ff..cc7ca1ae19 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -25,6 +25,7 @@ #include "sd-bus/bus-internal.h" #include "sd-bus/bus-signature.h" #include "sd-bus/bus-type.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/escape.h" #include "systemd-basic/fd-util.h" @@ -37,7 +38,6 @@ #include "systemd-basic/terminal-util.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/pager.h" #include "busctl-introspect.h" diff --git a/src/grp-hostname/hostnamectl/hostnamectl.c b/src/grp-hostname/hostnamectl/hostnamectl.c index 222925b362..c5f702087d 100644 --- a/src/grp-hostname/hostnamectl/hostnamectl.c +++ b/src/grp-hostname/hostnamectl/hostnamectl.c @@ -27,11 +27,11 @@ #include <systemd/sd-id128.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/architecture.h" #include "systemd-basic/hostname-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/spawn-polkit-agent.h" static bool arg_ask_password = true; diff --git a/src/grp-hostname/systemd-hostnamed/hostnamed.c b/src/grp-hostname/systemd-hostnamed/hostnamed.c index dc1b5472e6..a18658e92e 100644 --- a/src/grp-hostname/systemd-hostnamed/hostnamed.c +++ b/src/grp-hostname/systemd-hostnamed/hostnamed.c @@ -22,6 +22,7 @@ #include <sys/utsname.h> #include <unistd.h> +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/def.h" #include "systemd-basic/env-util.h" @@ -34,7 +35,6 @@ #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" #include "systemd-basic/virt.h" -#include "systemd-shared/bus-util.h" #define VALID_DEPLOYMENT_CHARS (DIGITS LETTERS "-.:") diff --git a/src/grp-initprogs/systemd-fsck/fsck.c b/src/grp-initprogs/systemd-fsck/fsck.c index 9dfb23116f..c33d199ef5 100644 --- a/src/grp-initprogs/systemd-fsck/fsck.c +++ b/src/grp-initprogs/systemd-fsck/fsck.c @@ -31,6 +31,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "sd-device/device-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" @@ -44,7 +45,6 @@ #include "systemd-basic/special.h" #include "systemd-basic/stdio-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "systemd-staging/sd-device.h" /* exit codes as defined in fsck(8) */ diff --git a/src/grp-initprogs/systemd-update-utmp/update-utmp.c b/src/grp-initprogs/systemd-update-utmp/update-utmp.c index 6cbfd262bb..ccb8543cfe 100644 --- a/src/grp-initprogs/systemd-update-utmp/update-utmp.c +++ b/src/grp-initprogs/systemd-update-utmp/update-utmp.c @@ -28,6 +28,7 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/formats-util.h" #include "systemd-basic/log.h" @@ -35,7 +36,6 @@ #include "systemd-basic/special.h" #include "systemd-basic/unit-name.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/utmp-wtmp.h" typedef struct Context { diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c index 225da57cb8..b92945455b 100644 --- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c +++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c @@ -31,6 +31,7 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-journal.h> +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fileio.h" @@ -40,7 +41,6 @@ #include "systemd-basic/sigbus.h" #include "systemd-basic/util.h" #include "systemd-microhttpd/microhttpd-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/logs-show.h" #define JOURNAL_WAIT_TIMEOUT (10*USEC_PER_SEC) diff --git a/src/grp-journal/journalctl/journalctl.c b/src/grp-journal/journalctl/journalctl.c index d6efde7f05..4317c05b33 100644 --- a/src/grp-journal/journalctl/journalctl.c +++ b/src/grp-journal/journalctl/journalctl.c @@ -38,6 +38,7 @@ #include <systemd/sd-journal.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "sd-journal/catalog.h" #include "sd-journal/fsprg.h" #include "sd-journal/journal-def.h" @@ -66,7 +67,6 @@ #include "systemd-basic/unit-name.h" #include "systemd-basic/user-util.h" #include "systemd-shared/acl-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/logs-show.h" #include "systemd-shared/pager.h" #include "systemd-shared/udev-util.h" diff --git a/src/grp-locale/localectl/localectl.c b/src/grp-locale/localectl/localectl.c index b885aa76ef..491b40c8fa 100644 --- a/src/grp-locale/localectl/localectl.c +++ b/src/grp-locale/localectl/localectl.c @@ -28,6 +28,7 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/def.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fileio.h" @@ -36,7 +37,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/util.h" #include "systemd-basic/virt.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/pager.h" #include "systemd-shared/spawn-polkit-agent.h" diff --git a/src/grp-locale/systemd-localed/localed.c b/src/grp-locale/systemd-localed/localed.c index b8c3c06359..91ad61efd8 100644 --- a/src/grp-locale/systemd-localed/localed.c +++ b/src/grp-locale/systemd-localed/localed.c @@ -31,6 +31,7 @@ #include "sd-bus/bus-error.h" #include "sd-bus/bus-message.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/def.h" #include "systemd-basic/locale-util.h" @@ -40,7 +41,6 @@ #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "keymap-util.h" diff --git a/src/grp-login/loginctl/loginctl.c b/src/grp-login/loginctl/loginctl.c index 4c9f023445..c0340553b8 100644 --- a/src/grp-login/loginctl/loginctl.c +++ b/src/grp-login/loginctl/loginctl.c @@ -26,6 +26,7 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/log.h" @@ -40,7 +41,6 @@ #include "systemd-basic/util.h" #include "systemd-basic/verbs.h" #include "systemd-shared/bus-unit-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/cgroup-show.h" #include "systemd-shared/logs-show.h" #include "systemd-shared/pager.h" diff --git a/src/grp-login/pam_systemd/pam_systemd.c b/src/grp-login/pam_systemd/pam_systemd.c index 1c293bec88..fe1a2266b7 100644 --- a/src/grp-login/pam_systemd/pam_systemd.c +++ b/src/grp-login/pam_systemd/pam_systemd.c @@ -30,6 +30,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/audit-util.h" #include "systemd-basic/def.h" @@ -44,7 +45,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/terminal-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" static int parse_argv( pam_handle_t *handle, diff --git a/src/grp-login/systemd-inhibit/inhibit.c b/src/grp-login/systemd-inhibit/inhibit.c index e87ea1c675..c4c14bdffe 100644 --- a/src/grp-login/systemd-inhibit/inhibit.c +++ b/src/grp-login/systemd-inhibit/inhibit.c @@ -26,6 +26,7 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/formats-util.h" @@ -34,7 +35,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" static const char* arg_what = "idle:sleep:shutdown"; static const char* arg_who = NULL; diff --git a/src/grp-login/systemd-logind/logind-action.c b/src/grp-login/systemd-logind/logind-action.c index 0004148462..594a7e0039 100644 --- a/src/grp-login/systemd-logind/logind-action.c +++ b/src/grp-login/systemd-logind/logind-action.c @@ -20,6 +20,7 @@ #include <unistd.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/formats-util.h" #include "systemd-basic/process-util.h" @@ -27,7 +28,6 @@ #include "systemd-basic/string-table.h" #include "systemd-basic/terminal-util.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/conf-parser.h" #include "systemd-shared/sleep-config.h" diff --git a/src/grp-login/systemd-logind/logind-core.c b/src/grp-login/systemd-logind/logind-core.c index 6e24f80717..b4bb502aac 100644 --- a/src/grp-login/systemd-logind/logind-core.c +++ b/src/grp-login/systemd-logind/logind-core.c @@ -25,13 +25,13 @@ #include <linux/vt.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/terminal-util.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/udev-util.h" #include "logind.h" diff --git a/src/grp-login/systemd-logind/logind-dbus.c b/src/grp-login/systemd-logind/logind-dbus.c index 2025fce0ff..c4b962ec92 100644 --- a/src/grp-login/systemd-logind/logind-dbus.c +++ b/src/grp-login/systemd-logind/logind-dbus.c @@ -26,6 +26,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/audit-util.h" #include "systemd-basic/dirent-util.h" @@ -43,7 +44,6 @@ #include "systemd-basic/terminal-util.h" #include "systemd-basic/unit-name.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/efivars.h" #include "systemd-shared/sleep-config.h" #include "systemd-shared/udev-util.h" diff --git a/src/grp-login/systemd-logind/logind-seat-dbus.c b/src/grp-login/systemd-logind/logind-seat-dbus.c index 4811b94dd2..000a96cddc 100644 --- a/src/grp-login/systemd-logind/logind-seat-dbus.c +++ b/src/grp-login/systemd-logind/logind-seat-dbus.c @@ -21,12 +21,12 @@ #include <string.h> #include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/bus-label.h" #include "systemd-basic/strv.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "logind-seat.h" #include "logind.h" diff --git a/src/grp-login/systemd-logind/logind-session-dbus.c b/src/grp-login/systemd-logind/logind-session-dbus.c index 222b456ad3..ffcc1c8324 100644 --- a/src/grp-login/systemd-logind/logind-session-dbus.c +++ b/src/grp-login/systemd-logind/logind-session-dbus.c @@ -21,13 +21,13 @@ #include <string.h> #include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/bus-label.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/signal-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "logind-session-device.h" #include "logind-session.h" diff --git a/src/grp-login/systemd-logind/logind-session-device.c b/src/grp-login/systemd-logind/logind-session-device.c index 02af040c2d..131e000439 100644 --- a/src/grp-login/systemd-logind/logind-session-device.c +++ b/src/grp-login/systemd-logind/logind-session-device.c @@ -26,11 +26,11 @@ #include <libudev.h> +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/missing.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "logind-session-device.h" diff --git a/src/grp-login/systemd-logind/logind-session.c b/src/grp-login/systemd-logind/logind-session.c index 9d386e71ce..58ac2aeeb7 100644 --- a/src/grp-login/systemd-logind/logind-session.c +++ b/src/grp-login/systemd-logind/logind-session.c @@ -30,6 +30,7 @@ #include <systemd/sd-messages.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/audit-util.h" #include "systemd-basic/escape.h" @@ -44,7 +45,6 @@ #include "systemd-basic/terminal-util.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "logind-session.h" diff --git a/src/grp-login/systemd-logind/logind-user-dbus.c b/src/grp-login/systemd-logind/logind-user-dbus.c index a4eadc65fa..73e44f8e61 100644 --- a/src/grp-login/systemd-logind/logind-user-dbus.c +++ b/src/grp-login/systemd-logind/logind-user-dbus.c @@ -20,12 +20,12 @@ #include <errno.h> #include <string.h> +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/formats-util.h" #include "systemd-basic/signal-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "logind-user.h" #include "logind.h" diff --git a/src/grp-login/systemd-logind/logind-user.c b/src/grp-login/systemd-logind/logind-user.c index beb1dfbd6e..3c5f5df290 100644 --- a/src/grp-login/systemd-logind/logind-user.c +++ b/src/grp-login/systemd-logind/logind-user.c @@ -24,6 +24,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/escape.h" #include "systemd-basic/fd-util.h" @@ -44,7 +45,6 @@ #include "systemd-basic/unit-name.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/clean-ipc.h" #include "systemd-shared/conf-parser.h" diff --git a/src/grp-login/systemd-logind/logind-utmp.c b/src/grp-login/systemd-logind/logind-utmp.c index acb6c64efa..319718ca57 100644 --- a/src/grp-login/systemd-logind/logind-utmp.c +++ b/src/grp-login/systemd-logind/logind-utmp.c @@ -26,6 +26,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/audit-util.h" #include "systemd-basic/formats-util.h" @@ -33,7 +34,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/unit-name.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/utmp-wtmp.h" #include "logind.h" diff --git a/src/grp-login/systemd-logind/logind.c b/src/grp-login/systemd-logind/logind.c index 27564028af..ccb88d4ead 100644 --- a/src/grp-login/systemd-logind/logind.c +++ b/src/grp-login/systemd-logind/logind.c @@ -26,6 +26,7 @@ #include <systemd/sd-daemon.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/def.h" #include "systemd-basic/dirent-util.h" @@ -34,7 +35,6 @@ #include "systemd-basic/selinux-util.h" #include "systemd-basic/signal-util.h" #include "systemd-basic/strv.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/conf-parser.h" #include "systemd-shared/udev-util.h" diff --git a/src/grp-login/test-inhibit.c b/src/grp-login/test-inhibit.c index 992544f3c4..3cddff0e9d 100644 --- a/src/grp-login/test-inhibit.c +++ b/src/grp-login/test-inhibit.c @@ -21,10 +21,10 @@ #include <systemd/sd-bus.h> +#include "sd-bus/bus-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/macro.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" static int inhibit(sd_bus *bus, const char *what) { _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; diff --git a/src/grp-machine/grp-import/systemd-importd/importd.c b/src/grp-machine/grp-import/systemd-importd/importd.c index 604b94e616..ecf130cdd1 100644 --- a/src/grp-machine/grp-import/systemd-importd/importd.c +++ b/src/grp-machine/grp-import/systemd-importd/importd.c @@ -22,6 +22,7 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/def.h" #include "systemd-basic/fd-util.h" @@ -39,7 +40,6 @@ #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" #include "systemd-basic/web-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/import-util.h" #include "systemd-shared/machine-pool.h" diff --git a/src/grp-machine/libmachine-core/src/image-dbus.c b/src/grp-machine/libmachine-core/src/image-dbus.c index cee2d2d7f2..f3467bf193 100644 --- a/src/grp-machine/libmachine-core/src/image-dbus.c +++ b/src/grp-machine/libmachine-core/src/image-dbus.c @@ -18,6 +18,7 @@ ***/ #include "machine-core/image-dbus.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/bus-label.h" #include "systemd-basic/fd-util.h" @@ -25,7 +26,6 @@ #include "systemd-basic/process-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/machine-image.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, image_type, ImageType); diff --git a/src/grp-machine/libmachine-core/src/machine-dbus.c b/src/grp-machine/libmachine-core/src/machine-dbus.c index b18d851898..f9c709fd30 100644 --- a/src/grp-machine/libmachine-core/src/machine-dbus.c +++ b/src/grp-machine/libmachine-core/src/machine-dbus.c @@ -32,6 +32,7 @@ #include "machine-core/machine.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-internal.h" +#include "sd-bus/bus-util.h" #include "sd-netlink/local-addresses.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/bus-label.h" @@ -49,7 +50,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/terminal-util.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" static int property_get_id( sd_bus *bus, diff --git a/src/grp-machine/libmachine-core/src/machine.c b/src/grp-machine/libmachine-core/src/machine.c index 9eca08948f..12965d88c9 100644 --- a/src/grp-machine/libmachine-core/src/machine.c +++ b/src/grp-machine/libmachine-core/src/machine.c @@ -26,6 +26,7 @@ #include "machine-core/machine-dbus.h" #include "machine-core/machine.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/escape.h" #include "systemd-basic/extract-word.h" @@ -41,7 +42,6 @@ #include "systemd-basic/terminal-util.h" #include "systemd-basic/unit-name.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" Machine* machine_new(Manager *manager, MachineClass class, const char *name) { Machine *m; diff --git a/src/grp-machine/libmachine-core/src/machined-dbus.c b/src/grp-machine/libmachine-core/src/machined-dbus.c index 9a50dcbaa8..ea94a40452 100644 --- a/src/grp-machine/libmachine-core/src/machined-dbus.c +++ b/src/grp-machine/libmachine-core/src/machined-dbus.c @@ -27,6 +27,7 @@ #include "machine-core/machine-dbus.h" #include "machine-core/machined.h" #include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/btrfs-util.h" #include "systemd-basic/cgroup-util.h" @@ -41,7 +42,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/unit-name.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/machine-image.h" #include "systemd-shared/machine-pool.h" diff --git a/src/grp-machine/machinectl/machinectl.c b/src/grp-machine/machinectl/machinectl.c index fd78ac52cb..bf89f00cb8 100644 --- a/src/grp-machine/machinectl/machinectl.c +++ b/src/grp-machine/machinectl/machinectl.c @@ -33,6 +33,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/copy.h" @@ -53,7 +54,6 @@ #include "systemd-basic/verbs.h" #include "systemd-basic/web-util.h" #include "systemd-shared/bus-unit-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/cgroup-show.h" #include "systemd-shared/import-util.h" #include "systemd-shared/logs-show.h" diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c index 82245819cc..d6ce7e0c26 100644 --- a/src/grp-machine/systemd-machined/machined.c +++ b/src/grp-machine/systemd-machined/machined.c @@ -25,6 +25,7 @@ #include "machine-core/machined.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/dirent-util.h" @@ -33,7 +34,6 @@ #include "systemd-basic/hostname-util.h" #include "systemd-basic/label.h" #include "systemd-basic/signal-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/machine-image.h" Manager *manager_new(void) { diff --git a/src/grp-network/libnetworkd-core/networkd-link-bus.c b/src/grp-network/libnetworkd-core/networkd-link-bus.c index 05d4b1c270..e690cfa8f4 100644 --- a/src/grp-network/libnetworkd-core/networkd-link-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-link-bus.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/parse-util.h" #include "systemd-basic/strv.h" -#include "systemd-shared/bus-util.h" #include "networkd-link.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c index 48339356f6..ec762080b8 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.c +++ b/src/grp-network/libnetworkd-core/networkd-link.c @@ -22,6 +22,7 @@ #include <linux/if.h> +#include "sd-bus/bus-util.h" #include "sd-netlink/netlink-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" @@ -34,7 +35,6 @@ #include "systemd-basic/virt.h" #include "systemd-network/dhcp-lease-internal.h" #include "systemd-network/network-internal.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/udev-util.h" #include "networkd-lldp-tx.h" diff --git a/src/grp-network/libnetworkd-core/networkd-manager-bus.c b/src/grp-network/libnetworkd-core/networkd-manager-bus.c index b2a035428e..735bf75510 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-manager-bus.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" -#include "systemd-shared/bus-util.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c index 255217f07c..d7d149ebb5 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager.c +++ b/src/grp-network/libnetworkd-core/networkd-manager.c @@ -24,6 +24,7 @@ #include <systemd/sd-daemon.h> #include "libudev-private.h" +#include "sd-bus/bus-util.h" #include "sd-netlink/local-addresses.h" #include "sd-netlink/netlink-util.h" #include "systemd-basic/alloc-util.h" @@ -34,7 +35,6 @@ #include "systemd-basic/path-util.h" #include "systemd-basic/set.h" #include "systemd-basic/virt.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/conf-parser.h" #include "systemd-shared/dns-domain.h" #include "systemd-shared/udev-util.h" diff --git a/src/grp-resolve/systemd-resolve/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c index e810b8d891..facad18086 100644 --- a/src/grp-resolve/systemd-resolve/resolve-tool.c +++ b/src/grp-resolve/systemd-resolve/resolve-tool.c @@ -25,6 +25,7 @@ #include "basic-dns/resolved-def.h" #include "basic-dns/resolved-dns-packet.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "sd-netlink/netlink-util.h" #include "systemd-basic/af-list.h" #include "systemd-basic/alloc-util.h" @@ -34,7 +35,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/terminal-util.h" #include "systemd-gcrypt/gcrypt-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/pager.h" #include "systemd-staging/sd-netlink.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c index 352d515f32..ec63fb2900 100644 --- a/src/grp-resolve/systemd-resolved/resolved-bus.c +++ b/src/grp-resolve/systemd-resolved/resolved-bus.c @@ -19,8 +19,8 @@ #include "basic-dns/resolved-def.h" #include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/dns-domain.h" #include "resolved-bus.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-link-bus.c b/src/grp-resolve/systemd-resolved/resolved-link-bus.c index af66292c74..bea3c35829 100644 --- a/src/grp-resolve/systemd-resolved/resolved-link-bus.c +++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.c @@ -18,10 +18,10 @@ ***/ #include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/parse-util.h" #include "systemd-basic/strv.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/resolve-util.h" #include "resolved-bus.h" diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c index d98970b31c..620ae7ee35 100644 --- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c +++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c @@ -21,12 +21,12 @@ #include "core/manager.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/log.h" #include "systemd-basic/path-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/unit-name.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/pager.h" #include "analyze-verify.h" diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze.c b/src/grp-system/grp-utils/systemd-analyze/analyze.c index 7d7dd52648..ea775c8dd1 100644 --- a/src/grp-system/grp-utils/systemd-analyze/analyze.c +++ b/src/grp-system/grp-utils/systemd-analyze/analyze.c @@ -26,6 +26,7 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/glob-util.h" #include "systemd-basic/hashmap.h" @@ -39,7 +40,6 @@ #include "systemd-basic/unit-name.h" #include "systemd-basic/util.h" #include "systemd-shared/bus-unit-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/pager.h" #include "analyze-verify.h" diff --git a/src/grp-system/grp-utils/systemd-run/run.c b/src/grp-system/grp-utils/systemd-run/run.c index a831d2e046..a68938fb71 100644 --- a/src/grp-system/grp-utils/systemd-run/run.c +++ b/src/grp-system/grp-utils/systemd-run/run.c @@ -24,6 +24,7 @@ #include <systemd/sd-event.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/calendarspec.h" #include "systemd-basic/env-util.h" @@ -37,7 +38,6 @@ #include "systemd-basic/unit-name.h" #include "systemd-basic/user-util.h" #include "systemd-shared/bus-unit-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/ptyfwd.h" #include "systemd-shared/spawn-polkit-agent.h" diff --git a/src/grp-system/libcore/src/automount.c b/src/grp-system/libcore/src/automount.c index 9cd7aaffa3..2f116977de 100644 --- a/src/grp-system/libcore/src/automount.c +++ b/src/grp-system/libcore/src/automount.c @@ -32,6 +32,7 @@ #include "core/mount.h" #include "core/unit.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/async.h" #include "systemd-basic/fd-util.h" @@ -48,7 +49,6 @@ #include "systemd-basic/string-table.h" #include "systemd-basic/string-util.h" #include "systemd-basic/unit-name.h" -#include "systemd-shared/bus-util.h" #include "dbus-automount.h" diff --git a/src/grp-system/libcore/src/busname.c b/src/grp-system/libcore/src/busname.c index 07168fcd75..178866fc15 100644 --- a/src/grp-system/libcore/src/busname.c +++ b/src/grp-system/libcore/src/busname.c @@ -24,6 +24,7 @@ #include "core/service.h" #include "sd-bus/bus-internal.h" #include "sd-bus/bus-kernel.h" +#include "sd-bus/bus-util.h" #include "sd-bus/kdbus.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" @@ -34,7 +35,6 @@ #include "systemd-basic/special.h" #include "systemd-basic/string-table.h" #include "systemd-basic/string-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-busname.h" diff --git a/src/grp-system/libcore/src/dbus-automount.c b/src/grp-system/libcore/src/dbus-automount.c index 62daf2ae52..500dcee502 100644 --- a/src/grp-system/libcore/src/dbus-automount.c +++ b/src/grp-system/libcore/src/dbus-automount.c @@ -18,8 +18,8 @@ ***/ #include "core/automount.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/string-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-automount.h" diff --git a/src/grp-system/libcore/src/dbus-busname.c b/src/grp-system/libcore/src/dbus-busname.c index 6fcb129037..d1324e66bd 100644 --- a/src/grp-system/libcore/src/dbus-busname.c +++ b/src/grp-system/libcore/src/dbus-busname.c @@ -19,8 +19,8 @@ #include "core/busname.h" #include "core/unit.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/string-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-busname.h" diff --git a/src/grp-system/libcore/src/dbus-cgroup.c b/src/grp-system/libcore/src/dbus-cgroup.c index a9049bff23..e531f780fd 100644 --- a/src/grp-system/libcore/src/dbus-cgroup.c +++ b/src/grp-system/libcore/src/dbus-cgroup.c @@ -18,12 +18,12 @@ ***/ #include "core/cgroup.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fileio.h" #include "systemd-basic/path-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-cgroup.h" diff --git a/src/grp-system/libcore/src/dbus-execute.c b/src/grp-system/libcore/src/dbus-execute.c index 1b8973fb1c..8029497c3c 100644 --- a/src/grp-system/libcore/src/dbus-execute.c +++ b/src/grp-system/libcore/src/dbus-execute.c @@ -25,6 +25,7 @@ #include "core/execute.h" #include "core/namespace.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/af-list.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/capability-util.h" @@ -37,7 +38,6 @@ #include "systemd-basic/path-util.h" #include "systemd-basic/process-util.h" #include "systemd-basic/rlimit-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-execute.h" #ifdef HAVE_SECCOMP diff --git a/src/grp-system/libcore/src/dbus-kill.c b/src/grp-system/libcore/src/dbus-kill.c index aa31d21542..71337306a6 100644 --- a/src/grp-system/libcore/src/dbus-kill.c +++ b/src/grp-system/libcore/src/dbus-kill.c @@ -18,8 +18,8 @@ ***/ #include "core/kill.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/signal-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-kill.h" diff --git a/src/grp-system/libcore/src/dbus-mount.c b/src/grp-system/libcore/src/dbus-mount.c index 841c11b9d5..ea2abb0e4e 100644 --- a/src/grp-system/libcore/src/dbus-mount.c +++ b/src/grp-system/libcore/src/dbus-mount.c @@ -19,8 +19,8 @@ #include "core/mount.h" #include "core/unit.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/string-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/src/dbus-path.c b/src/grp-system/libcore/src/dbus-path.c index 8819ad26d2..ed57c2133a 100644 --- a/src/grp-system/libcore/src/dbus-path.c +++ b/src/grp-system/libcore/src/dbus-path.c @@ -19,8 +19,8 @@ #include "core/path.h" #include "core/unit.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/string-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-path.h" diff --git a/src/grp-system/libcore/src/dbus-scope.c b/src/grp-system/libcore/src/dbus-scope.c index 5586e1a75f..da930418d5 100644 --- a/src/grp-system/libcore/src/dbus-scope.c +++ b/src/grp-system/libcore/src/dbus-scope.c @@ -21,8 +21,8 @@ #include "core/unit.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-internal.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-kill.h" diff --git a/src/grp-system/libcore/src/dbus-service.c b/src/grp-system/libcore/src/dbus-service.c index 26ce513841..42cd1c52bd 100644 --- a/src/grp-system/libcore/src/dbus-service.c +++ b/src/grp-system/libcore/src/dbus-service.c @@ -19,6 +19,7 @@ #include "core/service.h" #include "core/unit.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/async.h" #include "systemd-basic/fd-util.h" @@ -26,7 +27,6 @@ #include "systemd-basic/path-util.h" #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" -#include "systemd-shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/src/dbus-socket.c b/src/grp-system/libcore/src/dbus-socket.c index 3e22d1a687..2bdfd0a47f 100644 --- a/src/grp-system/libcore/src/dbus-socket.c +++ b/src/grp-system/libcore/src/dbus-socket.c @@ -19,9 +19,9 @@ #include "core/socket.h" #include "core/unit.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/string-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/src/dbus-swap.c b/src/grp-system/libcore/src/dbus-swap.c index dcf8a45ad3..3b0f274ba7 100644 --- a/src/grp-system/libcore/src/dbus-swap.c +++ b/src/grp-system/libcore/src/dbus-swap.c @@ -20,8 +20,8 @@ #include "core/swap.h" #include "core/unit.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/string-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/src/dbus-timer.c b/src/grp-system/libcore/src/dbus-timer.c index a8acd24d3d..6b00168361 100644 --- a/src/grp-system/libcore/src/dbus-timer.c +++ b/src/grp-system/libcore/src/dbus-timer.c @@ -19,9 +19,9 @@ #include "core/timer.h" #include "core/unit.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/strv.h" -#include "systemd-shared/bus-util.h" #include "dbus-timer.h" diff --git a/src/grp-system/libcore/src/dbus.c b/src/grp-system/libcore/src/dbus.c index 16fe5d4ded..4485b38e2e 100644 --- a/src/grp-system/libcore/src/dbus.c +++ b/src/grp-system/libcore/src/dbus.c @@ -27,6 +27,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-internal.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/log.h" @@ -37,7 +38,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/strxcpyx.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/src/failure-action.c b/src/grp-system/libcore/src/failure-action.c index 4fa53a095f..e17ed7219b 100644 --- a/src/grp-system/libcore/src/failure-action.c +++ b/src/grp-system/libcore/src/failure-action.c @@ -24,10 +24,10 @@ #include "core/failure-action.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/special.h" #include "systemd-basic/string-table.h" #include "systemd-basic/terminal-util.h" -#include "systemd-shared/bus-util.h" static void log_and_status(Manager *m, const char *message) { log_warning("%s", message); diff --git a/src/grp-system/libcore/src/kmod-setup.c b/src/grp-system/libcore/src/kmod-setup.c index 06080626b8..0f935380b2 100644 --- a/src/grp-system/libcore/src/kmod-setup.c +++ b/src/grp-system/libcore/src/kmod-setup.c @@ -25,9 +25,9 @@ #endif #include "core/kmod-setup.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/capability-util.h" #include "systemd-basic/macro.h" -#include "systemd-shared/bus-util.h" #ifdef HAVE_KMOD static void systemd_kmod_log( diff --git a/src/grp-system/libcore/src/load-fragment.c b/src/grp-system/libcore/src/load-fragment.c index f4a9b2261c..53f3746f4d 100644 --- a/src/grp-system/libcore/src/load-fragment.c +++ b/src/grp-system/libcore/src/load-fragment.c @@ -35,6 +35,7 @@ #include "core/load-fragment.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-internal.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/af-list.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cap-list.h" @@ -52,7 +53,6 @@ #include "systemd-basic/path-util.h" #include "systemd-basic/process-util.h" #include "systemd-basic/rlimit-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/conf-parser.h" #ifdef HAVE_SECCOMP #include "systemd-shared/seccomp-util.h" diff --git a/src/grp-system/libcore/src/manager.c b/src/grp-system/libcore/src/manager.c index 824f01669d..b769c33b20 100644 --- a/src/grp-system/libcore/src/manager.c +++ b/src/grp-system/libcore/src/manager.c @@ -44,6 +44,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-kernel.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/dirent-util.h" #include "systemd-basic/env-util.h" @@ -76,7 +77,6 @@ #include "systemd-basic/util.h" #include "systemd-basic/virt.h" #include "systemd-shared/boot-timestamps.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/path-lookup.h" #include "systemd-shared/watchdog.h" diff --git a/src/grp-system/libcore/src/mount-setup.c b/src/grp-system/libcore/src/mount-setup.c index 28d799148a..a4e72eda03 100644 --- a/src/grp-system/libcore/src/mount-setup.c +++ b/src/grp-system/libcore/src/mount-setup.c @@ -24,6 +24,7 @@ #include <unistd.h> #include "core/mount-setup.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/fs-util.h" @@ -40,7 +41,6 @@ #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" #include "systemd-basic/virt.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/dev-setup.h" #include "systemd-shared/efivars.h" diff --git a/src/grp-system/libcore/src/path.c b/src/grp-system/libcore/src/path.c index affe6a592d..49c81dffec 100644 --- a/src/grp-system/libcore/src/path.c +++ b/src/grp-system/libcore/src/path.c @@ -25,6 +25,7 @@ #include "core/path.h" #include "core/unit.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fs-util.h" #include "systemd-basic/glob-util.h" @@ -35,7 +36,6 @@ #include "systemd-basic/string-table.h" #include "systemd-basic/string-util.h" #include "systemd-basic/unit-name.h" -#include "systemd-shared/bus-util.h" #include "dbus-path.h" diff --git a/src/grp-system/libcore/src/selinux-access.c b/src/grp-system/libcore/src/selinux-access.c index df3cf14d31..6807af86c1 100644 --- a/src/grp-system/libcore/src/selinux-access.c +++ b/src/grp-system/libcore/src/selinux-access.c @@ -31,6 +31,7 @@ #include <systemd/sd-bus.h> +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/log.h" #include "systemd-basic/path-util.h" @@ -38,7 +39,6 @@ #include "systemd-basic/stdio-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "audit-fd.h" diff --git a/src/grp-system/libcore/src/selinux-access.h b/src/grp-system/libcore/src/selinux-access.h index 1d6fc02a0a..19adabdee3 100644 --- a/src/grp-system/libcore/src/selinux-access.h +++ b/src/grp-system/libcore/src/selinux-access.h @@ -22,7 +22,7 @@ #include <systemd/sd-bus.h> #include "core/manager.h" -#include "systemd-shared/bus-util.h" +#include "sd-bus/bus-util.h" int mac_selinux_generic_access_check(sd_bus_message *message, const char *path, const char *permission, sd_bus_error *error); diff --git a/src/grp-system/libcore/src/service.c b/src/grp-system/libcore/src/service.c index 8f532f5039..df114edf09 100644 --- a/src/grp-system/libcore/src/service.c +++ b/src/grp-system/libcore/src/service.c @@ -27,6 +27,7 @@ #include "core/unit.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-kernel.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/async.h" #include "systemd-basic/def.h" @@ -49,7 +50,6 @@ #include "systemd-basic/unit-name.h" #include "systemd-basic/utf8.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "dbus-service.h" #include "load-dropin.h" diff --git a/src/grp-system/libcore/src/socket.c b/src/grp-system/libcore/src/socket.c index 3350fb6dfd..7e57cc7e79 100644 --- a/src/grp-system/libcore/src/socket.c +++ b/src/grp-system/libcore/src/socket.c @@ -32,6 +32,7 @@ #include "core/socket.h" #include "core/unit.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/copy.h" #include "systemd-basic/def.h" @@ -55,7 +56,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/unit-name.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "dbus-socket.h" #include "unit-printf.h" diff --git a/src/grp-system/libcore/src/timer.c b/src/grp-system/libcore/src/timer.c index 98360cff51..882d871dc9 100644 --- a/src/grp-system/libcore/src/timer.c +++ b/src/grp-system/libcore/src/timer.c @@ -22,6 +22,7 @@ #include "core/timer.h" #include "core/unit.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fs-util.h" #include "systemd-basic/parse-util.h" @@ -32,7 +33,6 @@ #include "systemd-basic/unit-name.h" #include "systemd-basic/user-util.h" #include "systemd-basic/virt.h" -#include "systemd-shared/bus-util.h" #include "dbus-timer.h" diff --git a/src/grp-system/libcore/src/unit.c b/src/grp-system/libcore/src/unit.c index 7ad20bd60d..a36e589b73 100644 --- a/src/grp-system/libcore/src/unit.c +++ b/src/grp-system/libcore/src/unit.c @@ -30,6 +30,7 @@ #include "core/load-fragment.h" #include "core/unit.h" #include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/escape.h" @@ -53,7 +54,6 @@ #include "systemd-basic/unit-name.h" #include "systemd-basic/user-util.h" #include "systemd-basic/virt.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/dropin.h" #include "dbus-unit.h" diff --git a/src/grp-system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c index 1c25fb5b5f..ab9fc4a427 100644 --- a/src/grp-system/systemctl/systemctl.c +++ b/src/grp-system/systemctl/systemctl.c @@ -39,6 +39,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-message.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/copy.h" @@ -74,7 +75,6 @@ #include "systemd-basic/verbs.h" #include "systemd-basic/virt.h" #include "systemd-shared/bus-unit-util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/cgroup-show.h" #include "systemd-shared/dropin.h" #include "systemd-shared/efivars.h" diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c index 4877aeeb30..1c53f9aad3 100644 --- a/src/grp-system/systemd/main.c +++ b/src/grp-system/systemd/main.c @@ -51,6 +51,7 @@ #include "core/selinux-setup.h" #include "core/smack-setup.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/architecture.h" #include "systemd-basic/build.h" @@ -80,7 +81,6 @@ #include "systemd-basic/umask-util.h" #include "systemd-basic/user-util.h" #include "systemd-basic/virt.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/conf-parser.h" #include "systemd-shared/fdset.h" #include "systemd-shared/pager.h" diff --git a/src/grp-timedate/systemd-timedated/timedated.c b/src/grp-timedate/systemd-timedated/timedated.c index 7b9d32682d..bddaf71cb0 100644 --- a/src/grp-timedate/systemd-timedated/timedated.c +++ b/src/grp-timedate/systemd-timedated/timedated.c @@ -27,6 +27,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/clock-util.h" #include "systemd-basic/def.h" @@ -37,7 +38,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n" #define NULL_ADJTIME_LOCAL "0.0 0 0\n0\nLOCAL\n" diff --git a/src/grp-timedate/timedatectl/timedatectl.c b/src/grp-timedate/timedatectl/timedatectl.c index fa284099f4..ae011a7433 100644 --- a/src/grp-timedate/timedatectl/timedatectl.c +++ b/src/grp-timedate/timedatectl/timedatectl.c @@ -26,11 +26,11 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/parse-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/terminal-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/pager.h" #include "systemd-shared/spawn-polkit-agent.h" diff --git a/src/libsystemd-shared/src/bus-unit-util.c b/src/libsystemd-shared/src/bus-unit-util.c index 790a960c4d..f75d82cedd 100644 --- a/src/libsystemd-shared/src/bus-unit-util.c +++ b/src/libsystemd-shared/src/bus-unit-util.c @@ -18,6 +18,7 @@ ***/ #include "sd-bus/bus-internal.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/env-util.h" @@ -36,7 +37,6 @@ #include "systemd-basic/utf8.h" #include "systemd-basic/util.h" #include "systemd-shared/bus-unit-util.h" -#include "systemd-shared/bus-util.h" int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { assert(message); diff --git a/src/libsystemd/src/sd-bus/bus-control.c b/src/libsystemd/src/sd-bus/bus-control.c index 148e583aff..606cdc44ba 100644 --- a/src/libsystemd/src/sd-bus/bus-control.c +++ b/src/libsystemd/src/sd-bus/bus-control.c @@ -32,12 +32,12 @@ #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" #include "bus-bloom.h" #include "bus-control.h" #include "bus-internal.h" #include "bus-message.h" +#include "bus-util.h" _public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) { int r; diff --git a/src/libsystemd/src/sd-bus/bus-convenience.c b/src/libsystemd/src/sd-bus/bus-convenience.c index a02cdbd6dc..e6a92679cf 100644 --- a/src/libsystemd/src/sd-bus/bus-convenience.c +++ b/src/libsystemd/src/sd-bus/bus-convenience.c @@ -18,12 +18,12 @@ ***/ #include "systemd-basic/string-util.h" -#include "systemd-shared/bus-util.h" #include "bus-internal.h" #include "bus-message.h" #include "bus-signature.h" #include "bus-type.h" +#include "bus-util.h" _public_ int sd_bus_emit_signal( sd_bus *bus, diff --git a/src/libsystemd/src/sd-bus/bus-creds.c b/src/libsystemd/src/sd-bus/bus-creds.c index 8d70fc6d25..3b4ebe9ee0 100644 --- a/src/libsystemd/src/sd-bus/bus-creds.c +++ b/src/libsystemd/src/sd-bus/bus-creds.c @@ -37,10 +37,10 @@ #include "systemd-basic/terminal-util.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-creds.h" #include "bus-message.h" +#include "bus-util.h" enum { CAP_OFFSET_INHERITABLE = 0, diff --git a/src/libsystemd/src/sd-bus/bus-kernel.c b/src/libsystemd/src/sd-bus/bus-kernel.c index 0abd85394f..3321a54a51 100644 --- a/src/libsystemd/src/sd-bus/bus-kernel.c +++ b/src/libsystemd/src/sd-bus/bus-kernel.c @@ -45,12 +45,12 @@ #include "systemd-basic/strv.h" #include "systemd-basic/user-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-bloom.h" #include "bus-internal.h" #include "bus-kernel.h" #include "bus-message.h" +#include "bus-util.h" #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t)) diff --git a/src/libsystemd/src/sd-bus/bus-match.c b/src/libsystemd/src/sd-bus/bus-match.c index 75587f6cc3..37a391b46a 100644 --- a/src/libsystemd/src/sd-bus/bus-match.c +++ b/src/libsystemd/src/sd-bus/bus-match.c @@ -23,11 +23,11 @@ #include "systemd-basic/hexdecoct.h" #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" -#include "systemd-shared/bus-util.h" #include "bus-internal.h" #include "bus-match.h" #include "bus-message.h" +#include "bus-util.h" /* Example: * diff --git a/src/libsystemd/src/sd-bus/bus-message.c b/src/libsystemd/src/sd-bus/bus-message.c index 7211092d64..181f6bccb2 100644 --- a/src/libsystemd/src/sd-bus/bus-message.c +++ b/src/libsystemd/src/sd-bus/bus-message.c @@ -32,13 +32,13 @@ #include "systemd-basic/time-util.h" #include "systemd-basic/utf8.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-gvariant.h" #include "bus-internal.h" #include "bus-message.h" #include "bus-signature.h" #include "bus-type.h" +#include "bus-util.h" static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); diff --git a/src/libsystemd/src/sd-bus/bus-objects.c b/src/libsystemd/src/sd-bus/bus-objects.c index 6d781a0a4d..a732a0a928 100644 --- a/src/libsystemd/src/sd-bus/bus-objects.c +++ b/src/libsystemd/src/sd-bus/bus-objects.c @@ -21,7 +21,6 @@ #include "systemd-basic/set.h" #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" -#include "systemd-shared/bus-util.h" #include "bus-internal.h" #include "bus-introspect.h" @@ -30,6 +29,7 @@ #include "bus-signature.h" #include "bus-slot.h" #include "bus-type.h" +#include "bus-util.h" static int node_vtable_get_userdata( sd_bus *bus, diff --git a/src/libsystemd/src/sd-bus/bus-track.c b/src/libsystemd/src/sd-bus/bus-track.c index a8c5946415..86b321bdea 100644 --- a/src/libsystemd/src/sd-bus/bus-track.c +++ b/src/libsystemd/src/sd-bus/bus-track.c @@ -20,10 +20,10 @@ #include <systemd/sd-bus.h> #include "systemd-basic/alloc-util.h" -#include "systemd-shared/bus-util.h" #include "bus-internal.h" #include "bus-track.h" +#include "bus-util.h" struct sd_bus_track { unsigned n_ref; diff --git a/src/libsystemd-shared/src/bus-util.c b/src/libsystemd/src/sd-bus/bus-util.c index f03823852a..c82390634e 100644 --- a/src/libsystemd-shared/src/bus-util.c +++ b/src/libsystemd/src/sd-bus/bus-util.c @@ -34,8 +34,6 @@ #include <systemd/sd-event.h> #include <systemd/sd-id128.h> -#include "sd-bus/bus-internal.h" -#include "sd-bus/bus-message.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/bus-label.h" #include "systemd-basic/def.h" @@ -48,7 +46,10 @@ #include "systemd-basic/stdio-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/user-util.h" -#include "systemd-shared/bus-util.h" + +#include "bus-internal.h" +#include "bus-message.h" +#include "bus-util.h" static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { sd_event *e = userdata; diff --git a/src/libsystemd-shared/include/systemd-shared/bus-util.h b/src/libsystemd/src/sd-bus/bus-util.h index 6b45fad3ce..6b45fad3ce 100644 --- a/src/libsystemd-shared/include/systemd-shared/bus-util.h +++ b/src/libsystemd/src/sd-bus/bus-util.h diff --git a/src/libsystemd/src/sd-bus/sd-bus.c b/src/libsystemd/src/sd-bus/sd-bus.c index 8007c2f94e..52d3e8f2b3 100644 --- a/src/libsystemd/src/sd-bus/sd-bus.c +++ b/src/libsystemd/src/sd-bus/sd-bus.c @@ -40,7 +40,6 @@ #include "systemd-basic/string-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-container.h" #include "bus-control.h" @@ -53,6 +52,7 @@ #include "bus-socket.h" #include "bus-track.h" #include "bus-type.h" +#include "bus-util.h" #define log_debug_bus_message(m) \ do { \ diff --git a/src/libsystemd/src/sd-bus/test-bus-benchmark.c b/src/libsystemd/src/sd-bus/test-bus-benchmark.c index 7c093ce6b8..4561e830c7 100644 --- a/src/libsystemd/src/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/src/sd-bus/test-bus-benchmark.c @@ -26,10 +26,10 @@ #include "systemd-basic/fd-util.h" #include "systemd-basic/time-util.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-internal.h" #include "bus-kernel.h" +#include "bus-util.h" #define MAX_SIZE (2*1024*1024) diff --git a/src/libsystemd/src/sd-bus/test-bus-chat.c b/src/libsystemd/src/sd-bus/test-bus-chat.c index 134713f71e..6dc643c173 100644 --- a/src/libsystemd/src/sd-bus/test-bus-chat.c +++ b/src/libsystemd/src/sd-bus/test-bus-chat.c @@ -30,11 +30,11 @@ #include "systemd-basic/log.h" #include "systemd-basic/macro.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-error.h" #include "bus-internal.h" #include "bus-match.h" +#include "bus-util.h" static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m))); diff --git a/src/libsystemd/src/sd-bus/test-bus-cleanup.c b/src/libsystemd/src/sd-bus/test-bus-cleanup.c index 6e2f47a3f7..1a461032cc 100644 --- a/src/libsystemd/src/sd-bus/test-bus-cleanup.c +++ b/src/libsystemd/src/sd-bus/test-bus-cleanup.c @@ -22,10 +22,10 @@ #include <systemd/sd-bus.h> #include "systemd-basic/refcnt.h" -#include "systemd-shared/bus-util.h" #include "bus-internal.h" #include "bus-message.h" +#include "bus-util.h" static void test_bus_new(void) { _cleanup_(sd_bus_unrefp) sd_bus *bus = NULL; diff --git a/src/libsystemd/src/sd-bus/test-bus-creds.c b/src/libsystemd/src/sd-bus/test-bus-creds.c index f3588e1644..fd226e06d2 100644 --- a/src/libsystemd/src/sd-bus/test-bus-creds.c +++ b/src/libsystemd/src/sd-bus/test-bus-creds.c @@ -20,9 +20,9 @@ #include <systemd/sd-bus.h> #include "systemd-basic/cgroup-util.h" -#include "systemd-shared/bus-util.h" #include "bus-dump.h" +#include "bus-util.h" int main(int argc, char *argv[]) { _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL; diff --git a/src/libsystemd/src/sd-bus/test-bus-error.c b/src/libsystemd/src/sd-bus/test-bus-error.c index 1a72524e41..dbc120b4df 100644 --- a/src/libsystemd/src/sd-bus/test-bus-error.c +++ b/src/libsystemd/src/sd-bus/test-bus-error.c @@ -20,10 +20,10 @@ #include <systemd/sd-bus.h> #include "systemd-basic/errno-list.h" -#include "systemd-shared/bus-util.h" #include "bus-common-errors.h" #include "bus-error.h" +#include "bus-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/src/sd-bus/test-bus-gvariant.c b/src/libsystemd/src/sd-bus/test-bus-gvariant.c index a27d95ee94..ca396bd426 100644 --- a/src/libsystemd/src/sd-bus/test-bus-gvariant.c +++ b/src/libsystemd/src/sd-bus/test-bus-gvariant.c @@ -26,12 +26,12 @@ #include "systemd-basic/alloc-util.h" #include "systemd-basic/macro.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-dump.h" #include "bus-gvariant.h" #include "bus-internal.h" #include "bus-message.h" +#include "bus-util.h" static void test_bus_gvariant_is_fixed_size(void) { assert_se(bus_gvariant_is_fixed_size("") > 0); 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 fd848dbe75..ace45d770d 100644 --- a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c +++ b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c @@ -23,9 +23,9 @@ #include "systemd-basic/fd-util.h" #include "systemd-basic/log.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-kernel.h" +#include "bus-util.h" static int test_match(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { int *found = userdata; diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel.c b/src/libsystemd/src/sd-bus/test-bus-kernel.c index 8385619bf2..040bfe0dcf 100644 --- a/src/libsystemd/src/sd-bus/test-bus-kernel.c +++ b/src/libsystemd/src/sd-bus/test-bus-kernel.c @@ -25,10 +25,10 @@ #include "systemd-basic/fd-util.h" #include "systemd-basic/log.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-dump.h" #include "bus-kernel.h" +#include "bus-util.h" int main(int argc, char *argv[]) { _cleanup_close_ int bus_ref = -1; diff --git a/src/libsystemd/src/sd-bus/test-bus-marshal.c b/src/libsystemd/src/sd-bus/test-bus-marshal.c index 0db10fc1e9..9c66ba4538 100644 --- a/src/libsystemd/src/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/src/sd-bus/test-bus-marshal.c @@ -36,10 +36,10 @@ #include "systemd-basic/hexdecoct.h" #include "systemd-basic/log.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-dump.h" #include "bus-message.h" +#include "bus-util.h" static void test_bus_path_encode_unique(void) { _cleanup_free_ char *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL; diff --git a/src/libsystemd/src/sd-bus/test-bus-match.c b/src/libsystemd/src/sd-bus/test-bus-match.c index 016af3d5cb..bedc4d41bd 100644 --- a/src/libsystemd/src/sd-bus/test-bus-match.c +++ b/src/libsystemd/src/sd-bus/test-bus-match.c @@ -19,11 +19,11 @@ #include "systemd-basic/log.h" #include "systemd-basic/macro.h" -#include "systemd-shared/bus-util.h" #include "bus-match.h" #include "bus-message.h" #include "bus-slot.h" +#include "bus-util.h" static bool mask[32]; diff --git a/src/libsystemd/src/sd-bus/test-bus-objects.c b/src/libsystemd/src/sd-bus/test-bus-objects.c index 4fed4cdcc9..379c6f85ee 100644 --- a/src/libsystemd/src/sd-bus/test-bus-objects.c +++ b/src/libsystemd/src/sd-bus/test-bus-objects.c @@ -27,11 +27,11 @@ #include "systemd-basic/macro.h" #include "systemd-basic/strv.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-dump.h" #include "bus-internal.h" #include "bus-message.h" +#include "bus-util.h" struct context { int fds[2]; diff --git a/src/libsystemd/src/sd-bus/test-bus-server.c b/src/libsystemd/src/sd-bus/test-bus-server.c index 423edcbbda..ce78faaefb 100644 --- a/src/libsystemd/src/sd-bus/test-bus-server.c +++ b/src/libsystemd/src/sd-bus/test-bus-server.c @@ -25,9 +25,9 @@ #include "systemd-basic/log.h" #include "systemd-basic/macro.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "bus-internal.h" +#include "bus-util.h" struct context { int fds[2]; diff --git a/src/systemd-cgls/cgls.c b/src/systemd-cgls/cgls.c index 8cfa98a8f5..b8703e7f17 100644 --- a/src/systemd-cgls/cgls.c +++ b/src/systemd-cgls/cgls.c @@ -26,6 +26,7 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/fileio.h" @@ -33,7 +34,6 @@ #include "systemd-basic/path-util.h" #include "systemd-basic/unit-name.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/cgroup-show.h" #include "systemd-shared/output-mode.h" #include "systemd-shared/pager.h" diff --git a/src/systemd-cgtop/cgtop.c b/src/systemd-cgtop/cgtop.c index 0cb83bcedf..b5f569c649 100644 --- a/src/systemd-cgtop/cgtop.c +++ b/src/systemd-cgtop/cgtop.c @@ -29,6 +29,7 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/fd-util.h" @@ -41,7 +42,6 @@ #include "systemd-basic/terminal-util.h" #include "systemd-basic/unit-name.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" typedef struct Group { char *path; diff --git a/src/systemd-initctl/initctl.c b/src/systemd-initctl/initctl.c index 7711699b7c..fa91d8f3a0 100644 --- a/src/systemd-initctl/initctl.c +++ b/src/systemd-initctl/initctl.c @@ -27,6 +27,7 @@ #include <systemd/sd-daemon.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/def.h" #include "systemd-basic/fd-util.h" @@ -35,7 +36,6 @@ #include "systemd-basic/log.h" #include "systemd-basic/special.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/initreq.h" #define SERVER_FD_MAX 16 diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c index 6b7d2d0067..fc6982e55f 100644 --- a/src/systemd-nspawn/nspawn-register.c +++ b/src/systemd-nspawn/nspawn-register.c @@ -20,11 +20,11 @@ #include <systemd/sd-bus.h> #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/stat-util.h" #include "systemd-basic/strv.h" #include "systemd-basic/util.h" #include "systemd-shared/bus-unit-util.h" -#include "systemd-shared/bus-util.h" #include "nspawn-register.h" diff --git a/src/systemd-stdio-bridge/stdio-bridge.c b/src/systemd-stdio-bridge/stdio-bridge.c index 8b1c977c8e..9aa17e861c 100644 --- a/src/systemd-stdio-bridge/stdio-bridge.c +++ b/src/systemd-stdio-bridge/stdio-bridge.c @@ -28,10 +28,10 @@ #include <systemd/sd-daemon.h> #include "sd-bus/bus-internal.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/build.h" #include "systemd-basic/log.h" #include "systemd-basic/util.h" -#include "systemd-shared/bus-util.h" #define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket" diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 185eb56dab..7878707cbe 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -22,8 +22,8 @@ #include <string.h> #include "core/manager.h" +#include "sd-bus/bus-util.h" #include "systemd-basic/rm-rf.h" -#include "systemd-shared/bus-util.h" #include "systemd-shared/tests.h" #include "test-helper.h" diff --git a/tools/notsd-move b/tools/notsd-move index 23469ba407..50be86f623 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -48,7 +48,6 @@ grp() { move_files() ( # first focus on getting directories to the right names. - mv -T src/{,systemd-}dbus1-generator mv -T src/{,systemd-}debug-generator mv -T src/{,systemd-}fstab-generator mv -T src/{,systemd-}getty-generator @@ -710,6 +709,10 @@ move_files() ( done rmdir system-preset + mv -t src/libsystemd/src/sd-bus \ + src/libsystemd-shared/src/bus-util.c \ + src/libsystemd-shared/include/systemd-shared/bus-util.h + ln -srT src/libsystemd/include/systemd/_sd-common.h src/libsystemd-network/include/systemd-network/_sd-common.h ln -srT src/libsystemd/include/systemd/_sd-common.h src/grp-utils/systemd-path/_sd-common.h ln -srT src/grp-login/systemd-logind/logind-acl.h src/grp-udev/libudev-core/logind-acl.h @@ -827,6 +830,7 @@ run() ( move() ( find . \( -name Makefile -o -name '*.mk' \) -delete + find src -type d -empty -exec rmdir -p --ignore-fail-on-non-empty -- {} + >&2 echo ' => breakup_zshcompletion' run breakup_zshcompletion |