From: OMOJOLA JOSHUA <109356020+1awesomeJ@users.noreply.github.com>
Date: Wed, 15 Mar 2023 00:12:57 +0000 (+0100)
Subject: src: changed instances of sd_bus_call_method() to bus_call_method() (#26819)
X-Git-Tag: v254-rc1~1029
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59228d0dbf91b72be954ac8f93185f32ba4e4f51;p=thirdparty%2Fsystemd.git

src: changed instances of sd_bus_call_method() to bus_call_method() (#26819)

* src: changed instances of sd_bus_call_method() to bus_call_method()
---

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index e25c5d5efa6..cfdc6b24bf9 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -17,6 +17,7 @@
 #include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
+#include "bus-locator.h"
 #include "bus-util.h"
 #include "device-util.h"
 #include "fd-util.h"
@@ -53,14 +54,7 @@ static void start_target(const char *target, const char *mode) {
         log_info("Requesting %s/start/%s", target, mode);
 
         /* Start this unit only if we can replace basic.target with it */
-        r = sd_bus_call_method(bus,
-                               "org.freedesktop.systemd1",
-                               "/org/freedesktop/systemd1",
-                               "org.freedesktop.systemd1.Manager",
-                               "StartUnitReplace",
-                               &error,
-                               NULL,
-                               "sss", "basic.target", target, mode);
+        r = bus_call_method(bus, bus_systemd_mgr, "StartUnitReplace", &error, NULL, "sss", "basic.target", target, mode);
 
         /* Don't print a warning if we aren't called during startup */
         if (r < 0 && !sd_bus_error_has_name(&error, BUS_ERROR_NO_SUCH_JOB))
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 138321680d7..28cd5f05f1f 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -627,14 +627,7 @@ static int do_daemon_reload(void) {
         FOREACH_STRING(unit, SPECIAL_INITRD_FS_TARGET, SPECIAL_SWAP_TARGET) {
                 log_info("Requesting %s/start/replace...", unit);
 
-                k = sd_bus_call_method(bus,
-                                       "org.freedesktop.systemd1",
-                                       "/org/freedesktop/systemd1",
-                                       "org.freedesktop.systemd1.Manager",
-                                       "StartUnit",
-                                       &error,
-                                       NULL,
-                                       "ss", unit, "replace");
+                k = bus_call_method(bus, bus_systemd_mgr, "StartUnit", &error, NULL, "ss", unit, "replace");
                 if (k < 0) {
                         log_error_errno(k, "Failed to (re)start %s: %s", unit, bus_error_message(&error, r));
                         if (r == 0)
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index 0882570a660..99f28721de2 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -13,6 +13,7 @@
 
 #include "alloc-util.h"
 #include "bus-error.h"
+#include "bus-locator.h"
 #include "bus-util.h"
 #include "constants.h"
 #include "daemon-util.h"
@@ -106,15 +107,7 @@ static int change_runlevel(Server *s, int runlevel) {
 
         log_debug("Requesting %s/start/%s", target, mode);
 
-        r = sd_bus_call_method(
-                        s->bus,
-                        "org.freedesktop.systemd1",
-                        "/org/freedesktop/systemd1",
-                        "org.freedesktop.systemd1.Manager",
-                        "StartUnit",
-                        &error,
-                        NULL,
-                        "ss", target, mode);
+        r = bus_call_method(s->bus, bus_systemd_mgr, "StartUnit", &error, NULL, "ss", target, mode);
         if (r < 0)
                 return log_error_errno(r, "Failed to change runlevel: %s", bus_error_message(&error, r));
 
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 841e5e3e91a..2f23eab92ba 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -14,6 +14,7 @@
 
 #include "alloc-util.h"
 #include "bus-error.h"
+#include "bus-locator.h"
 #include "bus-log-control-api.h"
 #include "bus-message.h"
 #include "bus-polkit.h"
@@ -60,14 +61,7 @@ static int vconsole_reload(sd_bus *bus) {
 
         assert(bus);
 
-        r = sd_bus_call_method(bus,
-                        "org.freedesktop.systemd1",
-                        "/org/freedesktop/systemd1",
-                        "org.freedesktop.systemd1.Manager",
-                        "RestartUnit",
-                        &error,
-                        NULL,
-                        "ss", "systemd-vconsole-setup.service", "replace");
+        r = bus_call_method(bus, bus_systemd_mgr, "RestartUnit", &error, NULL, "ss", "systemd-vconsole-setup.service", "replace");
 
         if (r < 0)
                 return log_error_errno(r, "Failed to issue method call: %s", bus_error_message(&error, r));
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 618850febaf..8e1c54dbe20 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -9,6 +9,7 @@
 
 #include "alloc-util.h"
 #include "bus-error.h"
+#include "bus-locator.h"
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "conf-parser.h"
@@ -538,15 +539,7 @@ int manager_spawn_autovt(Manager *m, unsigned vtnr) {
         }
 
         xsprintf(name, "autovt@tty%u.service", vtnr);
-        r = sd_bus_call_method(
-                        m->bus,
-                        "org.freedesktop.systemd1",
-                        "/org/freedesktop/systemd1",
-                        "org.freedesktop.systemd1.Manager",
-                        "StartUnit",
-                        &error,
-                        NULL,
-                        "ss", name, "fail");
+        r = bus_call_method(m->bus, bus_systemd_mgr, "StartUnit", &error, NULL, "ss", name, "fail");
         if (r < 0)
                 return log_error_errno(r, "Failed to start %s: %s", name, bus_error_message(&error, r));