summaryrefslogtreecommitdiff
path: root/src/core/dbus-socket.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-05-11 18:10:03 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-05-13 12:21:09 +0900
commita54f28bc1eca1fa685f6bf0f816286263d37b597 (patch)
treed6b437feb0b388a3ccac5901a2637bfd2dbd3047 /src/core/dbus-socket.c
parentf724fd4c2582071f9d5bf5100521d5b828a77645 (diff)
downloadsystemd-a54f28bc1eca1fa685f6bf0f816286263d37b597.tar.gz
dbus-socket: use BUS_DEFINE_PROPERTY_GET* macros
Diffstat (limited to 'src/core/dbus-socket.c')
-rw-r--r--src/core/dbus-socket.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index d6670a91cd..893e3d3839 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),