remove unnecessary type casting

Change-Id: Ic13a477c200ee67c369fa720e6eea5fe9beb88bd

diff --git a/common/telephony_private.h b/common/telephony_private.h
index bd006e123c234d816085e87421cdfd4f8bb9c097..e7de7bafccaff2659278c37ce0ef6187f1719899 100644 (file)
--- a/common/telephony_private.h
+++ b/common/telephony_private.h
@@ -17,6 +17,7 @@
 #ifndef __CAPI_TELEPHONY_PRIVATE_H__
 #define __CAPI_TELEPHONY_PRIVATE_H__
 
+#include <stdbool.h>
 #include <gio/gio.h>
 #include <glib.h>
 #include <system_info.h>
@@ -60,10 +61,10 @@
  */
 #define TELEPHONY_CALL_NUMBER_LEN_MAX 82
 
-typedef struct {
+struct telephony_data {
        GSList *evt_list;
        struct tapi_handle *tapi_h;
-} telephony_data;
+};
 
 /*
  * Need to define the struct same as tapi_handle of libslp-tapi
@@ -84,14 +85,14 @@ struct tapi_handle {
  * @brief The structure type for the call information.
  * @since_tizen @if MOBILE 2.4 @elseif WEARABLE 3.0 @endif
  */
-typedef struct {
+struct telephony_call_info_s {
        unsigned int id; /**< The handle of the call */
        char number[TELEPHONY_CALL_NUMBER_LEN_MAX + 1]; /**< Calling number */
        telephony_call_type_e type; /**< Type of call (voice, video, emergency) */
        telephony_call_status_e status; /**< Call Status */
        telephony_call_direction_e direction; /**< Call direction (MO, MT) */
        bool conference_status; /**< true: Conference call, false: Single call */
-} telephony_call_info_s;
+};
 
 /**
  * @brief Check if the caller process has a privilege.

diff --git a/src/telephony_call.c b/src/telephony_call.c
index f17d4fc4c868de9bcdc01a7e47830f03be596aae..08f304b715f5d30c9715daad48675bee49c49543 100644 (file)
--- a/src/telephony_call.c
+++ b/src/telephony_call.c
@@ -60,9 +60,9 @@ static void _mapping_call_status(TelCallStates_t tapi_call_state,
 static void _get_call_status_cb(TelCallStatus_t *status, void *user_data)
 {
        GSList **list = user_data;
-       telephony_call_info_s *call_info;
+       telephony_call_h call_info;
 
-       call_info = g_malloc0(sizeof(telephony_call_info_s));
+       call_info = g_malloc0(sizeof(struct telephony_call_info_s));
        if (!call_info)
                return;
        call_info->id = status->CallHandle;
@@ -96,7 +96,7 @@ API int telephony_call_get_preferred_voice_subscription(telephony_h handle, tele
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(call_sub);
 
@@ -142,7 +142,7 @@ API int telephony_call_get_call_list(telephony_h handle,
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(call_list);
        CHECK_INPUT_PARAMETER(count);
@@ -165,9 +165,9 @@ API int telephony_call_get_call_list(telephony_h handle,
 
                tmp = list;
                while (tmp) {
-                       telephony_call_info_s *call_info = tmp->data;
-                       (*call_list)[call_index] = g_malloc0(sizeof(telephony_call_info_s));
-                       memcpy((*call_list)[call_index], call_info, sizeof(telephony_call_info_s));
+                       telephony_call_h call_info = tmp->data;
+                       (*call_list)[call_index] = g_malloc0(sizeof(struct telephony_call_info_s));
+                       memcpy((*call_list)[call_index], call_info, sizeof(struct telephony_call_info_s));
                        tmp = g_slist_next(tmp);
                        call_index++;
                }
@@ -190,7 +190,7 @@ API int telephony_call_release_call_list(unsigned int count, telephony_call_h **
 
        if (count > 0) {
                for (i = 0; i < count; i++)
-                       g_free((telephony_call_info_s *)(*call_list)[i]);
+                       g_free((*call_list)[i]);
                g_free(*call_list);
        }
 
@@ -205,7 +205,7 @@ API int telephony_call_get_handle_id(telephony_call_h call_handle, unsigned int
        CHECK_INPUT_PARAMETER(call_handle);
        CHECK_INPUT_PARAMETER(handle_id);
 
-       *handle_id = ((telephony_call_info_s *)call_handle)->id;
+       *handle_id = call_handle->id;
        return TELEPHONY_ERROR_NONE;
        /* LCOV_EXCL_STOP */
 }
