improve line coverage

 - remove the unused codes.
 - add the excluded comment for line coverage

Change-Id: I8016d16a1e1d7570ed6a8c7df14399ffa433dec2

diff --git a/packaging/iotcon.spec b/packaging/iotcon.spec
index d3ed629..d8eaf91 100644 (file)
--- a/packaging/iotcon.spec
+++ b/packaging/iotcon.spec
@@ -1,6 +1,6 @@
 Name:       iotcon
 Summary:    Tizen IoT Connectivity
-Version:    0.3.11
+Version:    0.3.12
 Release:    0
 Group:      Network & Connectivity/Service
 License:    Apache-2.0

diff --git a/src/ic-cbor.c b/src/ic-cbor.c
index 109b166..c281eb6 100644 (file)
--- a/src/ic-cbor.c
+++ b/src/ic-cbor.c
@@ -29,6 +29,7 @@
 #define ICL_CBOR_UUID_STR_LEN 36
 #define ICL_CBOR_UUID_SIZE 16
 
+/* LCOV_EXCL_START */
 int icl_cbor_create_svr_db(const char *path)
 {
        int fd;
@@ -135,7 +136,7 @@ int icl_cbor_create_svr_db(const char *path)
 
        return IOTCON_ERROR_NONE;
 }
-
+/* LCOV_EXCL_STOP */
 
 int icl_cbor_create_pt_svr_db(const char *path)
 {

diff --git a/src/ic-ioty.c b/src/ic-ioty.c
index 10bafe3..6e570fd 100644 (file)
--- a/src/ic-ioty.c
+++ b/src/ic-ioty.c
@@ -138,6 +138,7 @@ int icl_ioty_set_persistent_storage(const char *file_path, bool is_pt)
        return IOTCON_ERROR_NONE;
 }
 
+/* LCOV_EXCL_START */
 static void _generated_pin_cb(char *pin, size_t length)
 {
        GList *node;
@@ -155,6 +156,7 @@ static void _generated_pin_cb(char *pin, size_t length)
                        container->cb(pin, container->user_data);
        }
 }
+/* LCOV_EXCL_STOP */
 
 static icl_generated_pin_cb_container_s* _find_generated_pin_cb(
                iotcon_generated_pin_cb cb)
@@ -279,6 +281,7 @@ int icl_ioty_init(pthread_t *out_thread)
        return IOTCON_ERROR_NONE;
 }
 
+/* LCOV_EXCL_START */
 static gboolean _icl_ioty_timeout(gpointer user_data)
 {
        FN_CALL;
@@ -323,6 +326,7 @@ static gboolean _icl_ioty_timeout(gpointer user_data)
 
        return G_SOURCE_REMOVE;
 }
+/* LCOV_EXCL_STOP */
 
 static gboolean _icl_ioty_free_cb_data_idle_cb(gpointer p)
 {
@@ -1051,6 +1055,7 @@ static void _icl_ioty_free_response_container(void *data)
        free(cb_container);
 }
 
+/* LCOV_EXCL_START */
 static gboolean _icl_ioty_response_timeout(gpointer p)
 {
        icl_response_container_s *cb_container = p;
@@ -1066,6 +1071,7 @@ static gboolean _icl_ioty_response_timeout(gpointer p)
 
        return G_SOURCE_REMOVE;
 }
