Remove unnecessary logs

[platform/core/uifw/voice-control.git] / client / vc_setting.c

diff --git a/client/vc_setting.c b/client/vc_setting.c
index 5f26cbe..aabd0b8 100644 (file)
--- a/client/vc_setting.c
+++ b/client/vc_setting.c
@@ -87,23 +87,17 @@ int vc_setting_initialize(void)
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Initialize VC Setting");
 
-       if (VC_SETTING_STATE_READY == g_state) {
-               SLOG(LOG_WARN, TAG_VCS, "[WARNING] VC Setting has already been initialized.");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_NONE;
-       }
+       RETVM_IF(VC_SETTING_STATE_READY == g_state, VC_ERROR_NONE, TAG_VCS, "[WARNING] VC Setting has already been initialized.");
 
        int ret = vc_config_mgr_initialize(getpid() + VC_SETTING_CONFIG_HANDLE);
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Fail to initialize config manager");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
                return VC_ERROR_OPERATION_FAILED;
        }
 
        ret = vc_config_mgr_set_lang_cb(getpid() + VC_SETTING_CONFIG_HANDLE, __config_lang_changed_cb);
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Fail to initialize config manager");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
                vc_config_mgr_finalize(getpid() + VC_SETTING_CONFIG_HANDLE);
                return VC_ERROR_OPERATION_FAILED;
        }
@@ -113,7 +107,7 @@ int vc_setting_initialize(void)
 
        g_state = VC_SETTING_STATE_READY;
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Initialize VC Setting DONE");
 
        return VC_ERROR_NONE;
 }
@@ -122,11 +116,7 @@ int vc_setting_deinitialize()
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Deinitialize VC Setting");
 
-       if (VC_SETTING_STATE_READY != g_state) {
-               SLOG(LOG_WARN, TAG_VCS, "[WARNING] VC Setting is not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_READY != g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[WARNING] VC Setting is not initialized");
 
        vc_config_mgr_unset_lang_cb(getpid() + VC_SETTING_CONFIG_HANDLE);
        vc_config_mgr_unset_engine_cb(getpid() + VC_SETTING_CONFIG_HANDLE);
@@ -134,7 +124,7 @@ int vc_setting_deinitialize()
 
        g_state = VC_SETTING_STATE_NONE;
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Deinitialize VC Setting DONE");
 
        return VC_ERROR_NONE;
 }
@@ -148,19 +138,9 @@ int vc_setting_foreach_supported_engines(vc_setting_supported_engine_cb callback
 {
        SLOG(LOG_DEBUG, TAG_VCS, "===== Foreach supported engines");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "=====");
-               SLOG(LOG_DEBUG, TAG_VCS, " ");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == callback) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Callback is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "=====");
-               SLOG(LOG_DEBUG, TAG_VCS, " ");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter");
 
        SLOG(LOG_DEBUG, TAG_VCS, "===== Foreach supported engines 11");
        g_engine_cb = callback;
@@ -173,8 +153,6 @@ int vc_setting_foreach_supported_engines(vc_setting_supported_engine_cb callback
                SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Foreach supported engines");
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "=====");
-       SLOG(LOG_DEBUG, TAG_VCS, " ");
 
        return ret;
 }
@@ -183,19 +161,9 @@ int vc_setting_get_engine(char** engine_id)
 {
        SLOG(LOG_DEBUG, TAG_VCS, "===== Get current engine");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "=====");
-               SLOG(LOG_DEBUG, TAG_VCS, " ");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == engine_id) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Engine id is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "=====");
-               SLOG(LOG_DEBUG, TAG_VCS, " ");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == engine_id, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Engine id is NULL");
 
        int ret = vc_config_mgr_get_engine(engine_id);
        if (0 != ret) {
@@ -204,8 +172,6 @@ int vc_setting_get_engine(char** engine_id)
                SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get current engine");
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "=====");
-       SLOG(LOG_DEBUG, TAG_VCS, " ");
 
        return ret;
 }
@@ -214,19 +180,9 @@ int vc_setting_set_engine(const char* engine_appid)
 {
        SLOG(LOG_DEBUG, TAG_VCS, "===== Set current engine");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "=====");
-               SLOG(LOG_DEBUG, TAG_VCS, " ");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == engine_appid) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Engine appid is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "=====");
-               SLOG(LOG_DEBUG, TAG_VCS, " ");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == engine_appid, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Engine appid is NULL");
 
        SECURE_SLOG(LOG_DEBUG, TAG_VCS, "New engine appid : %s", engine_appid);
 
@@ -237,8 +193,6 @@ int vc_setting_set_engine(const char* engine_appid)
                SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Set current engine");
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "=====");
-       SLOG(LOG_DEBUG, TAG_VCS, " ");
 
        return ret;
 }
