10:36 a.m.
Use constant methods array instead of function calls.
---
examples/dbus-service.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/examples/dbus-service.c b/examples/dbus-service.c
index 40c1646..5630cad 100644
--- a/examples/dbus-service.c
+++ b/examples/dbus-service.c
@@ -189,15 +189,6 @@ static struct l_dbus_message *test_method_call(struct l_dbus *dbus,
static void setup_test_interface(struct l_dbus_interface *interface)
{
- l_dbus_interface_method(interface, "GetProperties", 0,
- test_get_properties,
- "a{sv}", "", "properties");
- l_dbus_interface_method(interface, "SetProperty", 0,
- test_set_property,
- "", "sv", "name", "value");
- l_dbus_interface_method(interface, "MethodCall", 0,
- test_method_call, "", "");
-
l_dbus_interface_signal(interface, "PropertyChanged", 0,
"sv", "name", "value");
@@ -205,6 +196,18 @@ static void setup_test_interface(struct l_dbus_interface *interface)
l_dbus_interface_rw_property(interface, "Integer", "u");
}
+static const struct l_dbus_method test_methods[] = {
+ { L_DBUS_METHOD("GetProperties",
+ L_DBUS_ARGS({ "properties", "a{sv}" }), NULL,
+ test_get_properties) },
+ { L_DBUS_METHOD("SetProperty",
+ NULL, L_DBUS_ARGS({ "name", "s" }, { "value",
"v"}),
+ test_set_property) },
+ { L_DBUS_METHOD("MethodCall",
+ NULL, NULL, test_method_call) },
+ { },
+};
+
int main(int argc, char *argv[])
{
struct l_dbus *dbus;
@@ -235,8 +238,8 @@ int main(int argc, char *argv[])
test->integer = 42;
if (!l_dbus_register_interface(dbus, "/test", "org.test",
- setup_test_interface, test,
- test_data_destroy)) {
+ test_methods, setup_test_interface,
+ test, test_data_destroy)) {
l_info("Unable to register interface");
test_data_destroy(test);
goto cleanup;
--
2.0.4