Remove build warnings

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

diff --git a/common/zb-common.h b/common/zb-common.h
index 8370377401cb262e41ba9e55ea13ae63447666b1..6c342b62827ba680b1c3fc7de606b679766ec600 100644 (file)
--- 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 ecb557c5802f03063fb9eb9fda469476197489b9..70628db987a0068b7e3250c899cb298d465a3eac 100644 (file)
--- 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 9cc26f2c613fd106c161d6d341eb3f39bb6c652e..4f739eac0f44e075ffddda010967cdc4dc41da0e 100644 (file)
--- 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 6e8c28dd8b092ee59a4de16e79ff9e7e989573df..0b8176c8d4d8a6576d654592ead5b53a3a582b05 100644 (file)
--- 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 eaf219c25cbda691b2f8701dc78c7d675e579b70..4501b78d10f1db5295882dd9c73072e8c9dfd734 100644 (file)
--- 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 14302d7e98f3c56c296f6939c9c4ed4310e4b643..fe58f9abdc6da551ee8b876f0371b29549c90405 100644 (file)
--- 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 64fa5a6b2c73d6e146abe89634bf36c958b215b5..85ca9c1126daffeffdfd67983f42dafb38fc270c 100644 (file)
--- 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 acfd4c23288ba5118c57c2fb273b2d734c326ae5..8ef8b167353fdc5ededb7ebc51e8cd30f963841c 100644 (file)
--- 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 675b0cc4f89bb7d1285085a713493fa70ec170f6..2e647a98de672b307904adb663722392dea6bb4f 100644 (file)
--- 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 f351f7666a0d485f818dc58bcffcc23d6466fbe2..f9112ff261eca43ce0738a1c4bd1b0b9e9f44aea 100644 (file)
--- 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 f7d33b8cf0eab7ceeb88d94c8c54092d5bd1cb37..4d3ed30e636cfc28b06ec3b6481fce345adb3bd9 100644 (file)
--- 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;