Fix SAM defect - GlobalVariable

- Remove global extern variable
- Use static for global varable

[Version] 0.3.30
[Issue Type] SAM Improvement

Change-Id: I864e884ff38a25e4d8b5565c165f74e1e44e3ae7
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/include/recorder_private.h b/include/recorder_private.h
index 9535ff8..faa791a 100644 (file)
--- a/include/recorder_private.h
+++ b/include/recorder_private.h
@@ -39,37 +39,37 @@ extern "C" {
 
 #define REC_LOG_CRITICAL(format, args...) \
        do { \
-               if (g_mmcam_log_level >= RECORDER_LOG_LEVEL_CRITICAL) \
+               if (_recorder_get_log_level() >= RECORDER_LOG_LEVEL_CRITICAL) \
                        LOGF(format, ##args); \
        } while (0)
 
 #define REC_LOG_ERROR(format, args...) \
        do { \
-               if (g_mmcam_log_level >= RECORDER_LOG_LEVEL_ERROR) \
+               if (_recorder_get_log_level() >= RECORDER_LOG_LEVEL_ERROR) \
                        LOGE(format, ##args); \
        } while (0)
 
 #define REC_LOG_WARNING(format, args...) \
        do { \
-               if (g_mmcam_log_level >= RECORDER_LOG_LEVEL_WARNING) \
+               if (_recorder_get_log_level() >= RECORDER_LOG_LEVEL_WARNING) \
                        LOGW(format, ##args); \
        } while (0)
 
 #define REC_LOG_INFO(format, args...) \
        do { \
-               if (g_mmcam_log_level >= RECORDER_LOG_LEVEL_INFO) \
+               if (_recorder_get_log_level() >= RECORDER_LOG_LEVEL_INFO) \
                        LOGI(format, ##args); \
        } while (0)
 
 #define REC_LOG_DEBUG(format, args...) \
        do { \
-               if (g_mmcam_log_level >= RECORDER_LOG_LEVEL_DEBUG) \
+               if (_recorder_get_log_level() >= RECORDER_LOG_LEVEL_DEBUG) \
                        LOGD(format, ##args); \
        } while (0)
 
 #define REC_LOG_VERBOSE(format, args...) \
        do { \
-               if (g_mmcam_log_level >= RECORDER_LOG_LEVEL_VERBOSE) \
+               if (_recorder_get_log_level() >= RECORDER_LOG_LEVEL_VERBOSE) \
                        LOGD("[V] "format, ##args); \
        } while (0)
 
@@ -205,7 +205,7 @@ typedef struct _recorder_cb_info {
        void *user_data;
 } recorder_cb_info;
 
-int __convert_recorder_error_code(const char *func, int code);
+int _recorder_get_log_level(void);
 
 #ifdef __cplusplus
 }

diff --git a/packaging/capi-media-recorder.spec b/packaging/capi-media-recorder.spec
index 8708e6a..98cc479 100644 (file)
--- a/packaging/capi-media-recorder.spec
+++ b/packaging/capi-media-recorder.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-recorder
 Summary:    A Recorder API
-Version:    0.3.29
+Version:    0.3.30
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/recorder.c b/src/recorder.c
index c246066..0d34cd7 100644 (file)
--- a/src/recorder.c
+++ b/src/recorder.c
@@ -48,7 +48,7 @@ static guint g_rec_dev_state_changed_cb_subscribe_id;
 static GMutex g_rec_idle_event_lock;
 
 /* log level */
-extern int g_mmcam_log_level;
+static int g_recorder_log_level;
 
 
 static void __recorder_update_api_waiting(recorder_cb_info_s *cb_info, int api, int value)
@@ -1537,7 +1537,7 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty
        int destroy_ret = RECORDER_ERROR_NONE;
        int sock_fd = -1;
        int module_index = -1;
-       int log_level = g_mmcam_log_level;
+       int log_level = g_recorder_log_level;
        int send_ret = 0;
        char *send_msg = NULL;
        char *root_directory = NULL;
@@ -1645,7 +1645,7 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty
 
        /* get log level from message */
        muse_recorder_msg_get(log_level, pc->cb_info->recv_msg);
-       g_mmcam_log_level = log_level;
+       g_recorder_log_level = log_level;
 
        muse_recorder_msg_get_pointer(handle, pc->cb_info->recv_msg);
        if (handle == 0) {
@@ -1664,7 +1664,7 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty
 //LCOV_EXCL_STOP
        }
 
-       REC_LOG_INFO("root directory[%s]", root_directory);
+       REC_LOG_INFO("root directory[%s], log level[%d]", root_directory, g_recorder_log_level);
 
        RECORDER_MSG_PARAM_SET(param, STRING, root_directory);
 
@@ -3838,3 +3838,9 @@ _DONE:
 
        return ret;
 }
+
+
+int _recorder_get_log_level(void)
+{
+       return g_recorder_log_level;
+}

diff --git a/test/recorder_test.c b/test/recorder_test.c
index 05d1908..c516681 100644 (file)
--- a/test/recorder_test.c
+++ b/test/recorder_test.c
@@ -59,20 +59,14 @@ struct _appdata {
 };
 typedef struct _appdata appdata;
 
-struct appcore_ops ops = {
+static struct appcore_ops ops = {
        .create = app_create,
        .terminate = app_terminate,
 };
 
-appdata ad;
-GIOChannel *stdin_channel;
-int resolution_set;
-int g_current_state;
-int src_w, src_h;
-bool isMultishot;
-int  cam_info;
-int recorder_state;
-int multishot_num;
+static appdata ad;
+static GIOChannel *stdin_channel;
+static int recorder_state;
 static GTimer *timer = NULL;
 static int g_recorder_device_changed_cb_id;
 static int ve_frame_count = 0;