From: Jiwan Kim Date: Wed, 8 Feb 2017 07:46:42 +0000 (+0900) Subject: Remove build warnings X-Git-Tag: submit/tizen/20170512.045637~45 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa56835a62d62fe651a7721f202b65f2b8eeb15d;p=platform%2Fcore%2Fapi%2Fzigbee.git Remove build warnings Change-Id: Ibc5b59b2d54a47ea19484c0cc0343d2338a3d28e Signed-off-by: Jiwan Kim --- diff --git a/common/zb-common.h b/common/zb-common.h index 8370377..6c342b6 100644 --- a/common/zb-common.h +++ b/common/zb-common.h @@ -74,6 +74,8 @@ */ #define ZIGBEE_FUNC_CONTINUE true +#define NOT_USED(var) ((var) = (var)) + /*--------------------------------------------------------------------------------------- * For ZDO *--------------------------------------------------------------------------------------*/ diff --git a/include/zdo/zb-zdo-dev-disc.h b/include/zdo/zb-zdo-dev-disc.h index ecb557c..70628db 100644 --- a/include/zdo/zb-zdo-dev-disc.h +++ b/include/zdo/zb-zdo-dev-disc.h @@ -548,7 +548,7 @@ typedef void (*zb_zdo_match_desc_rsp)( unsigned char status, nwk_addr addr16, unsigned char match_length, - unsigned char **match_list, + unsigned char *match_list, void *user_data); /** diff --git a/lib/zbl-dbus.c b/lib/zbl-dbus.c index 9cc26f2..4f739ea 100644 --- a/lib/zbl-dbus.c +++ b/lib/zbl-dbus.c @@ -6585,7 +6585,7 @@ int zbl_identify_query(nwk_addr addr16, unsigned char dst_ep, } int zbl_add_group(nwk_addr addr16, unsigned char ep, unsigned short group_id, - char *group_name, zb_zcl_group_add_group_rsp cb, void *user_data) + const char *group_name, zb_zcl_group_add_group_rsp cb, void *user_data) { int result = ZIGBEE_ERROR_NONE; GVariant *variant = NULL; diff --git a/lib/zbl-dbus.h b/lib/zbl-dbus.h index 6e8c28d..0b8176c 100644 --- a/lib/zbl-dbus.h +++ b/lib/zbl-dbus.h @@ -179,7 +179,7 @@ int zbl_identify_query(nwk_addr addr16, unsigned char dst_ep, /* ZCL Group Cluster */ int zbl_add_group(nwk_addr addr16, unsigned char ep, unsigned short group_id, - char *group_name, zb_zcl_group_add_group_rsp cb, void *user_data); + const char *group_name, zb_zcl_group_add_group_rsp cb, void *user_data); int zbl_view_group(nwk_addr addr16, unsigned char ep, unsigned short group_id, zb_zcl_group_view_group_rsp cb, void *user_data); int zbl_group_get_group_membership(nwk_addr addr16, unsigned char ep, diff --git a/lib/zbl-zcl.c b/lib/zbl-zcl.c index eaf219c..4501b78 100644 --- a/lib/zbl-zcl.c +++ b/lib/zbl-zcl.c @@ -952,6 +952,8 @@ API int zb_get_change_from_report_config_record1(report_config_record_h handle, int len = -1; int data_type = DATA_TYPE_NONE; + NOT_USED(data_type); + RETV_IF(NULL == handle, ZIGBEE_ERROR_INVALID_PARAMETER); RETV_IF(NULL == value, ZIGBEE_ERROR_INVALID_PARAMETER); RETV_IF(NULL == handle->change, ZIGBEE_ERROR_NO_DATA); @@ -974,6 +976,8 @@ API int zb_set_change_to_report_config_record1(report_config_record_h handle, int len = -1; int data_type = DATA_TYPE_NONE; + NOT_USED(data_type); + RETV_IF(NULL == handle, ZIGBEE_ERROR_INVALID_PARAMETER); RETV_IF(NULL == value, ZIGBEE_ERROR_INVALID_PARAMETER); @@ -1000,6 +1004,8 @@ API int zb_get_change_from_report_config_record2(report_config_record_h handle, int data_type = DATA_TYPE_NONE; unsigned char *t = NULL; + NOT_USED(data_type); + RETV_IF(NULL == handle, ZIGBEE_ERROR_INVALID_PARAMETER); RETV_IF(NULL == value, ZIGBEE_ERROR_INVALID_PARAMETER); RETV_IF(NULL == handle->change, ZIGBEE_ERROR_NO_DATA); @@ -1024,6 +1030,8 @@ API int zb_set_change_to_report_config_record2( int len = -1; int data_type = DATA_TYPE_NONE; + NOT_USED(data_type); + RETV_IF(NULL == handle, ZIGBEE_ERROR_INVALID_PARAMETER); if (handle->change) free(handle->change); @@ -1047,7 +1055,8 @@ API int zb_get_change_from_report_config_record3(report_config_record_h handle, { int len = -1; int data_type = DATA_TYPE_NONE; - unsigned char *t = NULL; + + NOT_USED(data_type); RETV_IF(NULL == handle, ZIGBEE_ERROR_INVALID_PARAMETER); RETV_IF(NULL == value, ZIGBEE_ERROR_INVALID_PARAMETER); diff --git a/packaging/capi-network-zigbee.spec b/packaging/capi-network-zigbee.spec index 14302d7..fe58f9a 100644 --- a/packaging/capi-network-zigbee.spec +++ b/packaging/capi-network-zigbee.spec @@ -138,5 +138,4 @@ cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-test %else %{_datadir}/license/%{name}-test %endif -%{_bindir}/test-zigbee %{_bindir}/test-zigbee2 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 64fa5a6..85ca9c1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -49,9 +49,9 @@ SET(NEW_SOURCES #ENDFOREACH(src) # test-zigbee -ADD_EXECUTABLE(test-zigbee ${ORG_SOURCES}) -TARGET_LINK_LIBRARIES(test-zigbee ${${test}_LDFLAGS} ${CLIENT}) -INSTALL(TARGETS test-zigbee DESTINATION ${BIN_INSTALL_DIR}) +#ADD_EXECUTABLE(test-zigbee ${ORG_SOURCES}) +#TARGET_LINK_LIBRARIES(test-zigbee ${${test}_LDFLAGS} ${CLIENT}) +#INSTALL(TARGETS test-zigbee DESTINATION ${BIN_INSTALL_DIR}) # test-zigbee (new) ADD_EXECUTABLE(test-zigbee2 ${NEW_SOURCES}) diff --git a/test/main.c b/test/main.c index acfd4c2..8ef8b16 100644 --- a/test/main.c +++ b/test/main.c @@ -132,7 +132,7 @@ static void _init_endpoints() sj_ep1.in_clusters[5] = ZB_ZCL_ALARM_CLUSTER_ID; sj_ep1.in_clusters[6] = ZB_ZCL_DIAGNOSTICS_CLUSTER_ID; /* Out clusters : 0019 */ - unsigned short sj_out_clusters[] = { ZB_ZCL_OTA_BOOTLOAD_CLUSTER_ID }; + /*unsigned short sj_out_clusters[] = { ZB_ZCL_OTA_BOOTLOAD_CLUSTER_ID };*/ /* SmartThings open/close sensor EP1 */ st_ep1.ep = 1; @@ -664,6 +664,8 @@ static int run_choose_end_device_list(MManager *mm, struct menu_data *menu) zb_device_list_free(target_list); ret = zb_get_all_device_list(handle, &target_list_count, &target_list); + msg(" - zb_get_all_device_list() ret: [0x%X]", ret); + for (i = 0; i < target_list_count && target_list; i++) { zb_get_network_address(target_list[i], &addr16); zb_get_ieee_address((target_list)[i], addr64); @@ -701,13 +703,12 @@ static int run_select_device(MManager *mm, struct menu_data *menu) int i; int selected = (int)strtol(data_choose_target, NULL, 10); nwk_addr addr16; - ieee_addr addr64; /* Apply manual address first */ - if (data_dest_addr16 && strlen(data_dest_addr16) > 0) { + if (strlen(data_dest_addr16) > 0) { dest_addr16 = (unsigned short)strtol(data_dest_addr16, NULL, 16); msg(" network addr [0x%04X] selected.", dest_addr16); - snprintf(data_dest_addr16, MENU_DATA_SIZE+1, ""); + memset(data_dest_addr16, '\0', MENU_DATA_SIZE + 1); return RET_SUCCESS; } diff --git a/test/test-zigbee.c b/test/test-zigbee.c index 675b0cc..2e647a9 100644 --- a/test/test-zigbee.c +++ b/test/test-zigbee.c @@ -1870,7 +1870,7 @@ void process_input(const char *input, gpointer user_data) case CMD_CONFIGURE_REPORTING_REQ: { /* Samjin Power Outlet */ - char val1 = 0; + unsigned char val1 = 0; report_config_record_h config, config1; zb_create_report_config_record(&config); zb_set_dir_to_report_config_record(config, ZB_ZCL_CLIENT_TO_SERVER); diff --git a/test/zcl-global-cmd.c b/test/zcl-global-cmd.c index f351f76..f9112ff 100644 --- a/test/zcl-global-cmd.c +++ b/test/zcl-global-cmd.c @@ -481,7 +481,7 @@ static int run_global_config_report(MManager *mm, struct menu_data *menu) int ret = ZIGBEE_ERROR_NONE; /* Samjin Power Outlet */ unsigned char val1 = 1; - report_config_record_h config, config1; + report_config_record_h config; unsigned short cluster_id = ZB_ZCL_ON_OFF_CLUSTER_ID; unsigned short attribute_id = ZB_ZCL_ON_OFF_ATTRIBUTE_ID; unsigned short min_i; @@ -515,7 +515,9 @@ static int run_global_config_report(MManager *mm, struct menu_data *menu) zb_destroy_report_config_record(config); #if 0 /* ST Open/Close Sensor */ + report_config_record_h config1; unsigned short val2 = 0x007f; + zb_create_report_config_record(&config1); zb_set_dir_to_report_config_record(config1, ZB_ZCL_CLIENT_TO_SERVER); zb_set_id_to_report_config_record(config1, ZB_ZCL_ZONE_STATE_ATTRIBUTE_ID); diff --git a/test/zdo-network.c b/test/zdo-network.c index f7d33b8..4d3ed30 100644 --- a/test/zdo-network.c +++ b/test/zdo-network.c @@ -42,13 +42,6 @@ static char data_rejoin[MENU_DATA_SIZE + 1] = "1"; static char data_permit_duration[MENU_DATA_SIZE + 1] = "1"; static char data_tc[MENU_DATA_SIZE + 1] = "1"; -static void zigbee_active_ep_rsp(unsigned char status, nwk_addr addr16, - unsigned char count, unsigned char *ep_list, void *user_data) -{ - msg(""); - msgp("zb_zdo_active_ep_rsp() status = 0x%02X", status); -} - static void zigbee_zdo_mgmt_nwk_disc_rsp(unsigned char status, unsigned char network_count, unsigned char start_idx, unsigned char network_list_count, const zb_zdo_network_list_record_h *records, void *user_data) @@ -381,8 +374,9 @@ static int run_mgmt_permit_joining_req(MManager *mm, struct menu_data *menu) if (strlen(data_tc)) tc_significance = (unsigned char)strtol(data_tc, NULL, 10); - ret = zb_zdo_mgmt_permit_joining_req(handle, dest_addr64, - permit_duration, tc_significance, zigbee_zdo_mgmt_leave_rsp, NULL); + ret = zb_zdo_mgmt_permit_joining_req(handle, dest_addr16, + permit_duration, tc_significance, + zigbee_zdo_mgmt_permit_joining_rsp, NULL); if (ZIGBEE_ERROR_NONE != ret) { msg("zb_zdo_mgmt_permit_joining_req(0x%X) - FAILED!!!", ret); return RET_FAILURE;