2019-07-04 12:34:26

by Michał Lowas-Rzechonek

Subject: [PATCH BlueZ v5 2/5] mesh: Cleanup D-Bus method returns with empty result

---
mesh/node.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/mesh/node.c b/mesh/node.c
index 1dcb74b4f..53876ef5a 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -1949,7 +1949,6 @@ static struct l_dbus_message *send_call(struct l_dbus *dbus,
uint16_t dst, app_idx, src;
uint8_t *data;
uint32_t len;
- struct l_dbus_message *reply;

l_debug("Send");

@@ -1978,10 +1977,7 @@ static struct l_dbus_message *send_call(struct l_dbus *dbus,
mesh_net_get_default_ttl(node->net), data, len))
return dbus_error(msg, MESH_ERROR_FAILED, NULL);

- reply = l_dbus_message_new_method_return(msg);
- l_dbus_message_set_arguments(reply, "");
-
- return reply;
+ return l_dbus_message_new_method_return(msg);
}

static struct l_dbus_message *publish_call(struct l_dbus *dbus,
@@ -1995,7 +1991,6 @@ static struct l_dbus_message *publish_call(struct l_dbus *dbus,
struct node_element *ele;
uint8_t *data;
uint32_t len;
- struct l_dbus_message *reply;
int result;

l_debug("Publish");
@@ -2027,10 +2022,7 @@ static struct l_dbus_message *publish_call(struct l_dbus *dbus,
if (result != MESH_ERROR_NONE)
return dbus_error(msg, result, NULL);

- reply = l_dbus_message_new_method_return(msg);
- l_dbus_message_set_arguments(reply, "");
-
- return reply;
+ return l_dbus_message_new_method_return(msg);
}

static struct l_dbus_message *vendor_publish_call(struct l_dbus *dbus,
@@ -2046,7 +2038,6 @@ static struct l_dbus_message *vendor_publish_call(struct l_dbus *dbus,
struct node_element *ele;
uint8_t *data = NULL;
uint32_t len;
- struct l_dbus_message *reply;
int result;

l_debug("Publish");
@@ -2079,10 +2070,7 @@ static struct l_dbus_message *vendor_publish_call(struct l_dbus *dbus,
if (result != MESH_ERROR_NONE)
return dbus_error(msg, result, NULL);

- reply = l_dbus_message_new_method_return(msg);
- l_dbus_message_set_arguments(reply, "");
-
- return reply;
+ return l_dbus_message_new_method_return(msg);
}

static void setup_node_interface(struct l_dbus_interface *iface)
--
2.19.1