Fix ASAN build break

Declaration of g_focus_sound_handle array is moved to mm_sound_focus_private.c

[Version] 0.12.27
[Issue Type] Bug fix

Change-Id: Idc5a03f7df22763b4cf71762489d7f4c0d7df45b
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/include/mm_sound_focus_private.h b/include/mm_sound_focus_private.h
index d84bb79c282703643763658e16dab0bf887550e9..b4e18933a17c2b7b4c2a7639749b29c3629f0ba7 100644 (file)
--- a/include/mm_sound_focus_private.h
+++ b/include/mm_sound_focus_private.h
@@ -62,7 +62,7 @@ typedef struct {
 } focus_cb_data_lib;
 
 typedef gboolean(*focus_callback_handler_t)(gpointer user_data);
-focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX];
+extern focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX];
 
 int focus_find_empty_index(int *handle);
 int focus_find_index_by_handle(int handle);

diff --git a/mm_sound_client.c b/mm_sound_client.c
index b73282471aeac59561e42622d3057cf2950f2389..3cbdf918dc6f76d75801aa6a87bc549c0c0c1388 100644 (file)
--- a/mm_sound_client.c
+++ b/mm_sound_client.c
@@ -38,8 +38,6 @@
 #define CLIENT_HANDLE_MAX 256
 #define VOLUME_TYPE_LEN 64
 
-extern focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX];
-
 struct callback_data {
        void *user_cb;
        void *user_data;

diff --git a/mm_sound_focus_private.c b/mm_sound_focus_private.c
index 271a5e5699358001f8eff36bc1743a3124cf249b..c781840330f4ebb2529f9a93bd35e5a4728a60ee 100644 (file)
--- a/mm_sound_focus_private.c
+++ b/mm_sound_focus_private.c
@@ -33,6 +33,8 @@
 #include <mm_error.h>
 #include "include/mm_sound_focus_private.h"
 
+focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX];
+
 static gpointer _focus_thread_func(gpointer data)
 {
        unsigned int thread_id = (unsigned int)pthread_self();

diff --git a/mm_sound_proxy.c b/mm_sound_proxy.c
index a1fb15b62c68b32d824a38db99aa6f37aa0e4ac2..fb65ec8464d28b70bbeba6d4bcb79dc36991a7e8 100644 (file)
--- a/mm_sound_proxy.c
+++ b/mm_sound_proxy.c
@@ -15,8 +15,6 @@
 #include "include/mm_sound_focus_socket.h"
 #include "include/mm_sound_focus_private.h"
 
-extern focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX];
-
 struct callback_data {
        void *user_cb;
        void *user_data;

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index a2e22737ba11bc7518f448a83cf58eaa10ab3211..dee1379222acfae50a9243693892d0ca484727a8 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 sound_server binary
-Version:    0.12.26
+Version:    0.12.27
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0