+/* LCOV_EXCL_STOP */
 
 static int _icl_ioty_remote_resource_crud(
                iotcon_request_type_e req_type,
@@ -1368,7 +1374,7 @@ int icl_ioty_remote_resource_set_checking_interval(iotcon_remote_resource_h reso
        return IOTCON_ERROR_NONE;
 }
 
-
+/* LCOV_EXCL_START */
 static void _icl_ioty_monitoring_presence_cb(iotcon_presence_h presence,
                iotcon_error_e err, iotcon_presence_response_h response, void *user_data)
 {
@@ -1382,6 +1388,7 @@ static void _icl_ioty_monitoring_presence_cb(iotcon_presence_h presence,
 
        _icl_ioty_encap_timeout_cb(resource);
 }
+/* LCOV_EXCL_STOP */
 
 int icl_ioty_remote_resource_start_monitoring(iotcon_remote_resource_h resource,
                iotcon_remote_resource_state_changed_cb cb, void *user_data)

diff --git a/src/ic-provisioning-find.c b/src/ic-provisioning-find.c
index e5dfc3d..9c08eb1 100644 (file)
--- a/src/ic-provisioning-find.c
+++ b/src/ic-provisioning-find.c
@@ -196,7 +196,7 @@ static void _provisioning_free_cb_data(void *data)
        g_idle_add(_provisioning_find_cb_unref, cb_data);
 }
 
-
+/* LCOV_EXCL_START */
 static gboolean _provisioning_find_internal_timeout(gpointer user_data)
 {
        FN_CALL;
@@ -229,8 +229,9 @@ static gboolean _provisioning_find_internal_timeout(gpointer user_data)
 
        return G_SOURCE_REMOVE;
 }
+/* LCOV_EXCL_STOP */
 
-
+/* LCOV_EXCL_START */
 static gboolean _provisioning_find_timeout(gpointer user_data)
 {
        FN_CALL;
@@ -261,7 +262,7 @@ static gboolean _provisioning_find_timeout(gpointer user_data)
 
        return G_SOURCE_REMOVE;
 }
-
+/* LCOV_EXCL_STOP */
 
 static void _provisioning_free_find_cb_container(void *data)
 {

diff --git a/src/ic-provisioning-remove.c b/src/ic-provisioning-remove.c
index 20d0a0e..50da7d3 100644 (file)
--- a/src/ic-provisioning-remove.c
+++ b/src/ic-provisioning-remove.c
@@ -129,7 +129,7 @@ static gboolean _provisioning_remove_idle_cb(gpointer p)
        return G_SOURCE_REMOVE;
 }
 
-
+/* LCOV_EXCL_START */
 static gboolean _provisioning_remove_fail_idle_cb(gpointer p)
 {
        FN_CALL;
@@ -170,7 +170,7 @@ static gboolean _provisioning_remove_fail_idle_cb(gpointer p)
 
        return G_SOURCE_REMOVE;
 }
-
+/* LCOV_EXCL_STOP */
 
 static OCStackApplicationResult _provisioning_remove_device_delete_cb(void *ctx,
                OCDoHandle handle, OCClientResponse *resp)
@@ -226,7 +226,7 @@ static OCStackApplicationResult _provisioning_remove_device_delete_cb(void *ctx,
        return OC_STACK_DELETE_TRANSACTION;
 }
 
-
+/* LCOV_EXCL_START */
 static gboolean _provisioning_remove_device_delete_timeout(gpointer p)
 {
        icl_provisioning_remove_delete_container_s *container = p;
@@ -238,7 +238,7 @@ static gboolean _provisioning_remove_device_delete_timeout(gpointer p)
 
        return G_SOURCE_REMOVE;
 }
-
+/* LCOV_EXCL_STOP */
 
 static int _provisioning_remove_device_delete(
                icl_provisioning_remove_delete_container_s *container)
@@ -337,7 +337,7 @@ static bool _provisioning_remove_device_found_cb(iotcon_provisioning_device_h de
        return IOTCON_FUNC_CONTINUE;
 }
 
-
+/* LCOV_EXCL_START */
 static gboolean _provisioning_remove_complete_idle_cb(gpointer p)
 {
        FN_CALL;
@@ -359,7 +359,7 @@ static gboolean _provisioning_remove_complete_idle_cb(gpointer p)
 
        return G_SOURCE_REMOVE;
 }
-
+/* LCOV_EXCL_STOP */
 
 API int iotcon_provisioning_remove_device(const char *device_id,
                iotcon_provisioning_remove_device_cb cb, void *user_data)

diff --git a/src/ic-provisioning-struct.c b/src/ic-provisioning-struct.c
index 3173c1a..e28d0d1 100644 (file)
--- a/src/ic-provisioning-struct.c
+++ b/src/ic-provisioning-struct.c
@@ -117,24 +117,6 @@ OicUuid_t* icl_provisioning_convert_device_id(const char *device_id)
 }
 
 
