Remove warning code

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I83fb36a2299e3287d1f0a39293e66dab063c88c5

diff --git a/src/clientlib/net_nfc_client.c b/src/clientlib/net_nfc_client.c
index 4b3d77d..74da6d5 100755 (executable)
--- a/src/clientlib/net_nfc_client.c
+++ b/src/clientlib/net_nfc_client.c
@@ -39,7 +39,6 @@
 
 void __attribute__ ((constructor)) lib_init()
 {
-       g_type_init();
 }
 
 void __attribute__ ((destructor)) lib_fini()

diff --git a/src/clientlib/net_nfc_client_se.c b/src/clientlib/net_nfc_client_se.c
index 4b52261..176670d 100755 (executable)
--- a/src/clientlib/net_nfc_client_se.c
+++ b/src/clientlib/net_nfc_client_se.c
@@ -171,8 +171,6 @@ static void se_transaction_event(GObject *source_object,
 {
        void *user_data = NULL;
        net_nfc_client_se_transaction_event callback = NULL;
-       GError *error = NULL;
-       gint result = 0;
        pid_t mypid = getpid();
 
        INFO_MSG(">>> SIGNAL arrived");

diff --git a/src/manager/net_nfc_app_util.c b/src/manager/net_nfc_app_util.c
index 0e9d95f..795adc3 100755 (executable)
--- a/src/manager/net_nfc_app_util.c
+++ b/src/manager/net_nfc_app_util.c
@@ -1098,8 +1098,6 @@ int net_nfc_app_util_decode_base64(const char *buffer, uint32_t buf_len, uint8_t
 
 pid_t net_nfc_app_util_get_focus_app_pid()
 {
-       pid_t pid;
-
 /* Todo : ecore_x_window_focus_get is failed
        ecore_x_init(":0");
 

diff --git a/src/manager/net_nfc_controller.c b/src/manager/net_nfc_controller.c
index db52926..c0d3ecb 100755 (executable)
--- a/src/manager/net_nfc_controller.c
+++ b/src/manager/net_nfc_controller.c
@@ -676,17 +676,6 @@ static void _remove_socket_info(net_nfc_llcp_socket_t socket)
        }
 }
 
-static void _destroy_function(gpointer data)
-{
-       free(data);
-}
-
-static void _clear_socket_info()
-{
-       g_slist_free_full(llcp_sockets, _destroy_function);
-       llcp_sockets = NULL;
-}
-
 void net_nfc_controller_llcp_socket_error_cb(net_nfc_llcp_socket_t socket,
        net_nfc_error_e result, void *data, void *user_param)
 {

diff --git a/src/manager/net_nfc_manager.c b/src/manager/net_nfc_manager.c
index 461c115..69a2e08 100755 (executable)
--- a/src/manager/net_nfc_manager.c
+++ b/src/manager/net_nfc_manager.c
@@ -125,14 +125,6 @@ int main(int argc, char *argv[])
        GOptionContext *option_context;
        GError *error = NULL;
        bool check_csc = 0;
-       int result;
-
-       if (!g_thread_supported())
-       {
-               g_thread_init(NULL);
-       }
-
-       g_type_init();
 
        option_context = g_option_context_new("Nfc manager");
        g_option_context_add_main_entries(option_context,

diff --git a/src/manager/net_nfc_server_common.c b/src/manager/net_nfc_server_common.c
index c20fce5..b1376ae 100755 (executable)
--- a/src/manager/net_nfc_server_common.c
+++ b/src/manager/net_nfc_server_common.c
@@ -348,7 +348,7 @@ static void controller_llcp_event_cb(void *info, void *user_context)
        net_nfc_request_llcp_msg_t *req_msg = info;
 
        if(user_context != NULL)
-               req_msg->user_param = user_context;
+               req_msg->user_param = (uint32_t)user_context;
 
        if (net_nfc_server_controller_async_queue_push_force(
                _controller_llcp_event_cb, req_msg) == FALSE)

diff --git a/src/manager/net_nfc_server_context.c b/src/manager/net_nfc_server_context.c
index ecf32e4..c96feb6 100755 (executable)
--- a/src/manager/net_nfc_server_context.c
+++ b/src/manager/net_nfc_server_context.c
@@ -175,12 +175,8 @@ static bool _get_credentials(GDBusMethodInvocation *invocation, net_nfc_privileg
        break;
        }
 
-       DEBUG_SERVER_MSG("user :%s , client :%s ,unique_name : %s, pid() : %d, privilege : %d",
-               user, client, sender_unique_name, pid, privilege);
-
        client_session = cynara_session_from_pid(pid);
 
-
        ret = cynara_check(p_cynara, client, client_session, user, privilege);
        if (ret == CYNARA_API_ACCESS_ALLOWED)
                INFO_MSG("cynara PASS");

diff --git a/src/manager/net_nfc_server_handover_bt.c b/src/manager/net_nfc_server_handover_bt.c
index 572badc..23ce7a4 100755 (executable)
--- a/src/manager/net_nfc_server_handover_bt.c
+++ b/src/manager/net_nfc_server_handover_bt.c
@@ -182,7 +182,7 @@ static void _bt_carrier_record_cb(int result, bt_adapter_state_e adapter_state,
 
 static void _append_oob_data(net_nfc_carrier_config_s *config)
 {
-       net_nfc_error_e result;
+       int result;
        unsigned char *hash;
        unsigned char *randomizer;
        int hash_len;
@@ -232,7 +232,7 @@ static net_nfc_error_e _bt_create_config_record(ndef_record_s **record)
        char* bt_addr = NULL;
        char *bt_name = NULL;
        net_nfc_carrier_config_s *config = NULL;
-       net_nfc_error_e result;
+       int result;
 
        if (record == NULL)
        {
@@ -263,7 +263,7 @@ static net_nfc_error_e _bt_create_config_record(ndef_record_s **record)
 
        result = net_nfc_util_add_carrier_config_property(
                config, NET_NFC_BT_ATTRIBUTE_ADDRESS,
-               strlen(bt_addr), bt_addr);
+               strlen(bt_addr), (uint8_t *)bt_addr);
        if (result != NET_NFC_OK)
        {
                DEBUG_ERR_MSG("net_nfc_util_add_carrier_config_property failed [%d]", result);
@@ -688,7 +688,7 @@ static int _bt_prepare_pairing(net_nfc_handover_bt_process_context_t *context)
 
        case NET_NFC_LLCP_STEP_RETURN :
                {
-                       data_s temp = { context->remote_address, sizeof(context->remote_address) };
+                       data_s temp = { (uint8_t *)context->remote_address, (uint32_t)sizeof(context->remote_address) };
                        data_s *data = NULL;
 
                        INFO_MSG("STEP return");
@@ -961,7 +961,7 @@ void _bt_bond_created_cb(int result, bt_device_info_s *device_info,
 static int _bt_do_pairing(net_nfc_handover_bt_process_context_t *context)
 {
        int ret;
-       bt_adapter_state_e *adapter_state;
+       bt_adapter_state_e adapter_state;
 
        if (context->result != NET_NFC_OK && context->result != NET_NFC_BUSY)
        {
@@ -1223,7 +1223,7 @@ static int _bt_do_pairing(net_nfc_handover_bt_process_context_t *context)
 
        case NET_NFC_LLCP_STEP_RETURN :
                {
-                       data_s temp = { context->remote_address, sizeof(context->remote_address) };
+                       data_s temp = { (uint8_t *)context->remote_address, (uint32_t)sizeof(context->remote_address) };
                        data_s *data = NULL;
 
                        INFO_MSG("STEP return");

diff --git a/src/manager/net_nfc_server_hce_ipc.c b/src/manager/net_nfc_server_hce_ipc.c
index cca6a1f..397fbdd 100755 (executable)
--- a/src/manager/net_nfc_server_hce_ipc.c
+++ b/src/manager/net_nfc_server_hce_ipc.c
@@ -389,7 +389,6 @@ static gboolean __on_io_event_cb(GIOChannel *channel, GIOCondition condition,
 bool net_nfc_server_hce_ipc_init()
 {
        struct sockaddr_un saddrun_rv;
-       int ret;
 
        /* initialize server context */
        __hce_client_init();

diff --git a/src/manager/net_nfc_server_route_table.c b/src/manager/net_nfc_server_route_table.c
index d02b270..33967a4 100755 (executable)
--- a/src/manager/net_nfc_server_route_table.c
+++ b/src/manager/net_nfc_server_route_table.c
@@ -1070,12 +1070,11 @@ net_nfc_error_e net_nfc_server_route_table_update_preferred_handler()
        char foreground[1024] = {0,};
 
        if (preferred_handler != NULL && preferred_handler->package) {
-               bool ret;
                pid_t pid;
 
                //check match prefered and foreground app
                pid = net_nfc_app_util_get_focus_app_pid();
-               ret = net_nfc_util_get_pkgid_by_pid(pid, foreground, sizeof(foreground));
+               net_nfc_util_get_pkgid_by_pid(pid, foreground, sizeof(foreground));
 
                if (strcmp(foreground, preferred_handler->package) != 0) {
                        DEBUG_SERVER_MSG("[Preferred] Not match!!! foreground : %s, preferred : %s",
@@ -1089,6 +1088,7 @@ net_nfc_error_e net_nfc_server_route_table_update_preferred_handler()
 #ifdef PRINT_TABLE
        net_nfc_server_route_table_preferred_handler_dump();
 #endif
+       return NET_NFC_OK;
 }
 
 bool net_nfc_server_route_table_is_allowed_preferred_handler(route_table_handler_t *handler)

diff --git a/src/manager/net_nfc_server_se.c b/src/manager/net_nfc_server_se.c
index bbb3683..c04caa4 100755 (executable)
--- a/src/manager/net_nfc_server_se.c
+++ b/src/manager/net_nfc_server_se.c
@@ -687,7 +687,6 @@ static net_nfc_error_e net_nfc_server_se_close_ese()
 static void _sim_apdu_cb(TapiHandle *handle, int result,
                    void *data, void *user_data)
 {
-    TelSimAccessResult_t access_rt = (TelSimAccessResult_t)result;
     resp_apdu = (TelSimApduResp_t *)data;
     GMainLoop *loop = (GMainLoop *)user_data;
 
@@ -697,7 +696,6 @@ static void _sim_apdu_cb(TapiHandle *handle, int result,
 static void _sim_atr_cb(TapiHandle *handle, int result,
                void *data, void *user_data)
 {
-    TelSimAccessResult_t access_rt = (TelSimAccessResult_t)result;
        resp_atr  = (TelSimAtrResp_t *)data;
        GMainLoop *loop = (GMainLoop *)user_data;
 
@@ -786,160 +784,6 @@ static bool _se_uicc_get_atr(net_nfc_target_handle_s *handle, data_s **atr)
        return ret;
 }
 
-#ifdef ENABLE_TELEPHONY
-static void _se_uicc_prepare(void)
-{
-       gdbus_uicc_handle = tel_init(NULL);
-}
-
-static void _vconf_sim_status_cb(keynode_t *node, void *user_data)
-{
-       DEBUG_SERVER_MSG("VCONFKEY_TELEPHONY_SIM_STATUS [%d]", node->value.i);
-
-       switch (node->value.i) {
-       case VCONFKEY_TELEPHONY_SIM_STATUS_INIT_COMPLETED :
-               {
-                       int se_policy;
-
-                       gdbus_uicc_ready = SE_UICC_READY;
-
-                       _se_uicc_prepare();
-
-                       se_policy = __se_get_se_policy();
-
-                       DEBUG_SERVER_MSG("current se policy [%d]", se_policy);
-
-                       if (se_policy == SECURE_ELEMENT_POLICY_UICC_ON) {
-                               net_nfc_server_se_apply_se_policy(SECURE_ELEMENT_POLICY_UICC_ON);
-                       }
-               }
-               break;
-       case VCONFKEY_TELEPHONY_SIM_STATUS_CARD_REMOVED :
-       case VCONFKEY_TELEPHONY_SIM_STATUS_CARD_ERROR :
-       case VCONFKEY_TELEPHONY_SIM_STATUS_CARD_BLOCKED :
-       case VCONFKEY_TELEPHONY_SIM_STATUS_CARD_CRASHED :
-               gdbus_uicc_ready = SE_UICC_UNAVAILABLE;
-#if 0
-               if (__se_get_se_policy() == SECURE_ELEMENT_POLICY_UICC_ON) {
-                       net_nfc_server_se_set_se_policy(SECURE_ELEMENT_POLICY_UICC_OFF);
-               }
-#endif
-               break;
-
-
-       case VCONFKEY_TELEPHONY_SIM_STATUS_CARD_NOT_PRESENT :
-#if 0          /* temp_patch_for_no_SIM_currency_issue */
-       {
-               int ret;
-               int se_type;
-               ret = vconf_get_int(VCONFKEY_NFC_SE_TYPE, &se_type);
-
-               if (ret == 0 &&
-                        se_type == VCONFKEY_NFC_SE_TYPE_UICC)
-               {
-                       net_nfc_error_e result = NET_NFC_OK;
-                       DEBUG_SERVER_MSG("_vconf_sim_status_cb  VCONFKEY_NFC_SE_TYPE_UICC but VCONFKEY_TELEPHONY_SIM_STATUS_CARD_NOT_PRESENT ");
-
-                       /*turn off ESE*/
-                       net_nfc_controller_set_secure_element_mode(
-                               SECURE_ELEMENT_TYPE_ESE,
-                               SECURE_ELEMENT_OFF_MODE,
-                               &result);
-
-                       /*turn on UICC*/
-                       net_nfc_controller_set_secure_element_mode(
-                               SECURE_ELEMENT_TYPE_UICC,
-                               SECURE_ELEMENT_VIRTUAL_MODE,
-                               &result);
-               }
-       }
-               break;
-#endif
-       default :
-               break;
-       }
-}
-
-static void _se_uicc_init(void)
-{
-       int status;
-
-       vconf_notify_key_changed(VCONFKEY_TELEPHONY_SIM_STATUS,
-               _vconf_sim_status_cb, NULL);
-
-       if (vconf_get_int(VCONFKEY_TELEPHONY_SIM_STATUS, &status) == 0) {
-               DEBUG_SERVER_MSG("VCONFKEY_TELEPHONY_SIM_STATUS [%d]", status);
-
-               switch (status) {
-               case VCONFKEY_TELEPHONY_SIM_STATUS_INIT_COMPLETED :
-                       gdbus_uicc_ready = SE_UICC_READY;
-
-                       _se_uicc_prepare();
-                       break;
-
-               case VCONFKEY_TELEPHONY_SIM_STATUS_UNKNOWN :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_INITIALIZING :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_PIN_REQUIRED :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_PUK_REQUIRED :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_NCK_REQUIRED :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_NSCK_REQUIRED :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_SPCK_REQUIRED :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_CCK_REQUIRED :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_SIM_LOCK_REQUIRED :
-                       gdbus_uicc_ready = SE_UICC_ON_PROGRESS;
-                       break;
-
-               case VCONFKEY_TELEPHONY_SIM_STATUS_CARD_NOT_PRESENT :
-#if 0          /* temp_patch_for_no_SIM_currency_issue */
-               {
-                       int ret;
-                       int se_type;
-                       ret = vconf_get_int(VCONFKEY_NFC_SE_TYPE, &se_type);
-
-                       if (ret == 0 &&
-                                se_type == VCONFKEY_NFC_SE_TYPE_UICC)
-                       {
-                               net_nfc_error_e result = NET_NFC_OK;
-                               DEBUG_SERVER_MSG("_se_uicc_init  VCONFKEY_NFC_SE_TYPE_UICC but VCONFKEY_TELEPHONY_SIM_STATUS_CARD_NOT_PRESENT ");
-
-                               /*turn off ESE*/
-                               net_nfc_controller_set_secure_element_mode(
-                                       SECURE_ELEMENT_TYPE_ESE,
-                                       SECURE_ELEMENT_OFF_MODE,
-                                       &result);
-
-                               /*turn on UICC*/
-                               net_nfc_controller_set_secure_element_mode(
-                                       SECURE_ELEMENT_TYPE_UICC,
-                                       SECURE_ELEMENT_VIRTUAL_MODE,
-                                       &result);
-                       }
-               }
-                       break;
-#endif
-               case VCONFKEY_TELEPHONY_SIM_STATUS_CARD_ERROR :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_CARD_BLOCKED :
-               case VCONFKEY_TELEPHONY_SIM_STATUS_CARD_CRASHED :
-               default :
-                       gdbus_uicc_ready = SE_UICC_UNAVAILABLE;
-                       break;
-               }
-       }
-}
-
-static void _se_uicc_deinit()
-{
-       if (gdbus_uicc_handle != NULL) {
-               tel_deinit(gdbus_uicc_handle);
-
-               gdbus_uicc_handle = NULL;
-       }
-
-       vconf_ignore_key_changed(VCONFKEY_TELEPHONY_SIM_STATUS,
-               _vconf_sim_status_cb);
-}
-#endif
-
 static net_nfc_target_handle_s *_se_uicc_open(void)
 {
        net_nfc_target_handle_s *result = NULL;
@@ -1166,9 +1010,6 @@ net_nfc_error_e net_nfc_server_se_change_wallet_mode(
 
 static void se_policy_apply_thread_func(gpointer user_data)
 {
-       net_nfc_error_e result;
-
-       result = net_nfc_server_se_apply_se_current_policy();
 }
 
 static void se_close_secure_element_thread_func(gpointer user_data)
@@ -3710,9 +3551,7 @@ static void se_set_preferred_handler_thread_func(gpointer user_data)
        route_table_handler_t *handler;
        net_nfc_error_e result = NET_NFC_OK;
        bool ret;
-       pid_t pid;
        const char *id;
-       char foreground[1024] = {0,};
 
        g_assert(data != NULL);
        g_assert(data->object != NULL);
@@ -3783,7 +3622,7 @@ static gboolean se_handle_set_preferred_handler(
                goto ERROR;
        }
 #endif
-       data = g_try_new0(SeDataAid, 1);
+       data = g_try_new0(SeSetPreferred, 1);
        if (data == NULL)
        {
                DEBUG_ERR_MSG("Memory allocation failed");

diff --git a/src/manager/net_nfc_server_vconf.c b/src/manager/net_nfc_server_vconf.c
index 2b3fcac..57afb93 100755 (executable)
--- a/src/manager/net_nfc_server_vconf.c
+++ b/src/manager/net_nfc_server_vconf.c
@@ -33,11 +33,6 @@ static void net_nfc_server_vconf_lock_state_changed(keynode_t *key,
 static void net_nfc_server_vconf_pm_state_changed(keynode_t *key,
                                                void *user_data);
 
-#ifdef ENABLE_TELEPHONY
-static void net_nfc_server_vconf_flight_mode_changed(keynode_t *key,
-                                               void *user_data);
-#endif
-
 static void net_nfc_server_vconf_lock_state_changed(keynode_t *key,
                                                void *user_data)
 {
@@ -220,7 +215,6 @@ void net_nfc_server_vconf_deinit(void)
 bool net_nfc_check_csc_vconf(void)
 {
        int state = 0;;
-       gint result = 0;
 
        if (state == true)
        {