Fix aarch64 casting build warnings

- warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
- warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

[Version] 0.13.16
[Issue Type] Build

Change-Id: Iabc8f08b2126ef0ce15493aece64d7527885cd65

diff --git a/focus_server/mm_sound_mgr_focus_socket.c b/focus_server/mm_sound_mgr_focus_socket.c
index be7e017..3c85b54 100644 (file)
--- a/focus_server/mm_sound_mgr_focus_socket.c
+++ b/focus_server/mm_sound_mgr_focus_socket.c
@@ -300,7 +300,7 @@ static void* work_thread_func(void *data)
 
        debug_fenter();
 
-       accepted_fd = (int)(data);
+       accepted_fd = (int)(uintptr_t)(data);
 
        do {
                memset(&read_data, 0x00, sizeof(_mm_sound_focus_socket_param_t));
@@ -371,7 +371,7 @@ static void* ready_thread_func(void *data)
                goto LEAVE;
        }
 
-       fd = (int)data;
+       fd = (int)(uintptr_t)data;
 
        if (listen(fd, 5)) {
                strerror_r(errno, str_error, sizeof(str_error));
@@ -390,7 +390,7 @@ static void* ready_thread_func(void *data)
 
                debug_log("accepted fd [%d]", accepted_fd);
 
-               if (pthread_create(&focus_work_thread_id, &attr, (void *)work_thread_func, (void *)accepted_fd)) {
+               if (pthread_create(&focus_work_thread_id, &attr, (void *)work_thread_func, (void *)(uintptr_t)accepted_fd)) {
                        debug_error("failed to create work thread, accepted_fd(%d)", accepted_fd);
                        goto LEAVE;
                }
@@ -487,7 +487,7 @@ int MMSoundMgrFocusSocketReadyToWork(int fd)
        }
 
        debug_log("fd [%d]", fd);
-       if (pthread_create(&g_focus_ready_thread_id, NULL, (void *)ready_thread_func, (void *)fd)) {
+       if (pthread_create(&g_focus_ready_thread_id, NULL, (void *)ready_thread_func, (void *)(uintptr_t)fd)) {
                debug_error("failed to create ready thread");
                return MM_ERROR_SOUND_INTERNAL;
        }

diff --git a/mm_sound_client.c b/mm_sound_client.c
index 8974fa0..9b60ee6 100644 (file)
--- a/mm_sound_client.c
+++ b/mm_sound_client.c
@@ -374,7 +374,7 @@ static void _mm_sound_device_connected_callback_wrapper_func(int device_id, cons
                return;
        }
 
-       device_flags = (int) cb_data->extra_data;
+       device_flags = (int)(uintptr_t)cb_data->extra_data;
        if (!device_is_match_with_mask(device_type, io_direction, state, device_flags))
                return;
 
@@ -395,7 +395,7 @@ int mm_sound_client_add_device_connected_callback(int device_flags, mm_sound_dev
 
        debug_fenter();
 
-       GET_CB_DATA(cb_data, func, userdata, (void*) device_flags);
+       GET_CB_DATA(cb_data, func, userdata, (void*)(uintptr_t)device_flags);
 
        ret = mm_sound_proxy_add_device_connected_callback(_mm_sound_device_connected_callback_wrapper_func,
                                                                                                        cb_data, g_free, subs_id);
@@ -432,7 +432,7 @@ static void _mm_sound_device_info_changed_callback_wrapper_func(int device_id, c
                return;
        }
 
-       device_flags = (int) cb_data->extra_data;
+       device_flags = (int)(uintptr_t)cb_data->extra_data;
        if (!device_is_match_with_mask(device_type, io_direction, state, device_flags))
                return;
 
@@ -453,7 +453,7 @@ int mm_sound_client_add_device_info_changed_callback(int device_flags, mm_sound_
 
        debug_fenter();
 
-       GET_CB_DATA(cb_data, func, userdata, (void *) device_flags);
+       GET_CB_DATA(cb_data, func, userdata, (void *)(uintptr_t)device_flags);
 
        ret = mm_sound_proxy_add_device_info_changed_callback(_mm_sound_device_info_changed_callback_wrapper_func,
                                                                                                                cb_data, g_free, subs_id);
@@ -490,7 +490,7 @@ static void _mm_sound_device_state_changed_callback_wrapper_func(int device_id,
                return;
        }
 
-       device_flags = (int) cb_data->extra_data;
+       device_flags = (int)(uintptr_t)cb_data->extra_data;
 
        if (!device_is_match_with_mask(device_type, io_direction, state, device_flags))
                return;
@@ -512,7 +512,7 @@ int mm_sound_client_add_device_state_changed_callback(int device_flags, mm_sound
 
        debug_fenter();
 
-       GET_CB_DATA(cb_data, func, userdata, (void *) device_flags);
+       GET_CB_DATA(cb_data, func, userdata, (void *)(uintptr_t)device_flags);
 
        ret = mm_sound_proxy_add_device_state_changed_callback(_mm_sound_device_state_changed_callback_wrapper_func,
                                                                                                                cb_data, g_free, id);
@@ -548,7 +548,7 @@ static void _mm_sound_device_running_changed_callback_wrapper_func(int device_id
                return;
        }
 
-       device_flags = (int) cb_data->extra_data;
+       device_flags = (int)(uintptr_t)cb_data->extra_data;
 
        if (!device_is_match_with_mask(device_type, io_direction, state, device_flags))
                return;
@@ -570,7 +570,7 @@ int mm_sound_client_add_device_running_changed_callback(int device_flags, mm_sou
 
        debug_fenter();
 
-       GET_CB_DATA(cb_data, func, userdata, (void *) device_flags);
+       GET_CB_DATA(cb_data, func, userdata, (void *)(uintptr_t)device_flags);
 
        ret = mm_sound_proxy_add_device_running_changed_callback(_mm_sound_device_running_changed_callback_wrapper_func,
                                                                                                                        cb_data, g_free, id);
@@ -857,7 +857,7 @@ int mm_sound_client_add_volume_changed_callback_internal(mm_sound_volume_changed
 
        debug_fenter();
 
-       GET_CB_DATA(cb_data, func, userdata, (void*)is_for_internal);
+       GET_CB_DATA(cb_data, func, userdata, (void*)(uintptr_t)is_for_internal);
 
        ret = mm_sound_proxy_add_volume_changed_callback(_mm_sound_volume_changed_callback_wrapper_func, cb_data, g_free, subs_id);
 

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 9436453..31c0154 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -1,6 +1,6 @@
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and focus server binary
-Version:    0.13.15
+Version:    0.13.16
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/testsuite/mm_sound_testsuite_simple.c b/testsuite/mm_sound_testsuite_simple.c
index a20e5ba..aecd5ea 100755 (executable)
--- a/testsuite/mm_sound_testsuite_simple.c
+++ b/testsuite/mm_sound_testsuite_simple.c
@@ -88,7 +88,7 @@ void test_callback(void *data, int id)
 }
 void mm_sound_test_cb1(int a, void *user_data)
 {
-       debug_log("dbus test user callback called: param(%d), userdata(%d)", a, (int)user_data);
+       debug_log("dbus test user callback called: param(%d), userdata(%d)", a, (int)(uintptr_t)user_data);
        g_print("my callback pid : %u  tid : %ld\n", getpid(), pthread_self());
 }
 void device_connected_cb(MMSoundDevice_t device_h, bool is_connected, void *user_data)