core: use BUS_DEFINE_PROPERTY_GET() macro at more places

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 7ca3b815efad4918b7db3164e3d9c23289c64126..c113140e8f621d570db459b9013d8a60981b25be 100644 (file)
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -53,6 +53,7 @@ static BUS_DEFINE_PROPERTY_GET2(property_get_system_state, "s", Manager, manager
 static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_timer_slack_nsec, "t", (uint64_t) prctl(PR_GET_TIMERSLACK));
 static BUS_DEFINE_PROPERTY_GET_REF(property_get_hashmap_size, "u", Hashmap *, hashmap_size);
 static BUS_DEFINE_PROPERTY_GET_REF(property_get_set_size, "u", Set *, set_size);
+static BUS_DEFINE_PROPERTY_GET(property_get_default_timeout_abort_usec, "t", Manager, manager_default_timeout_abort_usec);
 
 static int property_get_virtualization(
                 sd_bus *bus,
@@ -287,27 +288,6 @@ static int property_set_runtime_watchdog(
         return watchdog_set_timeout(t);
 }
 
-static int property_get_default_timeout_abort_usec(
-                sd_bus *bus,
-                const char *path,
-                const char *interface,
-                const char *property,
-                sd_bus_message *reply,
-                void *userdata,
-                sd_bus_error *error) {
-
-        Manager *m = userdata;
-        usec_t t;
-
-        assert(bus);
-        assert(reply);
-        assert(m);
-
-        t = manager_default_timeout_abort_usec(m);
-
-        return sd_bus_message_append(reply, "t", t);
-}
-
 static int bus_get_unit_by_name(Manager *m, sd_bus_message *message, const char *name, Unit **ret_unit, sd_bus_error *error) {
         Unit *u;
         int r;

diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 4fba8ae62f736bd40ebb6313ef9510bcdb334138..824955b944d8e8fe21273f2b72e680529acce787 100644 (file)
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -28,27 +28,7 @@ static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, service_result, Service
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_restart, service_restart, ServiceRestart);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_notify_access, notify_access, NotifyAccess);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_emergency_action, emergency_action, EmergencyAction);
-
-static int property_get_timeout_abort_usec(
-                sd_bus *bus,
-                const char *path,
-                const char *interface,
-                const char *property,
-                sd_bus_message *reply,
-                void *userdata,
-                sd_bus_error *error) {
-
-        Service *s = userdata;
-        usec_t t;
-
-        assert(bus);
-        assert(reply);
-        assert(s);
-
-        t = service_timeout_abort_usec(s);
-
-        return sd_bus_message_append(reply, "t", t);
-}
+static BUS_DEFINE_PROPERTY_GET(property_get_timeout_abort_usec, "t", Service, service_timeout_abort_usec);
 
 static int property_get_exit_status_set(
                 sd_bus *bus,