mesh: Use l_dbus_message...() APIs in more consistent fashion

This removes checks for the return values of l_dbus_message...()
calls in the few places where we can rely on ell to handle error
cases gracefully.

Change-Id: Ib34c50366b0a93456bb4f891cc750777089e4147
Signed-off-by: Anupam Roy <anupam.r@samsung.com>

diff --git a/mesh/dbus.c b/mesh/dbus.c
index 2b700a1..6b9694a 100644 (file)
--- a/mesh/dbus.c
+++ b/mesh/dbus.c
@@ -113,29 +113,29 @@ bool dbus_match_interface(struct l_dbus_message_iter *interfaces,
        return false;
 }
 
-bool dbus_append_byte_array(struct l_dbus_message_builder *builder,
+void dbus_append_byte_array(struct l_dbus_message_builder *builder,
                                                const uint8_t *data, int len)
 {
        int i;
 
-       if (!l_dbus_message_builder_enter_array(builder, "y"))
-               return false;
+       if (!builder)
+               return;
 
-       for (i = 0; i < len; i++)
-               if (!l_dbus_message_builder_append_basic(builder, 'y',
-                               data + i))
-                       return false;
+       l_dbus_message_builder_enter_array(builder, "y");
 
-       if (!l_dbus_message_builder_leave_array(builder))
-               return false;
+       for (i = 0; i < len; i++)
+               l_dbus_message_builder_append_basic(builder, 'y', data + i);
 
-       return true;
+       l_dbus_message_builder_leave_array(builder);
 }
 
 void dbus_append_dict_entry_basic(struct l_dbus_message_builder *builder,
                                        const char *key, const char *signature,
                                        const void *data)
 {
+       if (!builder)
+               return;
+
        l_dbus_message_builder_enter_dict(builder, "sv");
        l_dbus_message_builder_append_basic(builder, 's', key);
        l_dbus_message_builder_enter_variant(builder, signature);

diff --git a/mesh/dbus.h b/mesh/dbus.h
index 8796494..e7643a5 100644 (file)
--- a/mesh/dbus.h
+++ b/mesh/dbus.h
@@ -22,7 +22,7 @@
 
 bool dbus_init(struct l_dbus *dbus);
 struct l_dbus *dbus_get_bus(void);
-bool dbus_append_byte_array(struct l_dbus_message_builder *builder,
+void dbus_append_byte_array(struct l_dbus_message_builder *builder,
                                                const uint8_t *data, int len);
 void dbus_append_dict_entry_basic(struct l_dbus_message_builder *builder,
                                        const char *key, const char *signature,

diff --git a/mesh/model.c b/mesh/model.c
index e4a7ba9..b605d01 100644 (file)
--- a/mesh/model.c
+++ b/mesh/model.c
@@ -249,10 +249,9 @@ static void config_update_model_pub_period(struct mesh_node *node,
                                                                &period);
 
        l_dbus_message_builder_leave_array(builder);
-       if (l_dbus_message_builder_finalize(builder))
-               l_dbus_send(dbus, msg);
-
+       l_dbus_message_builder_finalize(builder);
        l_dbus_message_builder_destroy(builder);
+       l_dbus_send(dbus, msg);
 }
 
 static void append_dict_uint16_array(struct l_dbus_message_builder *builder,
@@ -291,10 +290,9 @@ static void config_update_model_bindings(struct mesh_node *node,
        append_dict_uint16_array(builder, mod->bindings, "Bindings");
 
        l_dbus_message_builder_leave_array(builder);
-       if (l_dbus_message_builder_finalize(builder))
-               l_dbus_send(dbus, msg);
-
+       l_dbus_message_builder_finalize(builder);
        l_dbus_message_builder_destroy(builder);
+       l_dbus_send(dbus, msg);
 }
 
 static void forward_model(void *a, void *b)
@@ -714,28 +712,15 @@ static void send_msg_rcvd(struct mesh_node *node, uint8_t ele_idx, bool is_sub,
 
        builder = l_dbus_message_builder_new(msg);
 
-       if (!l_dbus_message_builder_append_basic(builder, 'q', &src))
-               goto error;
-
-       if (!l_dbus_message_builder_append_basic(builder, 'q', &key_idx))
-               goto error;
+       l_dbus_message_builder_append_basic(builder, 'q', &src);
+       l_dbus_message_builder_append_basic(builder, 'q', &key_idx);
+       l_dbus_message_builder_append_basic(builder, 'b', &is_sub);
 
-       if (!l_dbus_message_builder_append_basic(builder, 'b', &is_sub))
-               goto error;
-
-       if (!dbus_append_byte_array(builder, data, size))
-               goto error;
-
-       if (!l_dbus_message_builder_finalize(builder))
-               goto error;
+       dbus_append_byte_array(builder, data, size);
 
+       l_dbus_message_builder_finalize(builder);
        l_dbus_message_builder_destroy(builder);
        l_dbus_send(dbus, msg);
-       return;
-
-error:
-       l_dbus_message_builder_destroy(builder);
-       l_dbus_message_unref(msg);
 }
 
 bool mesh_model_rx(struct mesh_node *node, bool szmict, uint32_t seq0,