@@ -217,7 +217,7 @@ API int telephony_call_get_number(telephony_call_h call_handle, char **number)
        CHECK_INPUT_PARAMETER(call_handle);
        CHECK_INPUT_PARAMETER(number);
 
-       *number = strdup(((telephony_call_info_s *)call_handle)->number);
+       *number = strdup(call_handle->number);
        return TELEPHONY_ERROR_NONE;
        /* LCOV_EXCL_STOP */
 }
@@ -230,7 +230,7 @@ API int telephony_call_get_type(telephony_call_h call_handle,
        CHECK_INPUT_PARAMETER(call_handle);
        CHECK_INPUT_PARAMETER(type);
 
-       *type = ((telephony_call_info_s *)call_handle)->type;
+       *type = call_handle->type;
        return TELEPHONY_ERROR_NONE;
        /* LCOV_EXCL_STOP */
 }
@@ -243,7 +243,7 @@ API int telephony_call_get_status(telephony_call_h call_handle,
        CHECK_INPUT_PARAMETER(call_handle);
        CHECK_INPUT_PARAMETER(status);
 
-       *status = ((telephony_call_info_s *)call_handle)->status;
+       *status = call_handle->status;
        return TELEPHONY_ERROR_NONE;
        /* LCOV_EXCL_STOP */
 }
@@ -256,7 +256,7 @@ API int telephony_call_get_direction(telephony_call_h call_handle,
        CHECK_INPUT_PARAMETER(call_handle);
        CHECK_INPUT_PARAMETER(direction);
 
-       *direction = ((telephony_call_info_s *)call_handle)->direction;
+       *direction = call_handle->direction;
        return TELEPHONY_ERROR_NONE;
        /* LCOV_EXCL_STOP */
 }
@@ -268,7 +268,7 @@ API int telephony_call_get_conference_status(telephony_call_h call_handle, bool
        CHECK_INPUT_PARAMETER(call_handle);
        CHECK_INPUT_PARAMETER(conference_status);
 
-       *conference_status = ((telephony_call_info_s *)call_handle)->conference_status;
+       *conference_status = call_handle->conference_status;
        return TELEPHONY_ERROR_NONE;
        /* LCOV_EXCL_STOP */
 }

