Merge pull request #16303 from poettering/dbus-util-split

shared: split src/shared/bus-util.c into multiple files

15 files changed, 15 insertions, 14 deletions

diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c
index bd6e6a9dde..70b85d8023 100644
--- a/src/core/dbus-automount.c
+++ b/src/core/dbus-automount.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "automount.h"
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "dbus-automount.h"
 #include "dbus-util.h"
 #include "string-util.h"
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index 080f6fb1ae..b7d2e32639 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -5,7 +5,7 @@
 #include "af-list.h"
 #include "alloc-util.h"
 #include "bpf-firewall.h"
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "cgroup-util.h"
 #include "cgroup.h"
 #include "dbus-cgroup.h"
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 41d64e8004..50f7ada8ce 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -9,7 +9,7 @@
 
 #include "af-list.h"
 #include "alloc-util.h"
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "cap-list.h"
 #include "capability-util.h"
 #include "cpu-set-util.h"
diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index 404984f664..33e4128909 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -3,6 +3,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "bus-get-properties.h"
 #include "bus-util.h"
 #include "dbus-job.h"
 #include "dbus-unit.h"
diff --git a/src/core/dbus-job.h b/src/core/dbus-job.h
index a840c6dfe8..96c5b66309 100644
--- a/src/core/dbus-job.h
+++ b/src/core/dbus-job.h
@@ -4,7 +4,7 @@
 #include "sd-bus.h"
 
 #include "unit.h"
-#include "bus-util.h"
+#include "bus-object.h"
 
 extern const sd_bus_vtable bus_job_vtable[];
 extern const BusObjectImplementation job_object;
diff --git a/src/core/dbus-kill.c b/src/core/dbus-kill.c
index 30597e86f0..eda3410375 100644
--- a/src/core/dbus-kill.c
+++ b/src/core/dbus-kill.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "dbus-kill.h"
 #include "dbus-util.h"
 #include "kill.h"
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 5cb06867cb..07e139c5ad 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -9,8 +9,8 @@
 #include "architecture.h"
 #include "build.h"
 #include "bus-common-errors.h"
+#include "bus-get-properties.h"
 #include "bus-log-control-api.h"
-#include "bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-job.h"
diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
index 3ab5ecc425..bab12cc4ff 100644
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c
index 1a97d62486..76cd9d3260 100644
--- a/src/core/dbus-path.c
+++ b/src/core/dbus-path.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "alloc-util.h"
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "dbus-path.h"
 #include "dbus-util.h"
 #include "list.h"
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
index 2d877a8c55..aecfda6535 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -2,7 +2,7 @@
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "dbus-cgroup.h"
 #include "dbus-kill.h"
 #include "dbus-scope.h"
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 5d4f4ef506..3cc453dff5 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -4,7 +4,7 @@
 
 #include "alloc-util.h"
 #include "async.h"
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index 73e6a74914..f01489e29a 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "alloc-util.h"
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c
index 57c8c42091..cb4824b6bd 100644
--- a/src/core/dbus-swap.c
+++ b/src/core/dbus-swap.c
@@ -3,7 +3,7 @@
   Copyright © 2010 Maarten Lankhorst
 ***/
 
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-swap.h"
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 439c276fac..da35fa8678 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "alloc-util.h"
-#include "bus-util.h"
+#include "bus-get-properties.h"
 #include "dbus-timer.h"
 #include "dbus-util.h"
 #include "strv.h"
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 320e830728..9e9d3b101e 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -5,8 +5,8 @@
 #include "alloc-util.h"
 #include "bpf-firewall.h"
 #include "bus-common-errors.h"
+#include "bus-get-properties.h"
 #include "bus-polkit.h"
-#include "bus-util.h"
 #include "cgroup-util.h"
 #include "condition.h"
 #include "dbus-job.h"