From 713e95b39f923b5b77315a4fe60650bdfcc81ec9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 13 May 2018 12:20:51 +0900 Subject: [PATCH] bus-util: add several macros for defining functions of getting dbus properties --- src/shared/bus-util.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h index 5a3421405..b65fce184 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-util.h @@ -138,6 +138,44 @@ int bus_log_create_error(int r); #if 0 /// UNNEEDED by elogind #endif // 0 +#define BUS_DEFINE_PROPERTY_GET_GLOBAL(function, bus_type, val) \ + int function(sd_bus *bus, \ + const char *path, \ + const char *interface, \ + const char *property, \ + sd_bus_message *reply, \ + void *userdata, \ + sd_bus_error *error) { \ + \ + assert(bus); \ + assert(reply); \ + \ + return sd_bus_message_append(reply, bus_type, val); \ + } + +#define BUS_DEFINE_PROPERTY_GET2(function, bus_type, data_type, get1, get2) \ + int function(sd_bus *bus, \ + const char *path, \ + const char *interface, \ + const char *property, \ + sd_bus_message *reply, \ + void *userdata, \ + sd_bus_error *error) { \ + \ + data_type *data = userdata; \ + \ + assert(bus); \ + assert(reply); \ + assert(data); \ + \ + return sd_bus_message_append(reply, bus_type, \ + get2(get1(data))); \ + } + +#define ident(x) (x) +#define BUS_DEFINE_PROPERTY_GET(function, bus_type, data_type, get1) \ + BUS_DEFINE_PROPERTY_GET2(function, bus_type, data_type, get1, ident) + #define BUS_DEFINE_PROPERTY_GET_ENUM(function, name, type) \ int function(sd_bus *bus, \ const char *path, \ -- 2.30.2