-bool icl_provisioning_compare_oic_uuid(OicUuid_t *a, OicUuid_t *b)
-{
-       int i;
-       bool ret = true;
-
-       RETV_IF(NULL == a, false);
-       RETV_IF(NULL == b, false);
-
-       for (i = 0; i < UUID_LENGTH; i++) {
-               if ((*a).id[i] != (*b).id[i]) {
-                       ret = false;
-                       break;
-               }
-       }
-       return ret;
-}
-
-
 int icl_provisioning_parse_oic_dev_address(OCDevAddr *dev_addr, int secure_port,
                OCConnectivityType conn_type, char **host_address)
 {
@@ -574,46 +556,6 @@ API int iotcon_provisioning_acl_destroy(iotcon_provisioning_acl_h acl)
 }
 
 
-static gpointer _provisioning_acl_resource_list_clone(gconstpointer src,
-               gpointer data)
-{
-       return ic_utils_strdup(src);
-}
-
-
-int icl_provisioning_acl_clone(iotcon_provisioning_acl_h acl,
-               iotcon_provisioning_acl_h *cloned_acl)
-{
-       int ret;
-       iotcon_provisioning_acl_h temp;
-
-       RETV_IF(NULL == acl, IOTCON_ERROR_INVALID_PARAMETER);
-       RETV_IF(NULL == cloned_acl, IOTCON_ERROR_INVALID_PARAMETER);
-
-       ret = iotcon_provisioning_acl_create(&temp);
-       if (IOTCON_ERROR_NONE != ret) {
-               ERR("iotcon_provisioning_acl_create() Fail(%d)", ret);
-               return ret;
-       }
-
-       temp->device = icl_provisioning_device_clone(acl->device);
-       if (NULL == temp->device) {
-               ERR("icl_provisioning_device_clone() Fail");
-               iotcon_provisioning_acl_destroy(temp);
-               return IOTCON_ERROR_OUT_OF_MEMORY;
-       }
-
-       temp->resource_list = g_list_copy_deep(acl->resource_list,
-                       _provisioning_acl_resource_list_clone, NULL);
-
-       temp->permission = acl->permission;
-
-       *cloned_acl = temp;
-
-       return IOTCON_ERROR_NONE;
-}
-
-
 API int iotcon_provisioning_acl_set_subject(iotcon_provisioning_acl_h acl,
                iotcon_provisioning_device_h device)
 {

diff --git a/src/ic-provisioning-struct.h b/src/ic-provisioning-struct.h
index fd5f2a0..9f6aac2 100644 (file)
--- a/src/ic-provisioning-struct.h
+++ b/src/ic-provisioning-struct.h
@@ -42,11 +42,9 @@ OCProvisionDev_t* icl_provisioning_device_get_device(
 void icl_provisioning_device_print(iotcon_provisioning_device_h device);
 
 void icl_provisioning_device_print_uuid(iotcon_provisioning_device_h device);
-bool icl_provisioning_compare_oic_uuid(OicUuid_t *a, OicUuid_t *b);
 
 iotcon_provisioning_acl_h icl_provisioning_acl_ref(iotcon_provisioning_acl_h acl);
-int icl_provisioning_acl_clone(iotcon_provisioning_acl_h acl,
-               iotcon_provisioning_acl_h *cloned_acl);
+
 OCProvisionDev_t* icl_provisioning_acl_get_subject(
                iotcon_provisioning_acl_h acl);
 int icl_provisioning_acl_get_resource_count(iotcon_provisioning_acl_h acl);

diff --git a/src/ic-provisioning.c b/src/ic-provisioning.c
index 7f052a2..4167910 100644 (file)
--- a/src/ic-provisioning.c
+++ b/src/ic-provisioning.c
@@ -172,7 +172,7 @@ API int iotcon_provisioning_initialize(const char *file_path, const char *db_pat
        return IOTCON_ERROR_NONE;
 }
 
-
+/* LCOV_EXCL_START */
 static void _provisioning_input_pin_cb(char *pin, size_t len)
 {
        FN_CALL;
@@ -190,7 +190,7 @@ static void _provisioning_input_pin_cb(char *pin, size_t len)
 
        strncpy(pin, temp, len);
 }
-
+/* LCOV_EXCL_STOP */
 
 API int iotcon_provisioning_set_randompin_cb(iotcon_provisioning_randompin_cb cb,
                void *user_data)

diff --git a/src/ic-representation.c b/src/ic-representation.c
index ee27297..4fd958c 100644 (file)
--- a/src/ic-representation.c
+++ b/src/ic-representation.c
@@ -565,12 +565,14 @@ static int _icl_repr_compare_attributes(iotcon_attributes_h attributes1,
        return IC_EQUAL;
 }
 
+/* LCOV_EXCL_START */
 static int _icl_repr_compare_custom(gconstpointer p1, gconstpointer p2)
 {
        iotcon_representation_h repr1 = (iotcon_representation_h)p1;
        iotcon_representation_h repr2 = (iotcon_representation_h)p2;
        return icl_representation_compare(repr1, repr2);
 }
+/* LCOV_EXCL_STOP */
 
 static int _icl_repr_compare_children(GList *children1, GList *children2)
 {

diff --git a/src/ic-types.c b/src/ic-types.c
index e44069b..a714c19 100644 (file)
--- a/src/ic-types.c
+++ b/src/ic-types.c
@@ -256,63 +256,6 @@ int icl_create_response_cb_data(icl_response_container_s *cb_container,
        return IOTCON_ERROR_NONE;
 }
 
-void icl_destroy_monitoring_container(void *data)
-{
-       icl_monitoring_container_s *cb_container = data;
-
-       RET_IF(NULL == cb_container);
-
-       if (false == cb_container->is_destroyed) {
-               /* cb_container will destroy in _icl_ioty_monitoring_get_cb */
-               cb_container->is_destroyed = true;
-               return;
-       }
-
-       if (cb_container->presence) {
-               icl_ioty_remove_presence_cb(cb_container->presence);
-               cb_container->presence = NULL;
-       }
-
-       if (cb_container->timeout) {
-               g_source_remove(cb_container->timeout);
-               cb_container->timeout = 0;
-       }
-
-       if (cb_container->resource) {
-               icl_remote_resource_unref(cb_container->resource);
-               cb_container->resource = NULL;
-       }
-}
-
-void icl_destroy_caching_container(void *data)
-{
-       icl_caching_container_s *cb_container = data;
-
-       RET_IF(NULL == cb_container);
-
-       if (false == cb_container->is_destroyed) {
-               /* cb_container will destroy in _icl_ioty_caching_get_cb */
-               cb_container->is_destroyed = true;
-               return;
-       }
-
-       if (cb_container->obs_handle) {
-               icl_ioty_remote_resource_observe_cancel(cb_container->resource,
-                               cb_container->obs_handle);
-               cb_container->obs_handle = NULL;
-       }
-
-       if (cb_container->timeout) {
-               g_source_remove(cb_container->timeout);
-               cb_container->timeout = 0;
-       }
-
-       if (cb_container->resource) {
-               icl_remote_resource_unref(cb_container->resource);
-               cb_container->resource = NULL;
-       }
-}
-
 static void _icl_destroy_request(iotcon_request_h request)
 {
        RET_IF(NULL == request);

diff --git a/src/ic-types.h b/src/ic-types.h
index e0b4c12..5281580 100644 (file)
--- a/src/ic-types.h
+++ b/src/ic-types.h
@@ -124,8 +124,6 @@ void icl_destroy_response_cb_data(icl_response_cb_s *cb_data);
 int icl_create_response_cb_data(icl_response_container_s *cb_container,
                iotcon_response_h response, icl_response_cb_s **response_cb_data);
 
-void icl_destroy_monitoring_container(void *data);
-void icl_destroy_caching_container(void *data);
 
 void icl_destroy_request_container(icl_request_container_s *cb_container);