From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 11 May 2018 09:10:03 +0000 (+0900)
Subject: dbus-socket: use BUS_DEFINE_PROPERTY_GET* macros
X-Git-Tag: v239~261^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a54f28bc1eca1fa685f6bf0f816286263d37b597;p=thirdparty%2Fsystemd.git

dbus-socket: use BUS_DEFINE_PROPERTY_GET* macros
---

diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index d6670a91cdb..893e3d38392 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -23,6 +23,7 @@
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, socket_result, SocketResult);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_bind_ipv6_only, socket_address_bind_ipv6_only, SocketAddressBindIPv6Only);
+static BUS_DEFINE_PROPERTY_GET(property_get_fdname, "s", Socket, socket_fdname);
 
 static int property_get_listen(
                 sd_bus *bus,
@@ -78,24 +79,6 @@ static int property_get_listen(
         return sd_bus_message_close_container(reply);
 }
 
-static int property_get_fdname(
-                sd_bus *bus,
-                const char *path,
-                const char *interface,
-                const char *property,
-                sd_bus_message *reply,
-                void *userdata,
-                sd_bus_error *error) {
-
-        Socket *s = SOCKET(userdata);
-
-        assert(bus);
-        assert(reply);
-        assert(s);
-
-        return sd_bus_message_append(reply, "s", socket_fdname(s));
-}
-
 const sd_bus_vtable bus_socket_vtable[] = {
         SD_BUS_VTABLE_START(0),
         SD_BUS_PROPERTY("BindIPv6Only", "s", property_get_bind_ipv6_only, offsetof(Socket, bind_ipv6_only), SD_BUS_VTABLE_PROPERTY_CONST),