Fix to follow coding convention

Change-Id: Ic3841e498e07fc936d49a9cbeebdb36b9482ec15
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface.c
index 97111d9..afab090 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface.c
@@ -457,10 +457,6 @@ static void zigbee_on_bus_acquired(GDBusConnection *connection,
        /* Service interface initialization completed */
        custom_data->sevice_interface_init_complete = TRUE;
 
-       if (TRUE == custom_data->name_acquired) {
-               /* TODO - Emit zigbee_state signal */
-       }
-
 OUT:
        g_free(path);
 }
@@ -574,9 +570,8 @@ EXIT:
         */
        ret = zblib_service_remove_service_interface(service,
                        service_interface);
-       if (FALSE == ret) {
+       if (FALSE == ret)
                Z_LOGE("Remove service interface failed!");
-       }
 
        /*
         * Free Service interface object
@@ -645,9 +640,8 @@ EXIT:
         */
        ret = zblib_service_remove_service_interface(service,
                        service_interface);
-       if (FALSE == ret) {
+       if (FALSE == ret)
                Z_LOGE("Remove service interface failed!");
-       }
 
        /*
         * Free Service interface object

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_custom.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_custom.c
index 19404db..3389215 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_custom.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_custom.c
@@ -364,7 +364,7 @@ void zigbee_service_dbus_interface_custom_notification(ZigBeeServiceInterface *s
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_CUSTOM_NOTI_APS_SEND: {
                int i;
                GVariant* payload = NULL;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c
index 9403883..3327890 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c
@@ -701,8 +701,8 @@ static void on_service_get_device_list_resp(ZigBeeServiceInterface *service_inte
        invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
        zblib_check_null_free_and_ret("invocation", invocation, cb_data);
 
-       /* To-To : zigbee_service_complete_get_device_list */
-       //zigbee_service_complete_get_device_list(service_object, invocation,   resp_data);
+       /* TODO : zigbee_service_complete_get_device_list */
+       /* zigbee_service_complete_get_device_list(service_object, invocation, resp_data); */
 
        g_free(cb_data);
 }
