Enhance line coverage ratio

Change-Id: I5e01cfda2fa0e38519333a248fe8c17ea7426cee
Signed-off-by: sungwook79.park <sungwook79.park@samsung.com>

diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp
index 99fa9e7ad3c754ca9dc1c7ef79dae023d48b8756..6bb6765bfef3803311d0f5ae377cbb37ca8ae031 100644 (file)
--- a/src/inputmethod.cpp
+++ b/src/inputmethod.cpp
@@ -495,10 +495,7 @@ EXPORT_API int ime_run(ime_callback_s *basic_cb, void *user_data)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_basic_callback = *basic_cb;
 
@@ -537,10 +534,7 @@ EXPORT_API int ime_event_set_focus_in_cb(ime_focus_in_cb callback_func, void *us
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.focus_in = callback_func;
     g_event_callback.focus_in_user_data = user_data;
@@ -558,10 +552,7 @@ EXPORT_API int ime_event_set_focus_out_cb(ime_focus_out_cb callback_func, void *
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.focus_out = callback_func;
     g_event_callback.focus_out_user_data = user_data;
@@ -579,10 +570,7 @@ EXPORT_API int ime_event_set_surrounding_text_updated_cb(ime_surrounding_text_up
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.surrounding_text_updated = callback_func;
     g_event_callback.surrounding_text_updated_user_data = user_data;
@@ -600,10 +588,7 @@ EXPORT_API int ime_event_set_input_context_reset_cb(ime_input_context_reset_cb c
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.input_context_reset = callback_func;
     g_event_callback.input_context_reset_user_data = user_data;
@@ -621,10 +606,7 @@ EXPORT_API int ime_event_set_cursor_position_updated_cb(ime_cursor_position_upda
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.cursor_position_updated = callback_func;
     g_event_callback.cursor_position_updated_user_data = user_data;
@@ -642,10 +624,7 @@ EXPORT_API int ime_event_set_language_requested_cb(ime_language_requested_cb cal
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.language_requested = callback_func;
     g_event_callback.language_requested_user_data = user_data;
@@ -663,10 +642,7 @@ EXPORT_API int ime_event_set_language_set_cb(ime_language_set_cb callback_func,
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.language_set = callback_func;
     g_event_callback.language_set_user_data = user_data;
@@ -684,10 +660,7 @@ EXPORT_API int ime_event_set_imdata_set_cb(ime_imdata_set_cb callback_func, void
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.imdata_set = callback_func;
     g_event_callback.imdata_set_user_data = user_data;
@@ -705,10 +678,7 @@ EXPORT_API int ime_event_set_imdata_requested_cb(ime_imdata_requested_cb callbac
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.imdata_requested = callback_func;
     g_event_callback.imdata_requested_user_data = user_data;
@@ -726,10 +696,7 @@ EXPORT_API int ime_event_set_layout_set_cb(ime_layout_set_cb callback_func, void
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.layout_set = callback_func;
     g_event_callback.layout_set_user_data = user_data;
@@ -747,10 +714,7 @@ EXPORT_API int ime_event_set_return_key_type_set_cb(ime_return_key_type_set_cb c
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.return_key_type_set = callback_func;
     g_event_callback.return_key_type_set_user_data = user_data;
@@ -768,10 +732,7 @@ EXPORT_API int ime_event_set_return_key_state_set_cb(ime_return_key_state_set_cb
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.return_key_state_set = callback_func;
     g_event_callback.return_key_state_set_user_data = user_data;
@@ -789,10 +750,7 @@ EXPORT_API int ime_event_set_geometry_requested_cb(ime_geometry_requested_cb cal
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.geometry_requested = callback_func;
     g_event_callback.geometry_requested_user_data = user_data;
@@ -810,10 +768,7 @@ EXPORT_API int ime_event_set_process_key_event_cb(ime_process_key_event_cb callb
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.process_key_event = callback_func;
     g_event_callback.process_key_event_user_data = user_data;
@@ -831,10 +786,7 @@ EXPORT_API int ime_event_set_display_language_changed_cb(ime_display_language_ch
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.display_language_changed = callback_func;
     g_event_callback.display_language_changed_user_data = user_data;
@@ -852,10 +804,7 @@ EXPORT_API int ime_event_set_rotation_degree_changed_cb(ime_rotation_degree_chan
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.rotation_degree_changed = callback_func;
     g_event_callback.rotation_degree_changed_user_data = user_data;
@@ -873,10 +822,7 @@ EXPORT_API int ime_event_set_accessibility_state_changed_cb(ime_accessibility_st
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.accessibility_state_changed = callback_func;
     g_event_callback.accessibility_state_changed_user_data = user_data;
@@ -894,10 +840,7 @@ EXPORT_API int ime_event_set_option_window_created_cb(ime_option_window_created_
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.option_window_created = callback_func;
     g_event_callback.option_window_created_user_data = user_data;
@@ -915,10 +858,7 @@ EXPORT_API int ime_event_set_option_window_destroyed_cb(ime_option_window_destro
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.option_window_destroyed = callback_func;
     g_event_callback.option_window_destroyed_user_data = user_data;
@@ -936,10 +876,7 @@ EXPORT_API int ime_event_set_caps_mode_changed_cb(ime_caps_mode_changed_cb callb
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.caps_mode_changed = callback_func;
     g_event_callback.caps_mode_changed_user_data = user_data;
@@ -957,10 +894,7 @@ EXPORT_API int ime_event_set_candidate_show_cb(ime_candidate_show_cb callback_fu
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.candidate_show = callback_func;
     g_event_callback.candidate_show_user_data = user_data;
@@ -978,10 +912,7 @@ EXPORT_API int ime_event_set_candidate_hide_cb(ime_candidate_hide_cb callback_fu
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.candidate_hide = callback_func;
     g_event_callback.candidate_hide_user_data = user_data;
@@ -999,10 +930,7 @@ EXPORT_API int ime_event_set_lookup_table_changed_cb(ime_lookup_table_changed_cb
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.lookup_table_changed = callback_func;
     g_event_callback.lookup_table_changed_user_data = user_data;
@@ -1020,10 +948,7 @@ EXPORT_API int ime_send_key_event(ime_key_code_e keycode, ime_key_mask_e keymask
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     if (forward_key)
         g_core.forward_key_event(-1, NULL, (sclu32)keycode, (sclu16)keymask);
@@ -1048,10 +973,7 @@ EXPORT_API int ime_commit_string(const char *str)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.commit_string(-1, NULL, str);
 
@@ -1068,10 +990,7 @@ EXPORT_API int ime_show_preedit_string(void)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.show_preedit_string(-1, NULL);
 
@@ -1088,10 +1007,7 @@ EXPORT_API int ime_hide_preedit_string(void)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.hide_preedit_string(-1, NULL);
 
@@ -1113,10 +1029,7 @@ EXPORT_API int ime_update_preedit_string(const char *str, Eina_List *attrs)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     scim::AttributeList attrv;
     void *data = NULL;
@@ -1152,10 +1065,7 @@ EXPORT_API int ime_request_surrounding_text(int maxlen_before, int maxlen_after)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.get_surrounding_text(NULL, maxlen_before, maxlen_after);
 
@@ -1177,10 +1087,7 @@ EXPORT_API int ime_delete_surrounding_text(int offset, int len)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.delete_surrounding_text(offset, len);
 
@@ -1202,10 +1109,7 @@ EXPORT_API int ime_get_surrounding_text(int maxlen_before, int maxlen_after, cha
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     int cursor = 0;
 
@@ -1236,10 +1140,7 @@ EXPORT_API int ime_set_selection(int start, int end)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.set_selection(start, end);
 
@@ -1261,10 +1162,7 @@ EXPORT_API int ime_get_selected_text(char **text)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.get_selection_text(text);
 
@@ -1277,12 +1175,6 @@ EXPORT_API Evas_Object* ime_get_main_window(void)
 
     Evas_Object *win = NULL;
 
-    if (!g_running) {
-        set_last_result(IME_ERROR_NOT_RUNNING);
-        LOGW("IME_ERROR_NOT_RUNNING");
-        return NULL;
-    }
-
     retVal = _check_privilege();
     if (retVal != IME_ERROR_NONE) {
         LOGE("_check_privilege returned %d.", retVal);
@@ -1290,6 +1182,12 @@ EXPORT_API Evas_Object* ime_get_main_window(void)
         return NULL;
     }
 
+    if (!g_running) {
+        set_last_result(IME_ERROR_NOT_RUNNING);
+        LOGW("IME_ERROR_NOT_RUNNING");
+        return NULL;
+    }
+
     win = static_cast<Evas_Object*>(g_core.get_main_window());
     if (win) {
         set_last_result(IME_ERROR_NONE);
@@ -1318,10 +1216,7 @@ EXPORT_API int ime_set_size(int portrait_width, int portrait_height, int landsca
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     portrait_size.width = portrait_width;
     portrait_size.height = portrait_height;
@@ -1349,10 +1244,7 @@ EXPORT_API int ime_create_option_window(void)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     if (g_core.create_option_window()) {
         return IME_ERROR_NONE;
@@ -1382,10 +1274,7 @@ EXPORT_API int ime_destroy_option_window(Evas_Object *window)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.destroy_option_window(window);
 
@@ -1402,10 +1291,7 @@ EXPORT_API int ime_set_imengine(const char *engine_id)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.set_keyboard_ise_by_uuid(engine_id);
 
@@ -1422,10 +1308,7 @@ EXPORT_API int ime_flush_imengine()
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.flush_keyboard_ise();
 
@@ -1442,10 +1325,7 @@ EXPORT_API int ime_reset_imengine()
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.reset_keyboard_ise();
 
@@ -1462,10 +1342,7 @@ EXPORT_API int ime_update_input_context(unsigned int type, unsigned int value)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.update_input_context(type, value);
 
@@ -1482,10 +1359,7 @@ EXPORT_API int ime_request_hide()
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.request_ise_hide();
 
@@ -1497,10 +1371,7 @@ EXPORT_API int ime_initialize()
     ime_error_e retVal = IME_ERROR_NONE;
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.init();
 
@@ -1517,10 +1388,7 @@ EXPORT_API int ime_prepare()
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.prepare();
 
@@ -1534,10 +1402,7 @@ EXPORT_API int ime_finalize()
     ime_error_e retVal = IME_ERROR_NONE;
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.fini();
 
@@ -1554,10 +1419,7 @@ EXPORT_API int ime_select_candidate(unsigned int index)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.select_candidate(index);
 
@@ -1579,10 +1441,7 @@ EXPORT_API int ime_send_private_command(const char *command)
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_core.send_private_command(command);
 
@@ -1598,17 +1457,14 @@ EXPORT_API int ime_commit_content(const char *content, const char *description,
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     g_core.commit_content(content, description, mime_type);
 
     return IME_ERROR_NONE;
@@ -1623,17 +1479,14 @@ EXPORT_API int ime_context_get_layout(ime_context_h context, Ecore_IMF_Input_Pan
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *layout = context->layout;
 
     return IME_ERROR_NONE;
@@ -1648,17 +1501,14 @@ EXPORT_API int ime_context_get_layout_variation(ime_context_h context, ime_layou
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *layout_variation = static_cast<ime_layout_variation_e>(context->layout_variation);
 
     return IME_ERROR_NONE;
@@ -1673,17 +1523,14 @@ EXPORT_API int ime_context_get_cursor_position(ime_context_h context, int *curso
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *cursor_pos = context->cursor_pos;
 
     return IME_ERROR_NONE;
@@ -1698,17 +1545,14 @@ EXPORT_API int ime_context_get_autocapital_type(ime_context_h context, Ecore_IMF
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *autocapital_type = context->autocapital_type;
 
     return IME_ERROR_NONE;
@@ -1723,17 +1567,14 @@ EXPORT_API int ime_context_get_return_key_type(ime_context_h context, Ecore_IMF_
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *return_key_type = context->return_key_type;
 
     return IME_ERROR_NONE;
@@ -1748,17 +1589,14 @@ EXPORT_API int ime_context_get_return_key_state(ime_context_h context, bool *ret
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *return_key_state = static_cast<bool>(context->return_key_disabled);
 
     return IME_ERROR_NONE;
@@ -1773,17 +1611,14 @@ EXPORT_API int ime_context_get_prediction_mode(ime_context_h context, bool *pred
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *prediction_mode = static_cast<bool>(context->prediction_allow);
 
     return IME_ERROR_NONE;
@@ -1798,17 +1633,14 @@ EXPORT_API int ime_context_get_password_mode(ime_context_h context, bool *passwo
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *password_mode = static_cast<bool>(context->password_mode);
 
     return IME_ERROR_NONE;
@@ -1823,17 +1655,14 @@ EXPORT_API int ime_context_get_input_hint(ime_context_h context, Ecore_IMF_Input
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *input_hint = context->input_hint;
 
     return IME_ERROR_NONE;
@@ -1848,17 +1677,14 @@ EXPORT_API int ime_context_get_bidi_direction(ime_context_h context, Ecore_IMF_B
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *bidi = context->bidi_direction;
 
     return IME_ERROR_NONE;
@@ -1873,17 +1699,14 @@ EXPORT_API int ime_context_get_language(ime_context_h context, Ecore_IMF_Input_P
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *language = context->language;
 
     return IME_ERROR_NONE;
@@ -1898,17 +1721,14 @@ EXPORT_API int ime_context_get_caps_mode(ime_context_h context, bool *caps_mode)
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *caps_mode = static_cast<bool>(context->caps_mode);
 
     return IME_ERROR_NONE;
@@ -1923,17 +1743,14 @@ EXPORT_API int ime_device_info_get_name(ime_device_info_h dev_info, char **dev_n
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     if (!dev_info->dev_name)
         *dev_name = strdup("");
     else
@@ -1951,17 +1768,14 @@ EXPORT_API int ime_device_info_get_class(ime_device_info_h dev_info, Ecore_IMF_D
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *dev_class = dev_info->dev_class;
 
     return IME_ERROR_NONE;
@@ -1976,17 +1790,14 @@ EXPORT_API int ime_device_info_get_subclass(ime_device_info_h dev_info, Ecore_IM
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     *dev_subclass = dev_info->dev_subclass;
 
     return IME_ERROR_NONE;
@@ -2002,10 +1813,7 @@ EXPORT_API int ime_event_set_process_input_device_event_cb(ime_process_input_dev
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.process_input_device_event = callback_func;
     g_event_callback.process_input_device_event_user_data = user_data;
@@ -2018,10 +1826,7 @@ EXPORT_API int ime_event_unset_process_input_device_event_cb(void)
     ime_error_e retVal = IME_ERROR_NONE;
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.process_input_device_event = NULL;
     g_event_callback.process_input_device_event_user_data = NULL;
@@ -2045,17 +1850,14 @@ EXPORT_API int ime_input_device_rotary_get_direction(ime_input_device_event_h ev
         return IME_ERROR_INVALID_PARAMETER;
     }
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_OPERATION_FAILED");
         return IME_ERROR_OPERATION_FAILED;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     Ecore_Event_Detent_Rotate *rotary_device_event =
         static_cast<Ecore_Event_Detent_Rotate*>(device_event->event_data);
     if (rotary_device_event) {
@@ -2079,10 +1881,7 @@ EXPORT_API int ime_event_set_prediction_hint_set_cb(ime_prediction_hint_set_cb c
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.prediction_hint_set = callback_func;
     g_event_callback.prediction_hint_set_user_data = user_data;
@@ -2100,10 +1899,7 @@ EXPORT_API int ime_event_set_mime_type_set_request_cb(ime_mime_type_set_request_
     }
 
     retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
+    if (retVal != IME_ERROR_NONE) return retVal;
 
     g_event_callback.mime_type_set = callback_func;
     g_event_callback.mime_type_set_user_data = user_data;
@@ -2115,17 +1911,14 @@ EXPORT_API int ime_set_floating_mode(bool floating_mode)
 {
     ime_error_e retVal = IME_ERROR_NONE;
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     g_core.set_floating_mode(floating_mode);
 
     return IME_ERROR_NONE;
@@ -2135,17 +1928,14 @@ EXPORT_API int ime_set_floating_drag_start(void)
 {
     ime_error_e retVal = IME_ERROR_NONE;
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     g_core.set_floating_drag_enabled(true);
 
     return IME_ERROR_NONE;
@@ -2155,17 +1945,14 @@ EXPORT_API int ime_set_floating_drag_end(void)
 {
     ime_error_e retVal = IME_ERROR_NONE;
 
+    retVal = _check_privilege();
+    if (retVal != IME_ERROR_NONE) return retVal;
+
     if (!g_running) {
         LOGW("IME_ERROR_NOT_RUNNING");
         return IME_ERROR_NOT_RUNNING;
     }
 
-    retVal = _check_privilege();
-    if (retVal != IME_ERROR_NONE) {
-        LOGE("_check_privilege returned %d.", retVal);
-        return retVal;
-    }
-
     g_core.set_floating_drag_enabled(false);
 
     return IME_ERROR_NONE;