Use 'intptr_t' to support multi architecture safely

Change-Id: Ibcda4d2f4c5e781b6bb6c00084c97f373ccf9095
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/client/tts_core.c b/client/tts_core.c
index 85f43ef..b6a93ad 100644 (file)
--- a/client/tts_core.c
+++ b/client/tts_core.c
@@ -154,7 +154,7 @@ static inline void __client_state_changed_cb(tts_client_s* client, tts_state_e b
 
 static Eina_Bool __notify_error_timer_cb(void *data)
 {
-       int uid = (int)data;
+       int uid = (intptr_t)data;
        tts_client_s* client = tts_client_get_by_uid(uid);
        if (NULL == client) {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] UID is not valid. (%d)", uid);
@@ -168,7 +168,7 @@ static Eina_Bool __notify_error_timer_cb(void *data)
 
 static Eina_Bool __notify_state_timer_cb(void *data)
 {
-       int uid = (int)data;
+       int uid = (intptr_t)data;
        tts_client_s* client = tts_client_get_by_uid(uid);
        if (NULL == client) {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] UID is not valid. (%d)", uid);
@@ -464,7 +464,7 @@ static int __send_hello_msg(tts_client_s* client)
 
 static Eina_Bool __prepare_cb(void *data)
 {
-       int uid = (int)data;
+       int uid = (intptr_t)data;
        tts_client_s* client = tts_client_get_by_uid(uid);
        if (NULL == client) {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Handle is not valid.");
@@ -495,7 +495,7 @@ static Eina_Bool __prepare_cb(void *data)
 static Eina_Bool __prepare_first_cb(void *data)
 {
        /* send first hello message */
-       int uid = (int)data;
+       int uid = (intptr_t)data;
        tts_client_s* client = tts_client_get_by_uid(uid);
        if (NULL == client) {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Handle is not valid.");
@@ -576,7 +576,7 @@ static void __engine_changed_cb(keynode_t* key, void* data)
 
 static bool __supported_voice_cb(const char* engine_id, const char* language, int type, void* user_data)
 {
-       int uid = (int)user_data;
+       int uid = (intptr_t)user_data;
        tts_client_s* client = tts_client_get_by_uid(uid);
        if (NULL == client) {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Uid is not valid. (%d)", uid);
@@ -770,7 +770,9 @@ int tts_core_notify_state_changed_async(tts_client_s* client, tts_state_e curren
        if (NULL != client->notify_state_timer) {
                ecore_timer_del(client->notify_state_timer);
        }
-       client->notify_state_timer = ecore_timer_add(0, __notify_state_timer_cb, (void*)tts_client_get_uid(client));
+
+       intptr_t uid = tts_client_get_uid(client);
+       client->notify_state_timer = ecore_timer_add(0, __notify_state_timer_cb, (void*)uid);
 
        return TTS_ERROR_NONE;
 }
@@ -839,7 +841,9 @@ int tts_core_notify_error_async(tts_client_s* client, tts_error_e reason, int ut
        if (NULL != client->notify_error_timer) {
                ecore_timer_del(client->notify_error_timer);
        }
-       client->notify_error_timer = ecore_timer_add(0, __notify_error_timer_cb, (void*)tts_client_get_uid(client));
+
+       intptr_t uid = tts_client_get_uid(client);
+       client->notify_error_timer = ecore_timer_add(0, __notify_error_timer_cb, (void*)uid);
 
        return TTS_ERROR_NONE;
 }
@@ -1009,7 +1013,8 @@ int tts_core_prepare(tts_client_s* client)
                SLOG(LOG_ERROR, TAG_TTSC, "Register timer for __prepare_first_cb");
 
                ecore_thread_main_loop_begin();
-               client->hello_timer = ecore_timer_add(0.0, __prepare_first_cb, (void*)tts_client_get_uid(client));
+               intptr_t uid = tts_client_get_uid(client);
+               client->hello_timer = ecore_timer_add(0.0, __prepare_first_cb, (void*)uid);
                ecore_thread_main_loop_end();
        } else {
                LOGD("Client is already trying to prepare");
@@ -1118,7 +1123,8 @@ int tts_core_foreach_supported_voices(tts_client_s* client, const char* engine_i
        }
 
        tts_client_set_supported_voice_cb(client, callback, user_data);
-       int ret = tts_config_mgr_get_voice_list(engine_id, __supported_voice_cb, (void*)tts_client_get_uid(client));
+       intptr_t uid = tts_client_get_uid(client);
+       int ret = tts_config_mgr_get_voice_list(engine_id, __supported_voice_cb, (void*)uid);
        tts_client_set_supported_voice_cb(client, NULL, NULL);
 
        if (0 != ret) {

diff --git a/client/tts_tidl.c b/client/tts_tidl.c
index b0ed3ac..8b97b9c 100644 (file)
--- a/client/tts_tidl.c
+++ b/client/tts_tidl.c
@@ -71,7 +71,7 @@ static int __tts_cb_utt_completed(int uid, int utt_id)
 
 static void __reconnect(void *data)
 {
-       int uid = (int)data;
+       int uid = (intptr_t)data;
 
        tts_client_s *client = tts_client_get_by_uid(uid);
        if (!client)
@@ -143,7 +143,7 @@ static void __notify_cb(void *user_data, int pid, int uid, bundle *msg)
 
 static void __on_connected(rpc_port_proxy_tts_h h, void *user_data)
 {
-       int uid = (int)user_data;
+       int uid = (intptr_t)user_data;
 
        tts_client_s* client = tts_client_get_by_uid(uid);
        if (NULL == client) {
@@ -168,7 +168,7 @@ static void __on_connected(rpc_port_proxy_tts_h h, void *user_data)
 
 static void __on_disconnected(rpc_port_proxy_tts_h h, void *user_data)
 {
-       int uid = (int)user_data;
+       int uid = (intptr_t)user_data;
 
        tts_client_s* client = tts_client_get_by_uid(uid);
        if (NULL == client) {
@@ -187,14 +187,14 @@ static void __on_disconnected(rpc_port_proxy_tts_h h, void *user_data)
                tts_core_handle_service_reset();
                SLOG(LOG_DEBUG, TAG_TTSC, "Disconnected from server");
 
-               ecore_main_loop_thread_safe_call_async(__reconnect, (void*)uid);
+               ecore_main_loop_thread_safe_call_async(__reconnect, user_data);
                SLOG(LOG_DEBUG, TAG_TTSC, "Try to reconnect to server");
        }
 }
 
 static void __on_rejected(rpc_port_proxy_tts_h h, void *user_data)
 {
-       int uid = (int)user_data;
+       int uid = (intptr_t)user_data;
        tts_client_s *client = tts_client_get_by_uid(uid);
        if (!client)
                return;
@@ -251,8 +251,8 @@ int tts_tidl_open_connection(int uid)
                client->reason = 0; // default value
        }
 
-
-       if (0 != rpc_port_proxy_tts_create(engine_mode, &rpc_callback, (void*)uid, &tts->rpc_h)) {
+       intptr_t ptr_uid = uid;
+       if (0 != rpc_port_proxy_tts_create(engine_mode, &rpc_callback, (void*)ptr_uid, &tts->rpc_h)) {
                free(engine_name);
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to create proxy");
                return TTS_ERROR_OPERATION_FAILED;