From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 10 Sep 2024 19:03:57 +0000 (+0900)
Subject: timesync: use BusObjectImplementation
X-Git-Tag: v257-rc1~488^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40108953c5894ed257174265628457c2d0da987b;p=thirdparty%2Fsystemd.git

timesync: use BusObjectImplementation
---

diff --git a/src/timesync/timesyncd-bus.c b/src/timesync/timesyncd-bus.c
index d1d2a14c0f5..a3be1e2ef97 100644
--- a/src/timesync/timesyncd-bus.c
+++ b/src/timesync/timesyncd-bus.c
@@ -246,9 +246,9 @@ int manager_connect_bus(Manager *m) {
         if (r < 0)
                 return log_error_errno(r, "Failed to connect to bus: %m");
 
-        r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/timesync1", "org.freedesktop.timesync1.Manager", manager_vtable, m);
+        r = bus_add_implementation(m->bus, &manager_object, m);
         if (r < 0)
-                return log_error_errno(r, "Failed to add manager object vtable: %m");
+                return r;
 
         r = bus_log_control_api_register(m->bus);
         if (r < 0)
@@ -264,3 +264,9 @@ int manager_connect_bus(Manager *m) {
 
         return 0;
 }
+
+const BusObjectImplementation manager_object = {
+        "/org/freedesktop/timesync1",
+        "org.freedesktop.timesync1.Manager",
+        .vtables = BUS_VTABLES(manager_vtable),
+};
diff --git a/src/timesync/timesyncd-bus.h b/src/timesync/timesyncd-bus.h
index 83db2167e26..b2b5a2b30e8 100644
--- a/src/timesync/timesyncd-bus.h
+++ b/src/timesync/timesyncd-bus.h
@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "bus-object.h"
 #include "timesyncd-manager.h"
 
+extern const BusObjectImplementation manager_object;
+
 int manager_connect_bus(Manager *m);