Rename power_off2 in media-scanner-common_v2.c

 - PROBLEM
power_off2 because same named variable is already defined in media-scanner-scan_v2.c
So it will make build error without "-fcommon" build option.
The "-fcommon" build option will be removed from toolchain because of Asan memory analyzer tools.

Change-Id: Icb67569d306af162617758f3b640588aefc964b3
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 3b02226..353830b 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.2.111
+Version:    0.2.112
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/scanner-v2/media-scanner-common-v2.c b/src/scanner-v2/media-scanner-common-v2.c
index b747376..11c80ae 100644 (file)
--- a/src/scanner-v2/media-scanner-common-v2.c
+++ b/src/scanner-v2/media-scanner-common-v2.c
@@ -24,7 +24,7 @@
 #include "media-scanner-common-v2.h"
 
 int mmc_state2 = 0;
-bool power_off2;
+bool msc_power_off2;
 
 int msc_set_mmc_status(ms_stg_status_e status)
 {
@@ -42,14 +42,14 @@ int msc_get_mmc_status(ms_stg_status_e *status)
 
 int msc_set_power_status(bool status)
 {
-       power_off2 = status;
+       msc_power_off2 = status;
 
        return MS_MEDIA_ERR_NONE;
 }
 
 int msc_get_power_status(bool *status)
 {
-       *status = power_off2;
+       *status = msc_power_off2;
 
        return MS_MEDIA_ERR_NONE;
 }