From d27753061613183e4c63764efec11edcafb09082 Mon Sep 17 00:00:00 2001
From: williamsumendap <110759212+williamsumendap@users.noreply.github.com>
Date: Fri, 12 Aug 2022 11:28:29 -0700
Subject: [PATCH] network: replace usage of sd_bus_call_method_async() to
 bus_call_method_async() (#24290)

---
 src/network/networkd-dhcp-common.c | 7 +++----
 src/network/networkd-manager.c     | 6 ++----
 src/shared/bus-locator.c           | 6 ++++++
 src/shared/bus-locator.h           | 1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
index ce5262fcd6..9477127885 100644
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@@ -4,6 +4,7 @@
 #include <linux/if_arp.h>
 
 #include "bus-error.h"
+#include "bus-locator.h"
 #include "dhcp-identifier.h"
 #include "dhcp-internal.h"
 #include "dhcp6-internal.h"
@@ -187,12 +188,10 @@ int manager_request_product_uuid(Manager *m) {
 
         m->product_uuid_requested = false;
 
-        r = sd_bus_call_method_async(
+        r = bus_call_method_async(
                         m->bus,
                         NULL,
-                        "org.freedesktop.hostname1",
-                        "/org/freedesktop/hostname1",
-                        "org.freedesktop.hostname1",
+                        bus_hostname,
                         "GetProductUUID",
                         get_product_uuid_handler,
                         m,
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index fe0a739410..9b77f536c8 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -993,12 +993,10 @@ int manager_set_hostname(Manager *m, const char *hostname) {
                 return 0;
         }
 
-        r = sd_bus_call_method_async(
+        r = bus_call_method_async(
                         m->bus,
                         NULL,
-                        "org.freedesktop.hostname1",
-                        "/org/freedesktop/hostname1",
-                        "org.freedesktop.hostname1",
+                        bus_hostname,
                         "SetHostname",
                         set_hostname_handler,
                         m,
diff --git a/src/shared/bus-locator.c b/src/shared/bus-locator.c
index 3754d1dd68..5b9a6dbc43 100644
--- a/src/shared/bus-locator.c
+++ b/src/shared/bus-locator.c
@@ -63,6 +63,12 @@ const BusLocator* const bus_timedate = &(BusLocator){
         .interface = "org.freedesktop.timedate1"
 };
 
+const BusLocator* const bus_hostname = &(BusLocator){
+        .destination = "org.freedesktop.hostname1",
+        .path = "/org/freedesktop/hostname1",
+        .interface = "org.freedesktop.hostname1"
+};
+
 /* Shorthand flavors of the sd-bus convenience helpers with destination,path,interface strings encapsulated
  * within a single struct. */
 int bus_call_method_async(
diff --git a/src/shared/bus-locator.h b/src/shared/bus-locator.h
index fe3b876527..9662c906e1 100644
--- a/src/shared/bus-locator.h
+++ b/src/shared/bus-locator.h
@@ -19,6 +19,7 @@ extern const BusLocator* const bus_portable_mgr;
 extern const BusLocator* const bus_resolve_mgr;
 extern const BusLocator* const bus_systemd_mgr;
 extern const BusLocator* const bus_timedate;
+extern const BusLocator* const bus_hostname;
 
 /* Shorthand flavors of the sd-bus convenience helpers with destination,path,interface strings encapsulated
  * within a single struct. */
-- 
2.25.1