@@ -861,25 +861,23 @@ static void on_service_get_device_info_resp(ZigBeeServiceInterface *service_inte
        invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
        zblib_check_null_free_and_ret("invocation", invocation, cb_data);
 
-       builder = g_variant_builder_new(G_VARIANT_TYPE ("a(qyayyay)"));
+       builder = g_variant_builder_new(G_VARIANT_TYPE("a(qyayyay)"));
        for (index = 0; index < payload->count; index++) {
                ZigbeeServiceGetDeviceInfoDetailResp_t *device = &(payload->list[index]);
-               GVariantBuilder* mac_builder = g_variant_builder_new(G_VARIANT_TYPE ("ay"));
-               GVariantBuilder* endpoint_builder = g_variant_builder_new(G_VARIANT_TYPE ("ay"));
+               GVariantBuilder* mac_builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
+               GVariantBuilder* endpoint_builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
 
-               for (i = 0; i < ZIGBEE_EUI64_SIZE; i++) {
-                       g_variant_builder_add (mac_builder, "y", device->eui64[i]);
-               }
-               for (i = 0; i < device->endpoint_count; i++) {
-                       g_variant_builder_add (endpoint_builder, "y", device->endpoints[i]);
-               }
+               for (i = 0; i < ZIGBEE_EUI64_SIZE; i++)
+                       g_variant_builder_add(mac_builder, "y", device->eui64[i]);
+               for (i = 0; i < device->endpoint_count; i++)
+                       g_variant_builder_add(endpoint_builder, "y", device->endpoints[i]);
 
-               g_variant_builder_add (builder, "(qyayyay)",
+               g_variant_builder_add(builder, "(qyayyay)",
                        device->node_id, device->node_type,
                        mac_builder, device->endpoint_count, endpoint_builder);
 
-               g_variant_builder_unref (mac_builder);
-               g_variant_builder_unref (endpoint_builder);
+               g_variant_builder_unref(mac_builder);
+               g_variant_builder_unref(endpoint_builder);
        }
 
        variant = g_variant_builder_end(builder);
@@ -1245,7 +1243,7 @@ void zigbee_service_dbus_interface_service_notification(ZigBeeServiceInterface *
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_SERVICE_NOTI_FORM_NETWORK_DONE: {
                ZigbeeServiceServiceFormNetworkDone_t *panid_t =
                        (ZigbeeServiceServiceFormNetworkDone_t*)noti_data;
@@ -1284,11 +1282,10 @@ void zigbee_service_dbus_interface_service_notification(ZigBeeServiceInterface *
 
                GVariant *v_eui64 = g_variant_new_from_data(G_VARIANT_TYPE("a(y)"),
                        child_t->eui64, ZIGBEE_EUI64_SIZE, TRUE, NULL, NULL);
-               if (NULL == v_eui64) {
+               if (NULL == v_eui64)
                        Z_LOGE("Failed to create variant!");
-               } else {
+               else
                        zigbee_service_emit_child_rejoined(service_object, v_eui64);
-               }
        }
        break;
        case ZBLIB_SERVICE_NOTI_CHILD_LEFT: {
@@ -1297,9 +1294,9 @@ void zigbee_service_dbus_interface_service_notification(ZigBeeServiceInterface *
 
                GVariant *v_eui64 = g_variant_new_from_data(G_VARIANT_TYPE("a(y)"),
                        child_left_t->eui64, ZIGBEE_EUI64_SIZE, TRUE, NULL, NULL);
-               if (NULL == v_eui64) {
+               if (NULL == v_eui64)
                        Z_LOGE("Failed to create variant!");
-               } else {
+               else {
                        zigbee_service_emit_child_left(service_object,
                                v_eui64, child_left_t->status);
                }

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c
index 20b8e36..787a40c 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c
@@ -590,7 +590,7 @@ void zigbee_service_dbus_interface_zcl_alarm_notification(ZigBeeServiceInterface
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_ZCL_ALARM_NOTI_GET_ALARM_RSP: {
                ZigbeeZclAlarmGetAlarmRsp_t *rsp =
                        (ZigbeeZclAlarmGetAlarmRsp_t*)noti_data;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_basic.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_basic.c
index fdb7332..2512877 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_basic.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_basic.c
@@ -144,7 +144,7 @@ void zigbee_service_dbus_interface_zcl_basic_notification(ZigBeeServiceInterface
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        default:
                Z_LOGE("Unexpected notification [%x]", noti_id);
        break;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_color_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_color_control.c
index 08f4206..6a5b4a5 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_color_control.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_color_control.c
@@ -1041,7 +1041,7 @@ void zigbee_service_dbus_interface_zcl_color_control_notification(ZigBeeServiceI
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        default:
                Z_LOGE("Unexpected notification [%x]", noti_id);
        break;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_global_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_global_control.c
index c8f1fe2..19eb958 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_global_control.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_global_control.c
@@ -1326,7 +1326,7 @@ void zigbee_service_dbus_interface_zcl_global_control_notification(ZigBeeService
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_ZCL_GLOBAL_NOTI_READ_ATTR_RSP: {
                ZigbeeZclGlobalControlReadAttributesResp_t *attr_t =
                        (ZigbeeZclGlobalControlReadAttributesResp_t*)noti_data;
@@ -1455,7 +1455,7 @@ void zigbee_service_dbus_interface_zcl_global_control_notification(ZigBeeService
                        break;
                }
 
-               index_builder = g_variant_builder_new (G_VARIANT_TYPE ("aq"));
+               index_builder = g_variant_builder_new(G_VARIANT_TYPE("aq"));
                if (NULL == index_builder) {
                        Z_LOGE("Failed to create variant builder!");
                        g_variant_unref(v_status);
@@ -1463,12 +1463,11 @@ void zigbee_service_dbus_interface_zcl_global_control_notification(ZigBeeService
                        g_variant_unref(v_indicator);
                        break;
                }
-               for(i = 0; i < attr_t->record_length; i++) {
-                       for(j = 0; j < attr_t->indicator_list[i]; j++) {
-                               g_variant_builder_add (index_builder, "q", attr_t->index_list[i][j]);
-                       }
+               for (i = 0; i < attr_t->record_length; i++) {
+                       for (j = 0; j < attr_t->indicator_list[i]; j++)
+                               g_variant_builder_add(index_builder, "q", attr_t->index_list[i][j]);
                }
-               v_index = g_variant_builder_end (index_builder);
+               v_index = g_variant_builder_end(index_builder);
                g_variant_builder_unref(index_builder);
 
                Z_LOGD("Write attribute structured resp");
@@ -1582,19 +1581,18 @@ void zigbee_service_dbus_interface_zcl_global_control_notification(ZigBeeService
                        break;
                }
 
-               values_builder = g_variant_builder_new (G_VARIANT_TYPE ("a(y)"));
+               values_builder = g_variant_builder_new(G_VARIANT_TYPE("a(y)"));
                if (NULL == values_builder) {
                        Z_LOGE("Failed to create variant builder!");
                        g_variant_unref(v_data_type);
                        g_variant_unref(v_attrs);
                        break;
                }
-               for(i = 0; i < attr_t->list_count; i++) {
-                       for(j = 0; j < attr_t->values_count[i]; j++) {
-                               g_variant_builder_add (values_builder, "(y)", attr_t->values[i][j]);
-                       }
+               for (i = 0; i < attr_t->list_count; i++) {
+                       for (j = 0; j < attr_t->values_count[i]; j++)
+                               g_variant_builder_add(values_builder, "(y)", attr_t->values[i][j]);
                }
-               v_values = g_variant_builder_end (values_builder);
+               v_values = g_variant_builder_end(values_builder);
                g_variant_builder_unref(values_builder);
 
                Z_LOGD("Report attributes handler resp");
@@ -1613,15 +1611,15 @@ void zigbee_service_dbus_interface_zcl_global_control_notification(ZigBeeService
 
                GVariant *v_entries = NULL;
                GVariantBuilder *entry_builder =
-                               g_variant_builder_new (G_VARIANT_TYPE ("a(yyqyqqayq)"));
+                               g_variant_builder_new(G_VARIANT_TYPE("a(yyqyqqayq)"));
                if (NULL == entry_builder) {
                        Z_LOGE("Failed to create variant builder!");
                        break;
                }
 
-               for(i = 0; i < resp_t->record_count ; i++) {
+               for (i = 0; i < resp_t->record_count ; i++) {
                        GVariantBuilder *change_builder =
-                                       g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+                                       g_variant_builder_new(G_VARIANT_TYPE("ay"));
                        if (NULL == change_builder) {
                                Z_LOGE("Failed to create variant builder!");
                                g_variant_builder_unref(entry_builder);
@@ -1629,11 +1627,11 @@ void zigbee_service_dbus_interface_zcl_global_control_notification(ZigBeeService
                        }
 
                        for (v = 0; v < resp_t->entry_list[i].change_count; v++) {
-                               g_variant_builder_add (change_builder, "y",
+                               g_variant_builder_add(change_builder, "y",
                                        resp_t->entry_list[i].change[v]);
                        }
 
-                       g_variant_builder_add (entry_builder, "(yyqyqqayq)",
+                       g_variant_builder_add(entry_builder, "(yyqyqqayq)",
                                resp_t->entry_list[i].status,
                                resp_t->entry_list[i].dir,
                                resp_t->entry_list[i].attribute_id,

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_group.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_group.c
index 7ade053..c449a5f 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_group.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_group.c
@@ -608,7 +608,7 @@ void zigbee_service_dbus_interface_zcl_group_notification(ZigBeeServiceInterface
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_SERVICE_NOTI_ADD_GROUP_RSP: {
                ZigbeeZclGroupAddGroupNoti_t *rsp =
                        (ZigbeeZclGroupAddGroupNoti_t*)noti_data;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_ias_zone.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_ias_zone.c
index c49f883..5f67aee 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_ias_zone.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_ias_zone.c
@@ -147,7 +147,7 @@ void zigbee_service_dbus_interface_zcl_ias_zone_notification(ZigBeeServiceInterf
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_ZCL_IAS_ZONE_NOTI_ZONE_STATUS_CHANGE: {
                ZigbeeZclIasZoneStatusChangeNoti_t *rsp =
                        (ZigbeeZclIasZoneStatusChangeNoti_t*)noti_data;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_identify.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_identify.c
index 25d9fbf..b6e2d45 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_identify.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_identify.c
@@ -229,7 +229,7 @@ void zigbee_service_dbus_interface_zcl_identify_notification(ZigBeeServiceInterf
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_ZCL_IDENTIFY_NOTI_QUERY_RSP: {
                ZigbeeZclIdentifyQueryNoti_t *rsp =     (ZigbeeZclIdentifyQueryNoti_t*)noti_data;
 

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_level_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_level_control.c
index 941f9f0..22ba279 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_level_control.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_level_control.c
@@ -676,7 +676,7 @@ void zigbee_service_dbus_interface_zcl_level_control_notification(ZigBeeServiceI
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        default:
                Z_LOGE("Unexpected notification [%x]", noti_id);
        break;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_on_off.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_on_off.c
index 17d2bde..396fed3 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_on_off.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_on_off.c
@@ -228,7 +228,7 @@ void zigbee_service_dbus_interface_zcl_on_off_notification(ZigBeeServiceInterfac
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_ZCL_ON_OFF_NOTI_ON_OFF_STATE: {
                ZigbeeZclOnOffOnOffState_t *state_t =
                        (ZigbeeZclOnOffOnOffState_t*)noti_data;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_poll_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_poll_control.c
index 2ecf836..f787200 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_poll_control.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_poll_control.c
@@ -401,7 +401,7 @@ void zigbee_service_dbus_interface_zcl_poll_control_notification(ZigBeeServiceIn
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_ZCL_POLL_CONTROL_NOTI_CHECKIN_RESPONSE: {
                ZigbeeZclPollControlCheckinResponseNoti_t *rsp =
                        (ZigbeeZclPollControlCheckinResponseNoti_t*)noti_data;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_scene.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_scene.c
index 079b927..a7c9832 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_scene.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_scene.c
@@ -696,7 +696,7 @@ void zigbee_service_dbus_interface_zcl_scene_notification(ZigBeeServiceInterface
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_ZCL_SCENE_NOTI_ADD_SCENE: {
                ZigbeeZclSceneAddSceneResp_t *rsp = (ZigbeeZclSceneAddSceneResp_t*)noti_data;
 

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c
index b3ad201..08a5b97 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c
@@ -538,7 +538,7 @@ void zigbee_service_dbus_interface_zcl_thermostat_notification(ZigBeeServiceInte
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        default:
                Z_LOGE("Unexpected notification [%x]", noti_id);
        break;

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_bind.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_bind.c
index ffdabcc..46e3fcd 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_bind.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_bind.c
@@ -279,7 +279,7 @@ void zigbee_service_dbus_interface_zdo_bind_notification(ZigBeeServiceInterface
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_ZDO_BIND_NOTI_BIND_REQ: {
                ZigbeeZdoBindUnbindNoti_t *rsp = (ZigbeeZdoBindUnbindNoti_t*)noti_data;
 

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c
index 0388c28..15f3fa2 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c
@@ -1558,7 +1558,7 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
 
        NOT_USED(noti_cb_data);
 
-       switch(noti_id) {
+       switch (noti_id) {
        case ZBLIB_ZDO_DEV_CONTROL_NOTI_NWK_ADDR_RSP: {
                ZigbeeZdoDevControlNwkAddrResp_t *nwk_addr_t =
                        (ZigbeeZdoDevControlNwkAddrResp_t*)noti_data;
@@ -1668,17 +1668,17 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
 
                GVariant *v_entries = NULL;
                GVariantBuilder *entry_builder =
-                               g_variant_builder_new (G_VARIANT_TYPE ("a(ayyqyqayy)"));
+                               g_variant_builder_new(G_VARIANT_TYPE("a(ayyqyqayy)"));
                if (NULL == entry_builder) {
                        Z_LOGE("Failed to create variant builder!");
                        break;
                }
 
-               for(i = 0; i < desc_t->table_list_count ; i++) {
+               for (i = 0; i < desc_t->table_list_count ; i++) {
                        GVariantBuilder *eui64_builder =
-                                       g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+                                       g_variant_builder_new(G_VARIANT_TYPE("ay"));
                        GVariantBuilder *dest_eui64_builder =
-                                       g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+                                       g_variant_builder_new(G_VARIANT_TYPE("ay"));
 
                        if (NULL == eui64_builder || NULL == dest_eui64_builder) {
                                Z_LOGE("Failed to create variant builder!");
@@ -1691,13 +1691,13 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
                        }
 
                        for (v = 0; v < ZIGBEE_EUI64_SIZE; v++) {
-                               g_variant_builder_add (eui64_builder, "y",
+                               g_variant_builder_add(eui64_builder, "y",
                                        desc_t->table_list[i].eui64[v]);
-                               g_variant_builder_add (dest_eui64_builder, "y",
+                               g_variant_builder_add(dest_eui64_builder, "y",
                                        desc_t->table_list[i].dest_eui64[v]);
                        }
 
-                       g_variant_builder_add (entry_builder, "(ayyqyqayy)",
+                       g_variant_builder_add(entry_builder, "(ayyqyqayy)",
                                eui64_builder,
                                desc_t->table_list[i].source_endpoint,
                                desc_t->table_list[i].cluster_id,
@@ -1726,17 +1726,17 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
 
                GVariant *v_entries = NULL;
                GVariantBuilder *entry_builder =
-                               g_variant_builder_new (G_VARIANT_TYPE ("a(ayayyqyyyyy)"));
+                               g_variant_builder_new(G_VARIANT_TYPE("a(ayayyqyyyyy)"));
                if (NULL == entry_builder) {
                        Z_LOGE("Failed to create variant builder!");
                        break;
                }
 
-               for(i = 0; i < desc_t->table_list_count ; i++) {
+               for (i = 0; i < desc_t->table_list_count ; i++) {
                        GVariantBuilder *ext_pan_builder =
-                                       g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+                                       g_variant_builder_new(G_VARIANT_TYPE("ay"));
                        GVariantBuilder *eui64_builder =
-                                       g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+                                       g_variant_builder_new(G_VARIANT_TYPE("ay"));
 
                        if (NULL == ext_pan_builder || NULL == eui64_builder) {
                                Z_LOGE("Failed to create variant builder!");
@@ -1749,13 +1749,13 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
                        }
 
                        for (v = 0; v < ZIGBEE_EUI64_SIZE; v++) {
-                               g_variant_builder_add (ext_pan_builder, "y",
+                               g_variant_builder_add(ext_pan_builder, "y",
                                        desc_t->table_list[i].extended_pan_id[v]);
-                               g_variant_builder_add (eui64_builder, "y",
+                               g_variant_builder_add(eui64_builder, "y",
                                        desc_t->table_list[i].eui64[v]);
                        }
 
-                       g_variant_builder_add (entry_builder, "(ayayyqyyyyy)",
+                       g_variant_builder_add(entry_builder, "(ayayyqyyyyy)",
                                ext_pan_builder,
                                eui64_builder,
                                desc_t->table_list[i].node_id,
@@ -1785,14 +1785,14 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
 
                GVariant *v_entries = NULL;
                GVariantBuilder *entry_builder =
-                               g_variant_builder_new (G_VARIANT_TYPE ("a(qyyyyq)"));
+                               g_variant_builder_new(G_VARIANT_TYPE("a(qyyyyq)"));
                if (NULL == entry_builder) {
                        Z_LOGE("Failed to create variant builder!");
                        break;
                }
 
-               for(i = 0; i < desc_t->table_list_count ; i++) {
-                       g_variant_builder_add (entry_builder, "(qyyyyq)",
+               for (i = 0; i < desc_t->table_list_count ; i++) {
+                       g_variant_builder_add(entry_builder, "(qyyyyq)",
                                desc_t->table_list[i].dest_addr,
                                desc_t->table_list[i].status,
                                desc_t->table_list[i].memory_constrained,
@@ -1833,15 +1833,15 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
 
                GVariant *v_entries = NULL;
                GVariantBuilder *entry_builder =
-                               g_variant_builder_new (G_VARIANT_TYPE ("a(ayyyyyyy)"));
+                               g_variant_builder_new(G_VARIANT_TYPE("a(ayyyyyyy)"));
                if (NULL == entry_builder) {
                        Z_LOGE("Failed to create variant builder!");
                        break;
                }
 
-               for(i = 0; i < nwk_disc_t->table_list_count ; i++) {
+               for (i = 0; i < nwk_disc_t->table_list_count ; i++) {
                        GVariantBuilder *ext_pan_builder =
-                                       g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+                                       g_variant_builder_new(G_VARIANT_TYPE("ay"));
                        if (NULL == ext_pan_builder) {
                                Z_LOGE("Failed to create variant builder!");
                                g_variant_builder_unref(entry_builder);
@@ -1849,11 +1849,11 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
                        }
 
                        for (v = 0; v < ZIGBEE_EUI64_SIZE; v++) {
-                               g_variant_builder_add (ext_pan_builder, "y",
+                               g_variant_builder_add(ext_pan_builder, "y",
                                        nwk_disc_t->table_list[i].extended_pan_id[v]);
                        }
 
-                       g_variant_builder_add (entry_builder, "(ayyyyyyy)",
+                       g_variant_builder_add(entry_builder, "(ayyyyyyy)",
                                ext_pan_builder,
                                nwk_disc_t->table_list[i].logical_channel,
                                nwk_disc_t->table_list[i].stack_profile,

diff --git a/zigbee-daemon/zigbee-lib/src/zblib_driver.c b/zigbee-daemon/zigbee-lib/src/zblib_driver.c
index 5032997..e1d36cd 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_driver.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_driver.c
@@ -134,9 +134,8 @@ gboolean zblib_driver_set_free_hook(ZigBeeDriver *driver,
 
 ZblibDriverType_e zblib_driver_ref_driver_type(ZigBeeDriver *driver)
 {
-       if (NULL == driver) {
+       if (NULL == driver)
                return ZBLIB_DRIVER_TYPE_NONE;
-       }
 
        return driver->driver_type;
 }

diff --git a/zigbee-daemon/zigbee-lib/src/zblib_request.c b/zigbee-daemon/zigbee-lib/src/zblib_request.c
index 9a9c7bd..2df88f0 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_request.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c
@@ -3095,9 +3095,8 @@ static void __zblib_request_free_zcl_alarm_request_data(ZigBeeRequest *request,
                ZigbeeZclAlarmGetAlarmCount_t *req = NULL;
 
                req = (ZigbeeZclAlarmGetAlarmCount_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3105,9 +3104,8 @@ static void __zblib_request_free_zcl_alarm_request_data(ZigBeeRequest *request,
                ZigbeeZclAlarmResetAlarm_t *req = NULL;
 
                req = (ZigbeeZclAlarmResetAlarm_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3115,9 +3113,8 @@ static void __zblib_request_free_zcl_alarm_request_data(ZigBeeRequest *request,
                ZigbeeZclAlarmResetAllAlarm_t *req = NULL;
 
                req = (ZigbeeZclAlarmResetAllAlarm_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3125,9 +3122,8 @@ static void __zblib_request_free_zcl_alarm_request_data(ZigBeeRequest *request,
                ZigbeeZclAlarmAlarm_t *req = NULL;
 
                req = (ZigbeeZclAlarmAlarm_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3135,9 +3131,8 @@ static void __zblib_request_free_zcl_alarm_request_data(ZigBeeRequest *request,
                ZigbeeZclAlarmResetAlarmLogs_t *req = NULL;
 
                req = (ZigbeeZclAlarmResetAlarmLogs_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3162,9 +3157,8 @@ static void __zblib_request_free_custom_request_data(ZigBeeRequest *request,
                ZigbeeCustomApsSend_t *req = NULL;
 
                req = (ZigbeeCustomApsSend_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3172,9 +3166,8 @@ static void __zblib_request_free_custom_request_data(ZigBeeRequest *request,
                ZigbeeCustomZclSend_t *req = NULL;
 
                req = (ZigbeeCustomZclSend_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3182,9 +3175,8 @@ static void __zblib_request_free_custom_request_data(ZigBeeRequest *request,
                ZigbeeCustomSendToLocal_t *req = NULL;
 
                req = (ZigbeeCustomSendToLocal_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3205,9 +3197,8 @@ static void __zblib_request_free_zcl_door_lock_request_data(ZigBeeRequest *reque
                ZigbeeZclDoorLockSubscriberLockEvent_t *req = NULL;
 
                req = (ZigbeeZclDoorLockSubscriberLockEvent_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3215,9 +3206,8 @@ static void __zblib_request_free_zcl_door_lock_request_data(ZigBeeRequest *reque
                ZigbeeZclDoorLockSetDoorLockPin_t *req = NULL;
 
                req = (ZigbeeZclDoorLockSetDoorLockPin_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3225,9 +3215,8 @@ static void __zblib_request_free_zcl_door_lock_request_data(ZigBeeRequest *reque
                ZigbeeZclDoorLockSetDoorLock_t *req = NULL;
 
                req = (ZigbeeZclDoorLockSetDoorLock_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3235,9 +3224,8 @@ static void __zblib_request_free_zcl_door_lock_request_data(ZigBeeRequest *reque
                ZigbeeZclDoorLockGetDoorLock_t *req = NULL;
 
                req = (ZigbeeZclDoorLockGetDoorLock_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3258,9 +3246,8 @@ static void __zblib_request_free_zcl_fan_control_request_data(ZigBeeRequest *req
                ZigbeeZclFanControlSetFanMode_t *req = NULL;
 
                req = (ZigbeeZclFanControlSetFanMode_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3268,9 +3255,8 @@ static void __zblib_request_free_zcl_fan_control_request_data(ZigBeeRequest *req
                ZigbeeZclFanControlGetFanMode_t *req = NULL;
 
                req = (ZigbeeZclFanControlGetFanMode_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3278,9 +3264,8 @@ static void __zblib_request_free_zcl_fan_control_request_data(ZigBeeRequest *req
                ZigbeeZclFanControlSetFanModeSequence_t *req = NULL;
 
                req = (ZigbeeZclFanControlSetFanModeSequence_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3288,9 +3273,8 @@ static void __zblib_request_free_zcl_fan_control_request_data(ZigBeeRequest *req
                ZigbeeZclFanControlGetFanModeSequence_t *req = NULL;
 
                req = (ZigbeeZclFanControlGetFanModeSequence_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3311,9 +3295,8 @@ static void __zblib_request_free_zcl_level_control_request_data(ZigBeeRequest *r
                ZigbeeZclLevelControlMoveToLevel_t *req = NULL;
 
                req = (ZigbeeZclLevelControlMoveToLevel_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3321,9 +3304,8 @@ static void __zblib_request_free_zcl_level_control_request_data(ZigBeeRequest *r
                ZigbeeZclLevelControlMove_t *req = NULL;
 
                req = (ZigbeeZclLevelControlMove_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3331,9 +3313,8 @@ static void __zblib_request_free_zcl_level_control_request_data(ZigBeeRequest *r
                ZigbeeZclLevelControlStep_t *req = NULL;
 
                req = (ZigbeeZclLevelControlStep_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3341,9 +3322,8 @@ static void __zblib_request_free_zcl_level_control_request_data(ZigBeeRequest *r
                ZigbeeZclLevelControlMoveToLevelWithOnOff_t *req = NULL;
 
                req = (ZigbeeZclLevelControlMoveToLevelWithOnOff_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3351,9 +3331,8 @@ static void __zblib_request_free_zcl_level_control_request_data(ZigBeeRequest *r
                ZigbeeZclLevelControlMoveWithOnOff_t *req = NULL;
 
                req = (ZigbeeZclLevelControlMoveWithOnOff_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3361,9 +3340,8 @@ static void __zblib_request_free_zcl_level_control_request_data(ZigBeeRequest *r
                ZigbeeZclLevelControlStepWithOnOff_t *req = NULL;
 
                req = (ZigbeeZclLevelControlStepWithOnOff_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3371,9 +3349,8 @@ static void __zblib_request_free_zcl_level_control_request_data(ZigBeeRequest *r
                ZigbeeZclLevelControlStop_t *req = NULL;
 
                req = (ZigbeeZclLevelControlStop_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3394,9 +3371,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlStart_t *req = NULL;
 
                req = (ZigbeeMfglibControlStart_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3404,9 +3380,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlEnd_t *req = NULL;
 
                req = (ZigbeeMfglibControlEnd_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3414,9 +3389,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlStartTone_t *req = NULL;
 
                req = (ZigbeeMfglibControlStartTone_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3424,9 +3398,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlStopTone_t *req = NULL;
 
                req = (ZigbeeMfglibControlStopTone_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3434,9 +3407,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlStartStream_t *req = NULL;
 
                req = (ZigbeeMfglibControlStartStream_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3444,9 +3416,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlStopStream_t *req = NULL;
 
                req = (ZigbeeMfglibControlStopStream_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3454,9 +3425,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlSendPacket_t *req = NULL;
 
                req = (ZigbeeMfglibControlSendPacket_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3464,9 +3434,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlSetChannel_t *req = NULL;
 
                req = (ZigbeeMfglibControlSetChannel_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3474,9 +3443,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlGetChannel_t *req = NULL;
 
                req = (ZigbeeMfglibControlGetChannel_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3484,9 +3452,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlSetPower_t *req = NULL;
 
                req = (ZigbeeMfglibControlSetPower_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3494,9 +3461,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlGetPower_t *req = NULL;
 
                req = (ZigbeeMfglibControlGetPower_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3504,9 +3470,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlSetSynOffset_t *req = NULL;
 
                req = (ZigbeeMfglibControlSetSynOffset_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3514,9 +3479,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlGetSynOffset_t *req = NULL;
 
                req = (ZigbeeMfglibControlGetSynOffset_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3524,9 +3488,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlRxStart_t *req = NULL;
 
                req = (ZigbeeMfglibControlRxStart_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3534,9 +3497,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlRxStop_t *req = NULL;
 
                req = (ZigbeeMfglibControlRxStop_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3544,9 +3506,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlRxVerify_t *req = NULL;
 
                req = (ZigbeeMfglibControlRxVerify_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3554,9 +3515,8 @@ static void __zblib_request_free_mfglib_control_request_data(ZigBeeRequest *requ
                ZigbeeMfglibControlGetRssi_t *req = NULL;
 
                req = (ZigbeeMfglibControlGetRssi_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3577,9 +3537,8 @@ static void __zblib_request_free_zcl_on_off_request_data(ZigBeeRequest *request,
                ZigbeeZclOnOffSetOnOff_t *req = NULL;
 
                req = (ZigbeeZclOnOffSetOnOff_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3587,9 +3546,8 @@ static void __zblib_request_free_zcl_on_off_request_data(ZigBeeRequest *request,
                ZigbeeZclOnOffGetOnOffState_t *req = NULL;
 
                req = (ZigbeeZclOnOffGetOnOffState_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3618,9 +3576,8 @@ static void __zblib_request_free_service_request_data(ZigBeeRequest *request,
                ZigbeeServiceCoexStart_t *req = NULL;
 
                req = (ZigbeeServiceCoexStart_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3640,9 +3597,8 @@ static void __zblib_request_free_service_request_data(ZigBeeRequest *request,
                ZigbeeServicePermitJoin_t *req = NULL;
 
                req = (ZigbeeServicePermitJoin_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3650,9 +3606,8 @@ static void __zblib_request_free_service_request_data(ZigBeeRequest *request,
                ZigbeeServiceLeaveRequest_t *req = NULL;
 
                req = (ZigbeeServiceLeaveRequest_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3672,9 +3627,8 @@ static void __zblib_request_free_service_request_data(ZigBeeRequest *request,
                ZigbeeServiceGetEndpointList_t *req = NULL;
 
                req = (ZigbeeServiceGetEndpointList_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3682,9 +3636,8 @@ static void __zblib_request_free_service_request_data(ZigBeeRequest *request,
                ZigbeeServiceGetClusterList_t *req = NULL;
 
                req = (ZigbeeServiceGetClusterList_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3692,9 +3645,8 @@ static void __zblib_request_free_service_request_data(ZigBeeRequest *request,
                ZigbeeServiceGetNodeType_t *req = NULL;
 
                req = (ZigbeeServiceGetNodeType_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3715,9 +3667,8 @@ static void __zblib_request_free_zcl_thermostat_request_data(ZigBeeRequest *requ
                ZigbeeZclThermostatGetLocalTemp_t *req = NULL;
 
                req = (ZigbeeZclThermostatGetLocalTemp_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3725,9 +3676,8 @@ static void __zblib_request_free_zcl_thermostat_request_data(ZigBeeRequest *requ
                ZigbeeZclThermostatGetWeeklySchedule_t *req = NULL;
 
                req = (ZigbeeZclThermostatGetWeeklySchedule_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3735,9 +3685,8 @@ static void __zblib_request_free_zcl_thermostat_request_data(ZigBeeRequest *requ
                ZigbeeZclThermostatSetWeeklySchedule_t *req = NULL;
 
                req = (ZigbeeZclThermostatSetWeeklySchedule_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3745,9 +3694,8 @@ static void __zblib_request_free_zcl_thermostat_request_data(ZigBeeRequest *requ
                ZigbeeZclThermostatClearWeeklySchedule_t *req = NULL;
 
                req = (ZigbeeZclThermostatClearWeeklySchedule_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3755,9 +3703,8 @@ static void __zblib_request_free_zcl_thermostat_request_data(ZigBeeRequest *requ
                ZigbeeZclThermostatSetpointRaiseLower_t *req = NULL;
 
                req = (ZigbeeZclThermostatSetpointRaiseLower_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3778,9 +3725,8 @@ static void __zblib_request_free_zcl_basic_request_data(ZigBeeRequest *request,
                ZigbeeZclBasicResetFactoryDefault_t *req = NULL;
 
                req = (ZigbeeZclBasicResetFactoryDefault_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3889,9 +3835,8 @@ static void __zblib_request_free_zcl_global_control_request_data(ZigBeeRequest *
                ZigbeeZclGlobalControlDiscoverAttributes_t *req = NULL;
 
                req = (ZigbeeZclGlobalControlDiscoverAttributes_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3899,9 +3844,8 @@ static void __zblib_request_free_zcl_global_control_request_data(ZigBeeRequest *
                ZigbeeZclGlobalControlDiscoverAttributesExtended_t *req = NULL;
 
                req = (ZigbeeZclGlobalControlDiscoverAttributesExtended_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3909,9 +3853,8 @@ static void __zblib_request_free_zcl_global_control_request_data(ZigBeeRequest *
                ZigbeeZclGlobalControlDiscoverCommandsReceived_t *req = NULL;
 
                req = (ZigbeeZclGlobalControlDiscoverCommandsReceived_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3919,9 +3862,8 @@ static void __zblib_request_free_zcl_global_control_request_data(ZigBeeRequest *
                ZigbeeZclGlobalControlDiscoverCommandsGenerated_t *req = NULL;
 
                req = (ZigbeeZclGlobalControlDiscoverCommandsGenerated_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3942,9 +3884,8 @@ static void __zblib_request_free_zcl_ias_zone_request_data(ZigBeeRequest *reques
                ZigbeeZclIasZoneEnrollResponse_t *req = NULL;
 
                req = (ZigbeeZclIasZoneEnrollResponse_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3965,9 +3906,8 @@ static void __zblib_request_free_zcl_identify_request_data(ZigBeeRequest *reques
                ZigbeeZclIdentifyIdentify_t *req = NULL;
 
                req = (ZigbeeZclIdentifyIdentify_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3975,9 +3915,8 @@ static void __zblib_request_free_zcl_identify_request_data(ZigBeeRequest *reques
                ZigbeeZclIdentifyQuery_t *req = NULL;
 
                req = (ZigbeeZclIdentifyQuery_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -3998,9 +3937,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlMoveToHue_t *req = NULL;
 
                req = (ZigbeeZclColorControlMoveToHue_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4008,9 +3946,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlMoveHue_t *req = NULL;
 
                req = (ZigbeeZclColorControlMoveHue_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4018,9 +3955,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlStepHue_t *req = NULL;
 
                req = (ZigbeeZclColorControlStepHue_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4028,9 +3964,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlMoveToSaturation_t *req = NULL;
 
                req = (ZigbeeZclColorControlMoveToSaturation_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4038,9 +3973,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlMoveSaturation_t *req = NULL;
 
                req = (ZigbeeZclColorControlMoveSaturation_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4048,9 +3982,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlStepSaturation_t *req = NULL;
 
                req = (ZigbeeZclColorControlStepSaturation_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4058,9 +3991,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlMoveToHueAndSaturation_t *req = NULL;
 
                req = (ZigbeeZclColorControlMoveToHueAndSaturation_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4068,9 +4000,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlMoveToColor_t *req = NULL;
 
                req = (ZigbeeZclColorControlMoveToColor_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4078,9 +4009,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlMoveColor_t *req = NULL;
 
                req = (ZigbeeZclColorControlMoveColor_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4088,9 +4018,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlStepColor_t *req = NULL;
 
                req = (ZigbeeZclColorControlStepColor_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4098,9 +4027,8 @@ static void __zblib_request_free_zcl_color_control_request_data(ZigBeeRequest *r
                ZigbeeZclColorControlMoveColorTemperature_t *req = NULL;
 
                req = (ZigbeeZclColorControlMoveColorTemperature_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4121,9 +4049,8 @@ static void __zblib_request_free_zcl_group_request_data(ZigBeeRequest *request,
                ZigbeeZclGroupAddGroup_t *req = NULL;
 
                req = (ZigbeeZclGroupAddGroup_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4131,9 +4058,8 @@ static void __zblib_request_free_zcl_group_request_data(ZigBeeRequest *request,
                ZigbeeZclGroupViewGroup_t *req = NULL;
 
                req = (ZigbeeZclGroupViewGroup_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4152,9 +4078,8 @@ static void __zblib_request_free_zcl_group_request_data(ZigBeeRequest *request,
                ZigbeeZclGroupRemoveGroup_t *req = NULL;
 
                req = (ZigbeeZclGroupRemoveGroup_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4162,9 +4087,8 @@ static void __zblib_request_free_zcl_group_request_data(ZigBeeRequest *request,
                ZigbeeZclGroupRemoveAllGroup_t *req = NULL;
 
                req = (ZigbeeZclGroupRemoveAllGroup_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4172,9 +4096,8 @@ static void __zblib_request_free_zcl_group_request_data(ZigBeeRequest *request,
                ZigbeeZclGroupAddGroupIfIdentifying_t *req = NULL;
 
                req = (ZigbeeZclGroupAddGroupIfIdentifying_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4195,9 +4118,8 @@ static void __zblib_request_free_zcl_poll_control_request_data(ZigBeeRequest *re
                ZigbeeZclPollControlCheckInResponse_t *req = NULL;
 
                req = (ZigbeeZclPollControlCheckInResponse_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4205,9 +4127,8 @@ static void __zblib_request_free_zcl_poll_control_request_data(ZigBeeRequest *re
                ZigbeeZclPollControlFastPollStop_t *req = NULL;
 
                req = (ZigbeeZclPollControlFastPollStop_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4215,9 +4136,8 @@ static void __zblib_request_free_zcl_poll_control_request_data(ZigBeeRequest *re
                ZigbeeZclPollControlSetLongPollInterval_t *req = NULL;
 
                req = (ZigbeeZclPollControlSetLongPollInterval_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4225,9 +4145,8 @@ static void __zblib_request_free_zcl_poll_control_request_data(ZigBeeRequest *re
                ZigbeeZclPollControlSetShortPollInterval_t *req = NULL;
 
                req = (ZigbeeZclPollControlSetShortPollInterval_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4259,9 +4178,8 @@ static void __zblib_request_free_zcl_scene_request_data(ZigBeeRequest *request,
                ZigbeeZclSceneViewScene_t *req = NULL;
 
                req = (ZigbeeZclSceneViewScene_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4269,9 +4187,8 @@ static void __zblib_request_free_zcl_scene_request_data(ZigBeeRequest *request,
                ZigbeeZclSceneRemoveScene_t *req = NULL;
 
                req = (ZigbeeZclSceneRemoveScene_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4279,9 +4196,8 @@ static void __zblib_request_free_zcl_scene_request_data(ZigBeeRequest *request,
                ZigbeeZclSceneStoreScene_t *req = NULL;
 
                req = (ZigbeeZclSceneStoreScene_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4289,9 +4205,8 @@ static void __zblib_request_free_zcl_scene_request_data(ZigBeeRequest *request,
                ZigbeeZclSceneRecallScene_t *req = NULL;
 
                req = (ZigbeeZclSceneRecallScene_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4299,9 +4214,8 @@ static void __zblib_request_free_zcl_scene_request_data(ZigBeeRequest *request,
                ZigbeeZclSceneRemoveAllScene_t *req = NULL;
 
                req = (ZigbeeZclSceneRemoveAllScene_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4309,9 +4223,8 @@ static void __zblib_request_free_zcl_scene_request_data(ZigBeeRequest *request,
                ZigbeeZclSceneGetSceneMembership_t *req = NULL;
 
                req = (ZigbeeZclSceneGetSceneMembership_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4332,9 +4245,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlNwkAddrReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlNwkAddrReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4354,9 +4266,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlIeeeAddrReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlIeeeAddrReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4364,9 +4275,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlActiveEpReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlActiveEpReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4374,9 +4284,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlNodeDescriptorReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlNodeDescriptorReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4384,9 +4293,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlPowerDescriptorReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlPowerDescriptorReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4394,9 +4302,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlComplexDescriptorReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlComplexDescriptorReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4404,9 +4311,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlUserDescriptorReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlUserDescriptorReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4414,9 +4320,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlUserDescriptorSetReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlUserDescriptorSetReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4424,9 +4329,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlDeviceAnnounce_t *req = NULL;
 
                req = (ZigbeeZdoDevControlDeviceAnnounce_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4434,9 +4338,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlSimpleDescriptorReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlSimpleDescriptorReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4444,9 +4347,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlMgmtLqiReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlMgmtLqiReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4454,9 +4356,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlMgmtRtgReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlMgmtRtgReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4464,9 +4365,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlMgmtBindReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlMgmtBindReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4474,9 +4374,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlMgmtPermitJoinReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlMgmtPermitJoinReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4484,9 +4383,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlMgmtNwkUpdateReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlMgmtNwkUpdateReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4494,9 +4392,8 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
                ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t *req = NULL;
 
                req = (ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4517,9 +4414,8 @@ static void __zblib_request_free_zdo_bind_request_data(ZigBeeRequest *request,
                ZigbeeZdoBindBindReq_t *req = NULL;
 
                req = (ZigbeeZdoBindBindReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 
@@ -4527,9 +4423,8 @@ static void __zblib_request_free_zdo_bind_request_data(ZigBeeRequest *request,
                ZigbeeZdoBindUnbindReq_t *req = NULL;
 
                req = (ZigbeeZdoBindUnbindReq_t *)request->request_data;
-               if (NULL != req) {
+               if (NULL != req)
                        g_free(req);
-               }
        }
        break;
 

diff --git a/zigbee-daemon/zigbee-lib/src/zblib_service.c b/zigbee-daemon/zigbee-lib/src/zblib_service.c
index 72e26e7..df81d69 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_service.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_service.c
@@ -429,9 +429,8 @@ gboolean zblib_service_load_plugins(ZigBeeService *service, const char *plugin_p
 
                /* Add new plug-in */
                ret = zblib_service_add_plugin(service, plugin);
-               if (G_UNLIKELY(FALSE == ret)) {
+               if (G_UNLIKELY(FALSE == ret))
                        zblib_plugin_free(plugin);
-               }
 
                g_free(filename);
        }
@@ -461,7 +460,7 @@ gboolean zblib_service_initialize_plugins(ZigBeeService *service)
                                /* Register async initializer */
                                struct _zblib_async_init_info *info =
                                        g_try_new0(struct _zblib_async_init_info, 1);
-                               if(NULL == info) {
+                               if (NULL == info) {
                                        Z_LOGE("Fatal : Failed to allocate memory");
                                        return FALSE;
                                }