@@ -247,17 +201,9 @@ int vc_setting_foreach_supported_languages(vc_setting_supported_language_cb call
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Foreach supported languages");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == callback) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter");
 
        int ret = vc_config_mgr_get_language_list((vc_supported_language_cb)callback, user_data);
        if (0 != ret) {
@@ -266,7 +212,7 @@ int vc_setting_foreach_supported_languages(vc_setting_supported_language_cb call
                SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Foreach supported languages");
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Foreach supported languages DONE");
 
        return ret;
 }
@@ -275,17 +221,9 @@ int vc_setting_get_language(char** language)
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get default language");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == language) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Input parameter is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == language, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter");
 
        int ret = vc_config_mgr_get_default_language(language);
        if (0 != ret) {
@@ -294,7 +232,7 @@ int vc_setting_get_language(char** language)
                SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get default language");
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get default language DONE");
 
        return ret;
 }
@@ -303,17 +241,9 @@ int vc_setting_set_language(const char* language)
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set default language");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == language) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Input parameter is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == language, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter");
 
        int ret = vc_config_mgr_set_default_language(language);
        if (0 != ret) {
@@ -338,7 +268,7 @@ int vc_setting_set_language(const char* language)
                }
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set default language DONE");
 
        return ret;
 }
@@ -347,15 +277,10 @@ int vc_setting_set_auto_language(bool value)
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set auto voice");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
        if (value != true && value != false) {
                SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Invalid value");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
                return VC_ERROR_INVALID_PARAMETER;
        }
 
@@ -366,7 +291,7 @@ int vc_setting_set_auto_language(bool value)
                SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Set auto language (%s)", value ? "on" : "off");
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set auto voice DONE");
 
        return ret;
 }
@@ -375,17 +300,9 @@ int vc_setting_get_auto_language(bool* value)
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get auto language");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == value) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == value, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter");
 
        int ret = vc_config_mgr_get_auto_language(value);
        if (0 != ret) {
@@ -394,7 +311,7 @@ int vc_setting_get_auto_language(bool* value)
                SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get auto language (%s)", *value ? "true" : "false");
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get auto language DONE");
 
        return VC_ERROR_NONE;
 }
@@ -403,15 +320,10 @@ int vc_setting_set_enabled(bool value)
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set service enabled");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
        if (value != true && value != false) {
                SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Invalid value");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
                return VC_ERROR_INVALID_PARAMETER;
        }
 
@@ -422,7 +334,7 @@ int vc_setting_set_enabled(bool value)
                SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Set service enabled (%s)", value ? "on" : "off");
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set service enabled DONE");
 
        return ret;
 }
@@ -431,17 +343,9 @@ int vc_setting_get_enabled(bool* value)
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get service enabled");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == value) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == value, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter");
 
        int ret = vc_config_mgr_get_enabled(value);
        if (0 != ret) {
@@ -451,7 +355,7 @@ int vc_setting_get_enabled(bool* value)
                SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get service enabled (%s)", *value ? "on" : "off");
        }
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get service enabled DONE");
 
        return ret;
 }
@@ -460,22 +364,14 @@ int vc_setting_set_enabled_changed_cb(vc_setting_enabled_changed_cb callback, vo
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set service enabled callback");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == callback) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter");
 
        g_enabled_changed_cb = callback;
        g_enabled_changed_user_data = user_data;
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set service enabled callback DONE");
 
        return VC_ERROR_NONE;
 }
@@ -484,16 +380,12 @@ int vc_setting_unset_enabled_changed_cb()
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset service enabled callback");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
        g_enabled_changed_cb = NULL;
        g_enabled_changed_user_data = NULL;
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset service enabled callback DONE");
 
        return VC_ERROR_NONE;
 }
@@ -502,22 +394,14 @@ int vc_setting_set_current_language_changed_cb(vc_setting_current_language_chang
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set current language changed callback");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
-       if (NULL == callback) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter");
 
        g_current_language_changed_cb = callback;
        g_current_language_changed_user_data = user_data;
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set current language changed callback DONE");
 
        return VC_ERROR_NONE;
 }
@@ -526,16 +410,12 @@ int vc_setting_unset_current_language_changed_cb()
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset current language changed callback");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
        g_current_language_changed_cb = NULL;
        g_current_language_changed_user_data = NULL;
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset current language changed callback");
 
        return VC_ERROR_NONE;
 }
@@ -544,15 +424,12 @@ int vc_setting_set_engine_changed_cb(vc_setting_engine_changed_cb callback, void
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set engine changed callback");
 
-       if (NULL == callback) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Input param is NULL");
-               return VC_ERROR_INVALID_PARAMETER;
-       }
+       RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter");
 
        g_engine_changed_cb = callback;
        g_engine_changed_user_data = user_data;
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set engine changed callback DONE");
        return VC_ERROR_NONE;
 }
 
@@ -560,15 +437,11 @@ int vc_setting_unset_engine_changed_cb()
 {
        SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset engine changed callback");
 
-       if (VC_SETTING_STATE_NONE == g_state) {
-               SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized");
-               SLOG(LOG_DEBUG, TAG_VCS, "@@@");
-               return VC_ERROR_INVALID_STATE;
-       }
+       RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized");
 
        g_engine_changed_cb = NULL;
        g_engine_changed_user_data = NULL;
 
-       SLOG(LOG_DEBUG, TAG_VCS, "@@@");
+       SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset engine changed callback DONE");
        return VC_ERROR_NONE;
 }