diff --git a/src/telephony_common.c b/src/telephony_common.c
index 5105fad77021492f79365296b8af79cb1aa23d42..44dbac57c2cf210a521a62bbaa9a8cf88a206004 100644 (file)
--- a/src/telephony_common.c
+++ b/src/telephony_common.c
@@ -173,7 +173,7 @@ static telephony_error_e __deregister_all_noti(telephony_h handle, telephony_not
        TapiHandle *tapi_h;
 
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
 
        tapi_noti = _mapping_noti_id(noti_id);
        if (tapi_noti == NULL) {
@@ -320,7 +320,7 @@ API int telephony_set_noti_cb(telephony_h handle,
        CHECK_INPUT_PARAMETER(handle);
 
        LOGI("Entry");
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
 
        /* Mapping TAPI notification */
        tapi_noti = _mapping_noti_id(noti_id);
@@ -345,7 +345,7 @@ API int telephony_set_noti_cb(telephony_h handle,
        }
 
        /* Append evt_cb_data to free */
-       ((telephony_data *)handle)->evt_list = g_slist_append(((telephony_data *)handle)->evt_list, evt_cb_data);
+       handle->evt_list = g_slist_append(handle->evt_list, evt_cb_data);
 
        return TELEPHONY_ERROR_NONE;
 }
@@ -368,11 +368,11 @@ API int telephony_unset_noti_cb(telephony_h handle, telephony_noti_e noti_id)
        LOGI("De-registered noti_id: [%d]", noti_id);
 
        /* Free evt_cb_data */
-       list = g_slist_nth(((telephony_data *)handle)->evt_list, 0);
+       list = g_slist_nth(handle->evt_list, 0);
        while (list) {
                evt_cb_data = list->data;
                if (evt_cb_data->noti_id == noti_id) {
-                       ((telephony_data *)handle)->evt_list = g_slist_remove(((telephony_data *)handle)->evt_list, evt_cb_data);
+                       handle->evt_list = g_slist_remove(handle->evt_list, evt_cb_data);
                        g_free(evt_cb_data);
                        break;
                }
@@ -416,7 +416,7 @@ API int telephony_init(telephony_handle_list_s *list)
        }
 
        for (i = 0; i < cp_count; i++) {
-               telephony_data *tmp = malloc(sizeof(telephony_data));
+               telephony_h tmp = malloc(sizeof(struct telephony_data));
                if (tmp == NULL) {
                        /* LCOV_EXCL_START */
                        int j;
@@ -424,7 +424,7 @@ API int telephony_init(telephony_handle_list_s *list)
                        /* Need to be freed if allocated data is existing */
                        for (j = 0; j < i; j++) {
                                if (list->handle[j]) {
-                                       tel_deinit(((telephony_data *)list->handle[j])->tapi_h);
+                                       tel_deinit(list->handle[j]->tapi_h);
                                        free(list->handle[j]);
                                }
                        }
@@ -443,7 +443,7 @@ API int telephony_init(telephony_handle_list_s *list)
                        /* Need to be freed if allocated data is existing */
                        for (j = 0; j < i; j++) {
                                if (list->handle[j]) {
-                                       tel_deinit(((telephony_data *)list->handle[j])->tapi_h);
+                                       tel_deinit(list->handle[j]->tapi_h);
                                        free(list->handle[j]);
                                }
                        }
@@ -453,7 +453,7 @@ API int telephony_init(telephony_handle_list_s *list)
                        return TELEPHONY_ERROR_OPERATION_FAILED;
                        /* LCOV_EXCL_STOP */
                }
-               list->handle[i] = (telephony_h)tmp;
+               list->handle[i] = tmp;
        }
        g_strfreev(cp_list);
 
@@ -468,7 +468,7 @@ API int telephony_deinit(telephony_handle_list_s *list)
        CHECK_INPUT_PARAMETER(list);
 
        for (i = 0; i < list->count; i++) {
-               telephony_data *tmp = (telephony_data *)list->handle[i];
+               telephony_h tmp = list->handle[i];
 
                /* De-register all registered events */
                g_slist_free_full(tmp->evt_list, _deregister_noti);

diff --git a/src/telephony_modem.c b/src/telephony_modem.c
index f934baf62881087fef699df2bbda6b778eac0730..83d3dc14712575183b1b35bc21708319c4f133ad 100644 (file)
--- a/src/telephony_modem.c
+++ b/src/telephony_modem.c
@@ -37,7 +37,7 @@ API int telephony_modem_get_imei(telephony_h handle, char **imei)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(imei);
 
@@ -92,7 +92,7 @@ API int telephony_modem_get_power_status(telephony_h handle,
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(status);
 
@@ -143,7 +143,7 @@ API int telephony_modem_get_meid(telephony_h handle, char **meid)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(meid);
 

diff --git a/src/telephony_network.c b/src/telephony_network.c
index 63dcb6aa2874e40b869b263b05cb953940556a9f..13358694b83c82620900eb382620b873757ea888 100644 (file)
--- a/src/telephony_network.c
+++ b/src/telephony_network.c
@@ -38,7 +38,7 @@ API int telephony_network_get_lac(telephony_h handle, int *lac)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(lac);
 
@@ -75,7 +75,7 @@ API int telephony_network_get_cell_id(telephony_h handle, int *cell_id)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(cell_id);
 
@@ -110,7 +110,7 @@ API int telephony_network_get_rssi(telephony_h handle, telephony_network_rssi_e
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(rssi);
 
@@ -139,7 +139,7 @@ API int telephony_network_get_roaming_status(telephony_h handle, bool *status)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(status);
 
@@ -172,7 +172,7 @@ API int telephony_network_get_mcc(telephony_h handle, char **mcc)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(mcc);
 
@@ -213,7 +213,7 @@ API int telephony_network_get_mnc(telephony_h handle, char **mnc)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(mnc);
 
@@ -254,7 +254,7 @@ API int telephony_network_get_network_name(telephony_h handle, char **network_na
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(network_name);
 
@@ -283,7 +283,7 @@ API int telephony_network_get_network_name_option(telephony_h handle, telephony_
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(network_name_option);
 
@@ -327,7 +327,7 @@ API int telephony_network_get_type(telephony_h handle, telephony_network_type_e
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(network_type);
 
@@ -409,7 +409,7 @@ API int telephony_network_get_ps_type(telephony_h handle, telephony_network_ps_t
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(ps_type);
 
@@ -456,7 +456,7 @@ API int telephony_network_get_service_state(telephony_h handle, telephony_networ
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(network_service_state);
 
@@ -499,7 +499,7 @@ API int telephony_network_get_default_data_subscription(telephony_h handle,
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(default_data_sub);
 
@@ -541,7 +541,7 @@ API int telephony_network_get_default_subscription(telephony_h handle,
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(default_sub);
 
@@ -583,7 +583,7 @@ API int telephony_network_get_selection_mode(telephony_h handle, telephony_netwo
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(mode);
 
@@ -626,7 +626,7 @@ API int telephony_network_get_tac(telephony_h handle, int *tac)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(tac);
 
@@ -663,7 +663,7 @@ API int telephony_network_get_system_id(telephony_h handle, int *sid)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(sid);
 
@@ -700,7 +700,7 @@ API int telephony_network_get_network_id(telephony_h handle, int *nid)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(nid);
 
@@ -737,7 +737,7 @@ API int telephony_network_get_base_station_id(telephony_h handle, int *bs_id)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(bs_id);
 
@@ -774,7 +774,7 @@ API int telephony_network_get_base_station_latitude(telephony_h handle, int *bs_
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(bs_latitude);
 
@@ -811,7 +811,7 @@ API int telephony_network_get_base_station_longitude(telephony_h handle, int *bs
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(bs_longitude);
 
@@ -846,7 +846,7 @@ API int telephony_network_get_signal_strength(telephony_h handle, int *dbm)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(dbm);
 

diff --git a/src/telephony_sim.c b/src/telephony_sim.c
index 9699dfa245c6c81d1c5dec59fdf5a0ac552db004..008fcf9206f473c4d7706492814c8dfa207d0977 100644 (file)
--- a/src/telephony_sim.c
+++ b/src/telephony_sim.c
@@ -96,7 +96,7 @@ API int telephony_sim_get_icc_id(telephony_h handle, char **icc_id)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(icc_id);
 
@@ -148,7 +148,7 @@ API int telephony_sim_get_operator(telephony_h handle, char **sim_operator)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(sim_operator);
        GET_SIM_STATUS(tapi_h, sim_card_state);
@@ -191,7 +191,7 @@ API int telephony_sim_get_msin(telephony_h handle, char **msin)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(msin);
        GET_SIM_STATUS(tapi_h, sim_card_state);
@@ -226,7 +226,7 @@ API int telephony_sim_get_spn(telephony_h handle, char **spn)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(spn);
        GET_SIM_STATUS(tapi_h, sim_card_state);
@@ -288,7 +288,7 @@ API int telephony_sim_is_changed(telephony_h handle, bool *is_changed)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(is_changed);
 
@@ -321,7 +321,7 @@ API int telephony_sim_get_state(telephony_h handle, telephony_sim_state_e *sim_s
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(sim_state);
        GET_SIM_STATUS(tapi_h, sim_card_state);
@@ -364,7 +364,7 @@ API int telephony_sim_get_application_list(telephony_h handle, unsigned int *app
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(app_list);
        GET_SIM_STATUS(tapi_h, sim_card_state);
@@ -400,7 +400,7 @@ API int telephony_sim_get_subscriber_number(telephony_h handle, char **subscribe
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(subscriber_number);
 
@@ -459,7 +459,7 @@ API int telephony_sim_get_subscriber_id(telephony_h handle, char **subscriber_id
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(subscriber_id);
        GET_SIM_STATUS(tapi_h, sim_card_state);
@@ -511,7 +511,7 @@ API int telephony_sim_get_lock_state(telephony_h handle, telephony_sim_lock_stat
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(lock_state);
        GET_SIM_STATUS(tapi_h, sim_card_state);
@@ -546,7 +546,7 @@ API int telephony_sim_get_group_id1(telephony_h handle, char **gid1)
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(gid1);
        GET_SIM_STATUS(tapi_h, sim_card_state);
@@ -615,7 +615,7 @@ API int telephony_sim_get_call_forwarding_indicator_state(telephony_h handle, bo
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
+       tapi_h = handle->tapi_h;
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(state);
        GET_SIM_STATUS(tapi_h, sim_card_state);