From 40558acca3533c82f3c24797b6e1e42abc100c61 Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Wed, 10 May 2017 20:08:45 +0900 Subject: [PATCH] Remove all warnings and fix to follow coding convention Change-Id: Ie647972a057fd39214c97efe31056fe40ab2f7f7 Signed-off-by: Jiwan Kim --- lib/CMakeLists.txt | 2 +- lib/zbl.c | 2 +- lib/zbl_dbus.c | 190 +++++++++++++++++++++--------------------- lib/zbl_zcl.c | 2 +- lib/zbl_zdo.c | 10 +-- test/CMakeLists.txt | 2 +- test/main.c | 17 ++-- test/zcl_global_cmd.c | 6 +- 8 files changed, 114 insertions(+), 117 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index bd52a5e..8cd312d 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -11,7 +11,7 @@ FILE(GLOB CLIENT_SRCS *.c ${CMAKE_SOURCE_DIR}/common/*.c) pkg_check_modules(client_pkgs REQUIRED glib-2.0 gio-2.0 gio-unix-2.0 dlog capi-base-common capi-system-info) INCLUDE_DIRECTORIES(${client_pkgs_INCLUDE_DIRS}) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -pthread") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -pthread") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -O0 -g") ADD_DEFINITIONS("-DZIGBEE_DBUS_INTERFACE=\"${DBUS_INTERFACE}\"") diff --git a/lib/zbl.c b/lib/zbl.c index 1a12989..c6145cd 100644 --- a/lib/zbl.c +++ b/lib/zbl.c @@ -195,7 +195,7 @@ API int zb_get_network_info(zigbee_h handle, ieee_addr addr64, nwk_addr *nodeid, API int zb_device_list_free(zb_end_device_info_h *list) { int i = 0, j = 0; - struct zb_end_device_info_s **plist = list; + struct zb_end_device_info_s **plist = (struct zb_end_device_info_s **)list; CHECK_FEATURE_SUPPORTED(ZIGBEE_FEATURE); RETV_IF(NULL == list, ZIGBEE_ERROR_INVALID_PARAMETER); diff --git a/lib/zbl_dbus.c b/lib/zbl_dbus.c index b62861a..2417a06 100644 --- a/lib/zbl_dbus.c +++ b/lib/zbl_dbus.c @@ -1991,7 +1991,7 @@ MGMT_NWK_RTG_REQ_OUT: g_variant_iter_free(resp_iter); } - cb(status, nwk_count, start_index, nwk_list_count, records, container->userdata); + cb(status, nwk_count, start_index, nwk_list_count, (void **)records, container->userdata); MGMT_NWK_DISC_REQ_OUT: for (i = 0; i < nwk_list_count; i++) { @@ -2925,7 +2925,7 @@ static int _check_zigbee_privilege() NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &dbus_err); if (!variant) { ERR("Failed to check_zigbee_privilege [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -2966,7 +2966,7 @@ int zbl_enable(zigbee_h handle) if (!variant) { ERR("Failed to get 'enable' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3000,7 +3000,7 @@ int zbl_disable(void) if (!variant) { ERR("Failed to get 'disable' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3030,7 +3030,7 @@ int zbl_hw_reset(void) if (!variant) { ERR("Failed to get 'zb_hw_reset' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3070,7 +3070,7 @@ int zbl_get_network_info(ieee_addr addr64, nwk_addr *nodeid, nwk_addr *panid, if (!variant) { ERR("Failed to 'get_network_info' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3132,7 +3132,7 @@ int zbl_get_controller_mac_address(ieee_addr addr64) if (!variant) { ERR("Failed to get_mac [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3222,7 +3222,7 @@ int zbl_get_cluster_list(ieee_addr eui64, unsigned char endpoint, g_variant_unref(variant); } else { ERR("No In/Out Clusters for Endpoint %0X [%s]", endpoint, dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) ret = ZIGBEE_ERROR_PERMISSION_DENIED; else ret = ZIGBEE_ERROR_NONE; @@ -3290,7 +3290,7 @@ int zbl_get_endpoint_list(ieee_addr eui64, unsigned char *count, unsigned char l ERR("NULL Variant"); ERR("No Endpoints"); ERR("[%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) ret = ZIGBEE_ERROR_PERMISSION_DENIED; g_error_free(dbus_err); @@ -3329,7 +3329,7 @@ int zbl_api_get_node_type(ieee_addr eui64, unsigned char *node_type) if (!variant) { ERR("Failed to get 'get_node_type' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3434,7 +3434,7 @@ int zbl_get_all_device_info(zb_end_device_info_h **dev_list, unsigned char* num) } else { ERR("NULL Variant [%s]", dbus_err->message); ERR("No attached nodes"); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) ret = ZIGBEE_ERROR_PERMISSION_DENIED; g_error_free(dbus_err); @@ -3458,7 +3458,7 @@ int zbl_coex_start(unsigned char channel) if (!variant) { ERR("Failed to get 'coex_start' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3490,7 +3490,7 @@ int zbl_coex_stop(void) if (!variant) { ERR("Failed to get 'coex_stop' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3543,7 +3543,7 @@ int zbl_form_network(zigbee_h handle, zb_form_network_cb cb, void *user_data) if (!variant) { ERR("Failed to get 'form_network' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3598,7 +3598,7 @@ int zbl_disable_network(zigbee_h handle, zb_disable_network_cb cb, void *user_da if (!variant) { ERR("Failed to get 'leave_network' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3650,7 +3650,7 @@ int zbl_leave_device(ieee_addr addr64, bool remove_children, bool rejoin) if (!variant) { ERR("Failed to get 'leave_request' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3680,7 +3680,7 @@ int zbl_permit_join(unsigned char duration, bool broadcast) if (!variant) { ERR("Failed to get 'permit_join' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3752,7 +3752,7 @@ int zbl_nwk_addr_req(zigbee_h handle, ieee_addr addr64, unsigned char request_ty if (!variant) { ERR("Failed to get 'nwk_addr_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3809,7 +3809,7 @@ int zbl_ieee_addr_req(zigbee_h handle, nwk_addr addr16, zb_zdo_addr_rsp cb, if (!variant) { ERR("Failed to get 'ieee_addr_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3866,7 +3866,7 @@ int zbl_active_ep(zigbee_h handle, nwk_addr addr16, zb_zdo_active_ep_rsp cb, if (!variant) { ERR("Failed to get 'active_ep_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -3923,7 +3923,7 @@ int zbl_simple_desc_req(zigbee_h handle, nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'simple_desc_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4011,7 +4011,7 @@ int zbl_match_desc_req(zigbee_h handle, nwk_addr addr16, if (!variant) { ERR("Failed to get 'matched_descriptor_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4067,7 +4067,7 @@ int zbl_node_desc_req(nwk_addr addr16, zb_zdo_node_desc_rsp cb, void *user_data) if (!variant) { ERR("Failed to get 'node_desc_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4121,7 +4121,7 @@ int zbl_power_desc_req(nwk_addr addr16, zb_zdo_power_desc_rsp cb, void *user_dat if (!variant) { ERR("Failed to get 'power_desc_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4175,7 +4175,7 @@ int zbl_complex_desc_req(nwk_addr addr16, zb_zdo_complex_desc_rsp cb, void *user if (!variant) { ERR("Failed to get 'complex_desc_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4229,7 +4229,7 @@ int zbl_user_desc_req(nwk_addr addr16, zb_zdo_user_desc_rsp cb, void *user_data) if (!variant) { ERR("Failed to get 'user_desc_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4301,7 +4301,7 @@ int zbl_user_desc_set(zigbee_h handle, nwk_addr addr16, unsigned char len, if (!variant) { ERR("Failed to get 'user_desc_set_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4348,7 +4348,7 @@ int zbl_device_annce(zigbee_h handle, nwk_addr addr16, ieee_addr addr64, if (!variant) { ERR("Failed to get 'device_announce' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4430,7 +4430,7 @@ int zbl_bind_req(nwk_addr dst_addr16, ieee_addr src_addr64, if (!variant) { ERR("Failed to get 'bind_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4511,7 +4511,7 @@ int zbl_unbind_req(nwk_addr dst_addr16, if (!variant) { ERR("Failed to get 'unbind_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4570,7 +4570,7 @@ int zbl_mgmt_nwk_disc_req(nwk_addr addr16, unsigned int scan_channels, if (!variant) { ERR("Failed to get 'mgmt_nwk_disc_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4604,7 +4604,7 @@ int zbl_mgmt_nwk_update_req(unsigned int scan_channels, unsigned char scan_durat if (!variant) { ERR("Failed to get 'mgmt_nwk_update_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4662,7 +4662,7 @@ int zbl_mgmt_lqi_req(nwk_addr addr16, unsigned char start_idx, if (!variant) { ERR("Failed to get 'mgmt_lqi_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4720,7 +4720,7 @@ int zbl_mgmt_rtg_req(nwk_addr addr16, unsigned char start_idx, if (!variant) { ERR("Failed to get 'mgmt_rtg_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4778,7 +4778,7 @@ int zbl_mgmt_bind_req(nwk_addr addr16, unsigned char start_idx, if (!variant) { ERR("Failed to get 'mgmt_bind_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4849,7 +4849,7 @@ int zbl_mgmt_leave_device(ieee_addr addr64, unsigned char remove_children, if (!variant) { ERR("Failed to get 'leave_request' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4905,7 +4905,7 @@ int zbl_mgmt_permit_joining_req(nwk_addr addr16, unsigned char duration, if (!variant) { ERR("Failed to get 'mgmt_permit_join_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -4974,7 +4974,7 @@ int zbl_aps_send(nwk_addr addr16, unsigned char aps_frame_ctl, unsigned char src if (!variant) { ERR("Failed to get 'aps_send' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -5042,7 +5042,7 @@ int zbl_zcl_send(nwk_addr addr16, unsigned char src_ep, unsigned char dst_ep, if (!variant) { ERR("Failed to get 'zcl_send' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -5108,7 +5108,7 @@ int zbl_send_to_local(unsigned short length, unsigned char *data, if (!variant) { ERR("Failed to get 'send_to_local' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -5203,7 +5203,7 @@ int zbl_read_attr_req(zigbee_h handle, unsigned short addr16, unsigned char dest if (!variant) { ERR("Failed to get 'read_attributes_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -5390,7 +5390,7 @@ int zbl_write_attr_req(zigbee_h handle, nwk_addr addr16, unsigned char src_ep, if (!variant) { ERR("Failed to get 'write_attributes_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -5577,7 +5577,7 @@ int zbl_wattr_undivided_req(zigbee_h handle, nwk_addr addr16, unsigned char src_ if (!variant) { ERR("Failed to get 'write_attributes_undivided_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -5703,7 +5703,7 @@ int zbl_wattr_req_no_rsp(zigbee_h handle, nwk_addr addr16, unsigned char src_ep, if (!variant) { ERR("Failed to get 'write_attributes_no_rep' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -5833,7 +5833,7 @@ int zbl_configure_reporting(zigbee_h handle, nwk_addr addr16, unsigned char src_ if (!variant) { ERR("Failed to get 'configure_reporting_req' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -5971,7 +5971,7 @@ int zbl_read_configure_reporting(zigbee_h handle, nwk_addr addr16, unsigned char if (!variant) { ERR("Failed to get 'read_configure_reporting' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6056,7 +6056,7 @@ int zbl_discover_attr_req(zigbee_h handle, unsigned short addr16, unsigned char if (!variant) { ERR("Failed to get 'discover_attributes' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6139,7 +6139,7 @@ int zbl_discover_cmds_gen(zigbee_h handle, nwk_addr addr16, unsigned char src_ep if (!variant) { ERR("Failed to get 'discover_commands_received' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6222,7 +6222,7 @@ int zbl_discover_cmds_recv(zigbee_h handle, nwk_addr addr16, unsigned char src_e if (!variant) { ERR("Failed to get 'discover_commands_received' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6306,7 +6306,7 @@ int zbl_discover_attr_ext(zigbee_h handle, nwk_addr addr16, unsigned char src_ep if (!variant) { ERR("Failed to get 'discover_attributes_extended' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6338,7 +6338,7 @@ int zbl_reset_alarm(nwk_addr addr16, unsigned char ep, unsigned char alarm_code, if (!variant) { ERR("Failed to get 'reset_alarm' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6368,7 +6368,7 @@ int zbl_reset_all_alarm(nwk_addr addr16, unsigned char ep) if (!variant) { ERR("Failed to get 'reset_all_alarm' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6424,7 +6424,7 @@ int zbl_get_alarm(nwk_addr addr16, unsigned char ep, zb_zcl_alarm_get_alarm_rsp if (!variant) { ERR("Failed to get 'get_alarm' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6454,7 +6454,7 @@ int zbl_reset_all_alarm_log(nwk_addr addr16, unsigned char ep) if (!variant) { ERR("Failed to get 'reset_alarm_log' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6487,7 +6487,7 @@ int zbl_ccontrol_move_to_hue(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_to_hue' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6520,7 +6520,7 @@ int zbl_ccontrol_move_hue(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_hue' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6553,7 +6553,7 @@ int zbl_ccontrol_step_hue(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'step_hue' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6585,7 +6585,7 @@ int zbl_ccontrol_move_to_saturation(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_to_saturation' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6617,7 +6617,7 @@ int zbl_ccontrol_move_saturation(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_saturation' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6650,7 +6650,7 @@ int zbl_ccontrol_step_saturation(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'step_saturation' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6683,7 +6683,7 @@ int zbl_ccontrol_move_to_hue_and_saturation(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_to_hue_and_saturation' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6716,7 +6716,7 @@ int zbl_ccontrol_move_to_color(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_to_color' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6748,7 +6748,7 @@ int zbl_ccontrol_move_color(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_color' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6781,7 +6781,7 @@ int zbl_ccontrol_step_color(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'step_color' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6814,7 +6814,7 @@ int zbl_ccontrol_move_to_color_temperature(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_color_temperature' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6844,7 +6844,7 @@ int zbl_reset_factory_default(nwk_addr addr16, unsigned char ep) if (!variant) { ERR("Failed to get 'reset_factory_default' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6875,7 +6875,7 @@ int zbl_identify(nwk_addr addr16, unsigned char dst_ep, unsigned short identify_ if (!variant) { ERR("Failed to get 'identify' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -6931,7 +6931,7 @@ int zbl_identify_query(nwk_addr addr16, unsigned char dst_ep, if (!variant) { ERR("Failed to get 'query' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7000,7 +7000,7 @@ int zbl_add_group(nwk_addr addr16, unsigned char ep, unsigned short group_id, if (!variant) { ERR("Failed to get 'add_group' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7057,7 +7057,7 @@ int zbl_view_group(nwk_addr addr16, unsigned char ep, unsigned short group_id, if (!variant) { ERR("Failed to get 'view_group' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7128,7 +7128,7 @@ int zbl_group_get_group_membership(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'get_group_membership' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7184,7 +7184,7 @@ int zbl_remove_group(nwk_addr addr16, unsigned char ep, unsigned short group_id, if (!variant) { ERR("Failed to get 'remove_group' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7216,7 +7216,7 @@ int zbl_remove_all_group(nwk_addr addr16, unsigned char ep) if (!variant) { ERR("Failed to get 'remove_all_group' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7260,7 +7260,7 @@ int zbl_add_group_if_identifying(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'add_group_if_identifying' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7294,7 +7294,7 @@ int zbl_level_control_move_to_level(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_to_level' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7328,7 +7328,7 @@ int zbl_level_control_move(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7363,7 +7363,7 @@ int zbl_level_control_step(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'step' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7395,7 +7395,7 @@ int zbl_level_control_stop(nwk_addr addr16, unsigned char ep) if (!variant) { ERR("Failed to get 'stop' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7429,7 +7429,7 @@ int zbl_level_control_move_to_level_with_on_off(nwk_addr addr16, if (!variant) { ERR("Failed to get 'move_to_level_with_on_off' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7463,7 +7463,7 @@ int zbl_level_control_move_with_on_off(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'move_with_on_off' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7498,7 +7498,7 @@ int zbl_level_control_step_with_on_off(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'step_with_on_off' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7529,7 +7529,7 @@ int zbl_onoff_set(nwk_addr addr16, unsigned char ep, unsigned char on_off_type) if (!variant) { ERR("Failed to get 'set_on_off' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7561,7 +7561,7 @@ int zbl_zone_enroll_response(nwk_addr addr16, unsigned char dst_ep, if (!variant) { ERR("Failed to get 'enroll_response' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7593,7 +7593,7 @@ int zbl_pollcontrol_check_in_response(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'check_in_response' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7623,7 +7623,7 @@ int zbl_pollcontrol_fast_poll_stop(nwk_addr addr16, unsigned char ep) if (!variant) { ERR("Failed to get 'fast_poll_stop' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7681,7 +7681,7 @@ int zbl_pollcontrol_set_long_poll_interval(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'set_long_poll_interval' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7739,7 +7739,7 @@ int zbl_pollcontrol_set_short_poll_interval(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'set_short_poll_interval' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7824,7 +7824,7 @@ int zbl_add_scene(nwk_addr addr16, unsigned char ep, unsigned short group_id, if (!variant) { ERR("Failed to get 'add_scene' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7881,7 +7881,7 @@ int zbl_view_scene(nwk_addr addr16, unsigned char ep, unsigned short group_id, if (!variant) { ERR("Failed to get 'view_scene' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7939,7 +7939,7 @@ int zbl_remove_scene(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'remove_scene' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -7997,7 +7997,7 @@ int zbl_remove_all_scene(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get 'remove_all_scene' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -8054,7 +8054,7 @@ int zbl_store_scene(nwk_addr addr16, unsigned char ep, unsigned short group_id, if (!variant) { ERR("Failed to get 'store_scene' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -8086,7 +8086,7 @@ int zbl_recall_scene(nwk_addr addr16, unsigned char ep, unsigned short group_id, if (!variant) { ERR("Failed to get 'recall_scene' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -8144,7 +8144,7 @@ int zbl_get_scene_membership(nwk_addr addr16, unsigned char ep, if (!variant) { ERR("Failed to get get_scene_membership [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; @@ -8176,7 +8176,7 @@ int zbl_thermostat_adjust_setpoint(nwk_addr addr16, unsigned char ep, unsigned c if (!variant) { ERR("Failed to get 'setpoint_raise_lower' [%s]", dbus_err->message); - if(strstr(dbus_err->message, "AccessDenied")) + if (strstr(dbus_err->message, "AccessDenied")) result = ZIGBEE_ERROR_PERMISSION_DENIED; else result = ZIGBEE_ERROR_IO_ERROR; diff --git a/lib/zbl_zcl.c b/lib/zbl_zcl.c index bdbd0af..d15501e 100644 --- a/lib/zbl_zcl.c +++ b/lib/zbl_zcl.c @@ -17,7 +17,7 @@ API const char* zb_get_zcl_error_message(int id) { const char* status_name = NULL; - switch(id) { + switch (id) { case ZB_ZCL_SUCCESS: status_name = "ZB_ZCL_SUCCESS"; break; diff --git a/lib/zbl_zdo.c b/lib/zbl_zdo.c index 63eeb91..8d51099 100644 --- a/lib/zbl_zdo.c +++ b/lib/zbl_zdo.c @@ -31,7 +31,7 @@ API const char* zb_zdo_get_error_message(int id) { - switch(id) { + switch (id) { CASE_TO_STR(ZB_ZDP_SUCCESS) CASE_TO_STR(ZB_ZDP_INV_REQUESTTYPE) CASE_TO_STR(ZB_ZDP_DEVICE_NOT_FOUND) @@ -47,16 +47,16 @@ API const char* zb_zdo_get_error_message(int id) CASE_TO_STR(ZB_ZDP_TABLE_FULL) CASE_TO_STR(ZB_ZDP_NOT_AUTHORIZED) CASE_TO_STR(ZB_ZDP_DEVICE_BINDING_TABLE_FULL) - default: + default : return "ZB_ZDP_UNKNOWN"; } } API const char* zb_get_profile_id_string(int profile_id) { - switch(profile_id) { + switch (profile_id) { CASE_TO_STR(ZB_PROFILE_HOME_AUTOMATION) - default: + default : return "ZB_UNKNOWN_PROFILE"; } } @@ -110,7 +110,7 @@ API const char* zb_get_device_id_string(int device_id) CASE_TO_STR(ZB_HA_IAS_CONTROL_AND_INDICATING_EQUIPMENT) CASE_TO_STR(ZB_HA_IAS_ANCILLARY_CONTROL_EQUIPMENT) CASE_TO_STR(ZB_HA_IAS_ZONE) - default: + default : return "ZB_HA_UNKNOWN_DEVICE"; } } diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index dc85d33..8894093 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,7 +9,7 @@ FOREACH(flag ${${test}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror") SET(CMAKE_EXE_LINKER_FLAGS "-lpthread") SET(ORG_SOURCES diff --git a/test/main.c b/test/main.c index 0dcbd12..cec121b 100644 --- a/test/main.c +++ b/test/main.c @@ -700,9 +700,9 @@ static int run_get_endpoint_list(MManager *mm, struct menu_data *menu) msg(" - zb_get_endpoint_list() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret)); msgb("Endpoints count [%d] : ", count); - for(i = 0; i < count; i++) { + for (i = 0; i < count; i++) msgn(" %04d", ep_list[i]); - } + msg("\n"); return RET_SUCCESS; @@ -718,9 +718,8 @@ static int run_get_cluster_list(MManager *mm, struct menu_data *menu) unsigned short in_cluster_list[MAX_ENDPOINT_CLUSTERS] = { 0 }; unsigned short out_cluster_list[MAX_ENDPOINT_CLUSTERS] = { 0 }; - if (strlen(data_endpoint) > 0) { + if (strlen(data_endpoint) > 0) ep = (unsigned char)strtol(data_endpoint, NULL, 10); - } ret = zb_get_cluster_list(handle, dest_addr64, ep, &in_count, in_cluster_list, @@ -732,14 +731,13 @@ static int run_get_cluster_list(MManager *mm, struct menu_data *menu) msg(" - zb_get_cluster_list() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret)); msgb("In Clusters count [%d] : ", in_count); - for(i = 0; i < in_count; i++) { + for (i = 0; i < in_count; i++) msgn(" %04X (%s)\n", in_cluster_list[i], zb_get_cluster_name(in_cluster_list[i])); - } msg("\n"); + msgb("Out Clusters count [%d] : ", out_count); - for(i = 0; i < out_count; i++) { + for (i = 0; i < out_count; i++) msgn(" %04X (%s)\n", out_cluster_list[i], zb_get_cluster_name(out_cluster_list[i])); - } msg("\n"); return RET_SUCCESS; @@ -1017,8 +1015,7 @@ static int __select_handle_register_event(MManager *mm, struct menu_data *menu) if (ZIGBEE_ERROR_PERMISSION_DENIED == ret) { /* Admin permission is not set, but we can do normal operations */ msg("zb_enable(0x%X) - FAILED!!!", ret); - } - else if (ZIGBEE_ERROR_NONE != ret) { + } else if (ZIGBEE_ERROR_NONE != ret) { msg("zb_enable(0x%X) - FAILED!!! [%s]", ret, zigbee_error_to_string(ret)); return RET_FAILURE; } diff --git a/test/zcl_global_cmd.c b/test/zcl_global_cmd.c index 3c767c0..56331bb 100644 --- a/test/zcl_global_cmd.c +++ b/test/zcl_global_cmd.c @@ -94,7 +94,7 @@ static void zigbee_zcl_global_read_attributes_rsp(nwk_addr addr16, if (ZIGBEE_ERROR_NONE != ret) { msg("zb_create_value(0x%X) - FAILED!!! [%s]", ret, zigbee_error_to_string(ret)); - return RET_FAILURE; + return; } msg(" Cluster ID : 0x%04X (%s)", cluster_id, zb_get_cluster_name(cluster_id)); @@ -151,7 +151,7 @@ static void zigbee_zcl_global_write_attributes_rsp(nwk_addr addr16, if (ZIGBEE_ERROR_NONE != ret) { msg("zb_create_value(0x%X) - FAILED!!! [%s]", ret, zigbee_error_to_string(ret)); - return RET_FAILURE; + return; } msg(" Cluster ID : 0x%04X (%s)", cluster_id, zb_get_cluster_name(cluster_id)); @@ -435,7 +435,7 @@ static int run_global_write_attr(MManager *mm, struct menu_data *menu) return RET_FAILURE; } - //zb_set_id_to_write_attr_record(attr, ZB_ZCL_IDENTIFY_TIME_ATTRIBUTE_ID); + /* zb_set_id_to_write_attr_record(attr, ZB_ZCL_IDENTIFY_TIME_ATTRIBUTE_ID); */ zb_set_id_to_write_attr_record(attr, attribute_id); zb_set_type_to_write_attr_record(attr, ZB_ZCL_UNSIGNED_16_BIT_INTEGER); zb_set_buf_to_write_attr_record(attr, ZB_ZCL_UNSIGNED_16_BIT_INTEGER, attribute_value, -- 2.34.1