e_keyrouter: use the macro at e_log.h

remove the macro in e_keyrouter_intern.h for removing the
duplicated code.

Change-Id: I16babc8c02ee29fd7656a693d39dc1907a13955f

diff --git a/src/bin/inputmgr/e_keyrouter.c b/src/bin/inputmgr/e_keyrouter.c
index 1114eee660e2ef6ea371ee4bf1cd962dba56f54d..dc6e47d730213e4492f712534847622b55e902f9 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter.c
+++ b/src/bin/inputmgr/e_keyrouter.c
@@ -141,7 +141,7 @@ _e_keyrouter_info_print(void *data, const char *log_path)
    log_fl = fopen(log_path, "a");
    if (!log_fl)
      {
-        KLERR("failed: open file(%s)", log_path);
+        ERR("failed: open file(%s)", log_path);
         return;
      }
 
@@ -183,7 +183,7 @@ _e_keyrouter_input_thread_keygrab_print(void *data)
    log_fl = fopen(log_path, "a");
    if (!log_fl)
      {
-        KLERR("failed: open file(%s)", log_path);
+        ERR("failed: open file(%s)", log_path);
         return;
      }
 
@@ -324,11 +324,11 @@ _e_keyrouter_query_tizen_key_table(void)
 
         if (data->keycode < 0 || data->keycode > krt->max_tizen_hwkeys)
           {
-             KLWRN("Given keycode(%d) is invalid.", data->keycode);
+             WRN("Given keycode(%d) is invalid.", data->keycode);
              continue;
           }
 
-        KLINF("(keycode:%d,%s)(no_priv:%d)(repeat:%d)",
+        INF("(keycode:%d,%s)(no_priv:%d)(repeat:%d)",
               data->keycode, data->name, data->no_privcheck, data->repeat);
 
         e_keyrouter_hardkeys_keycode_set(krt->HardKeys, data->keycode, eina_stringshare_add(data->name),
@@ -344,13 +344,13 @@ _e_keyrouter_query_tizen_key_table(void)
 
    if (e_comp_wl_input_keymap_cache_file_use_get() == EINA_FALSE)
      {
-        KLINF("Server create a new cache file: %s", e_comp_wl_input_keymap_path_get(names));
+        INF("Server create a new cache file: %s", e_comp_wl_input_keymap_path_get(names));
         unlink(e_comp_wl_input_keymap_path_get(names));
 
         e_comp_wl_input_keymap_default_set();
      }
    else
-     KLINF("Currently cache file is exist. Do not change it.");
+     INF("Currently cache file is exist. Do not change it.");
 
    return EINA_TRUE;
 }

diff --git a/src/bin/inputmgr/e_keyrouter_event.c b/src/bin/inputmgr/e_keyrouter_event.c
index 358cd0e9c3b730dc039e666ad5dd1468a9b35bff..26c3ac72dddfd92272a83ad90118754a2a4ba818 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_event.c
+++ b/src/bin/inputmgr/e_keyrouter_event.c
@@ -74,7 +74,7 @@ _e_keyrouter_log_key_event(int type, const char *mode_str,
     char *pname = e_keyrouter_util_process_name_get_from_cmd(cmd);
     char *keyname = e_comp_wl_input_keymap_keycode_to_keyname(keycode);
 
-    KLINF("%s: %s(%s:%d)(F:%d,S:%d) => wl_surface(%p) wl_client(%p) (pid:%d) (pname:%s)",
+    INF("%s: %s(%s:%d)(F:%d,S:%d) => wl_surface(%p) wl_client(%p) (pid:%d) (pname:%s)",
           mode_str,
           _e_keyrouter_event_type_to_string(type),
           keyname ?: "Unknown",
@@ -99,7 +99,7 @@ _e_keyrouter_event_routed_key_check(Ecore_Event_Key *ev, int type)
 
    if ((ev->modifiers != 0) && (type == ECORE_EVENT_KEY_DOWN))
      {
-        KLDBG("Modifier key delivered to Focus window : Key %s(%d)",
+        DBG("Modifier key delivered to Focus window : Key %s(%d)",
               ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode);
 
         keycode_data = E_NEW(int, 1);
@@ -116,7 +116,7 @@ _e_keyrouter_event_routed_key_check(Ecore_Event_Key *ev, int type)
      {
         if (*keycode_data == ev->keycode)
           {
-             KLDBG("Find ignore key, propagate event (%d)\n", ev->keycode);
+             DBG("Find ignore key, propagate event (%d)\n", ev->keycode);
              E_FREE(keycode_data);
              krt->ignore_list = eina_list_remove_list(krt->ignore_list, l);
 
@@ -126,7 +126,7 @@ _e_keyrouter_event_routed_key_check(Ecore_Event_Key *ev, int type)
 
    if (krt->max_tizen_hwkeys < ev->keycode)
      {
-        KLWRN("The key(%d) is too larger to process keyrouting: Invalid keycode",
+        WRN("The key(%d) is too larger to process keyrouting: Invalid keycode",
               ev->keycode);
 
         return EINA_FALSE;
@@ -151,7 +151,7 @@ _e_keyrouter_event_process(void *event, E_Device *dev, int type)
    Ecore_Event_Key *ev = event;
    E_Keyrouter_Event_Data *key_data;
 
-   KLDBG("[%s] keyname: %s, key: %s, keycode: %d",
+   DBG("[%s] keyname: %s, key: %s, keycode: %d",
          (type == ECORE_EVENT_KEY_DOWN) ? "KEY_PRESS" : "KEY_RELEASE",
          ev->keyname, ev->key, ev->keycode);
 
@@ -160,7 +160,7 @@ _e_keyrouter_event_process(void *event, E_Device *dev, int type)
    key_data = (E_Keyrouter_Event_Data *)ev->data;
    if (!key_data)
      {
-        KLWRN("%s key (%d) %s is not handled by keyrouter\n",
+        WRN("%s key (%d) %s is not handled by keyrouter\n",
         ev->keyname, ev->keycode,
         (type == ECORE_EVENT_KEY_DOWN) ? "press" : "release");
 
@@ -190,7 +190,7 @@ _e_keyrouter_event_process(void *event, E_Device *dev, int type)
          goto finish;
       }
 
-   KLDBG("[%s] keyname: %s, key: %s, keycode: %d",
+   DBG("[%s] keyname: %s, key: %s, keycode: %d",
          (type == ECORE_EVENT_KEY_DOWN) ? "KEY_PRESS" : "KEY_RELEASE",
          ev->keyname, ev->key, ev->keycode);
 
@@ -501,7 +501,7 @@ need_shared:
              ret = e_keyrouter_wl_add_surface_destroy_listener(delivered_surface);
              if (ret != TIZEN_KEYROUTER_ERROR_NONE)
                {
-                  KLWRN("Failed to add wl_surface to destroy listener (res: %d)", res);
+                  WRN("Failed to add wl_surface to destroy listener (res: %d)", res);
                }
           }
         if (res)
@@ -615,7 +615,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx)
           {
              if (ec_top == ec_focus)
                {
-                  KLDBG("Top e_client (%p) is invisible(%d) but focus client", ec_top, ec_top->visible);
+                  DBG("Top e_client (%p) is invisible(%d) but focus client", ec_top, ec_top->visible);
                   return EINA_FALSE;
                }
              ec_top = e_client_below_get(ec_top);
@@ -633,7 +633,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx)
                     {
                        top_ptr_list = eina_list_promote_list(top_ptr_list, l);
                        e_keyrouter_hardkeys_list_set(krt->HardKeys, arr_idx, TIZEN_KEYROUTER_MODE_TOPMOST, top_ptr_list);
-                       KLDBG("Move a client(e_client: %p, wl_surface: %p) to first index of list(key: %d)",
+                       DBG("Move a client(e_client: %p, wl_surface: %p) to first index of list(key: %d)",
                                 ec_top, key_node_data->surface, arr_idx);
                        g_rec_mutex_unlock(&krt->grab_key_mutex);
                        return EINA_TRUE;
@@ -645,7 +645,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx)
 
         if (ec_top == ec_focus)
           {
-             KLDBG("The e_client(%p) is a focus client", ec_top);
+             DBG("The e_client(%p) is a focus client", ec_top);
              return EINA_FALSE;
           }
 
@@ -666,7 +666,7 @@ _e_keyrouter_send_key_event(int type, struct wl_resource *surface, struct wl_cli
 
    if (!wc_send)
      {
-        KLWRN("wl_surface: %p or wl_client: %p returns null wayland client", surface, wc);
+        WRN("wl_surface: %p or wl_client: %p returns null wayland client", surface, wc);
         return;
      }
 
@@ -735,7 +735,7 @@ _e_keyrouter_client_cb_stack(void *data, int type, void *event)
    (void) ev;
    (void) ec;
 
-   //KLDBG("ec: %p, visible: %d, focused: %d, take_focus: %d, want_focus: %d, bordername: %s, input_only: %d",
+   //DBG("ec: %p, visible: %d, focused: %d, take_focus: %d, want_focus: %d, bordername: %s, input_only: %d",
    //        ec, ec->visible, ec->focused, ec->take_focus, ec->want_focus, ec->bordername, ec->input_only);
 
    krt->isWindowStackChanged = EINA_TRUE;
@@ -814,7 +814,7 @@ e_keyrouter_event_handler_add(void)
    E_Input_Event_Source *input_event_source = e_input_event_source_get();
    if (!input_event_source)
       {
-         KLERR("Failed to get input_event_source");
+         ERR("Failed to get input_event_source");
          return;
       }
 

diff --git a/src/bin/inputmgr/e_keyrouter_hardkeys.c b/src/bin/inputmgr/e_keyrouter_hardkeys.c
index 655348540b7c6788fa846350740e8c2ebab4a290..c5a999a22b2e03a2b2c087de62a43bb532d4c013 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_hardkeys.c
+++ b/src/bin/inputmgr/e_keyrouter_hardkeys.c
@@ -156,7 +156,7 @@ e_keyrouter_hardkeys_remove_keynode_with_surface(E_Keyrouter_Grabbed_Key *hardke
              E_FREE(keynode);
           }
 
-        KLDBG("Remove %s Mode Grabbed key(%d) by surface(%p)",
+        DBG("Remove %s Mode Grabbed key(%d) by surface(%p)",
               e_keyrouter_util_mode_to_string(mode), keycode, surface);
      }
    e_keyrouter_hardkeys_list_set(hardkeys, keycode, mode, hardkey_list);
@@ -189,7 +189,7 @@ e_keyrouter_hardkeys_remove_keynode_with_client(E_Keyrouter_Grabbed_Key *hardkey
              E_FREE(keynode);
           }
 
-        KLDBG("Remove %s Mode Grabbed key(%d) by client(%p)",
+        DBG("Remove %s Mode Grabbed key(%d) by client(%p)",
               e_keyrouter_util_mode_to_string(mode), keycode, client);
      }
    e_keyrouter_hardkeys_list_set(hardkeys, keycode, mode, hardkey_list);

diff --git a/src/bin/inputmgr/e_keyrouter_intern.h b/src/bin/inputmgr/e_keyrouter_intern.h
index 72d05eb245f86e23ba1fcd8ed9ea2dd5d7e871e5..1823e982956d131b79da67fac2f650fde9379217 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_intern.h
+++ b/src/bin/inputmgr/e_keyrouter_intern.h
@@ -6,11 +6,6 @@
 #include "e_input_event_intern.h"
 #include "e_keyrouter_conf_intern.h"
 
-#define KLERR(msg, ARG...) ERR(msg, ##ARG)
-#define KLWRN(msg, ARG...) WRN(msg, ##ARG)
-#define KLINF(msg, ARG...) INF(msg, ##ARG)
-#define KLDBG(msg, ARG...) DBG(msg, ##ARG)
-
 #define TIZEN_KEYROUTER_MODE_PRESSED        TIZEN_KEYROUTER_MODE_REGISTERED+1
 #define TIZEN_KEYROUTER_MODE_PICTURE_OFF        TIZEN_KEYROUTER_MODE_REGISTERED+2
 

diff --git a/src/bin/inputmgr/e_keyrouter_list.c b/src/bin/inputmgr/e_keyrouter_list.c
index 3d1d95c7bf99e5fd30ae39d47aab2e4b3f8fd298..44535083bcf93f819052d36560e3d9ae55e53719 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_list.c
+++ b/src/bin/inputmgr/e_keyrouter_list.c
@@ -36,10 +36,10 @@ _e_keyrouter_find_duplicated_grabbed_key(struct wl_resource *surface, struct wl_
      }
 
    if (surface)
-     KLDBG("The key(%d) is already grabbed same mode(%s) on the same wl_surface %p",
+     DBG("The key(%d) is already grabbed same mode(%s) on the same wl_surface %p",
            key, e_keyrouter_util_mode_to_string(mode), surface);
    else
-     KLDBG("The key(%d) is already grabbed same mode(%s) on the same wl_client %p",
+     DBG("The key(%d) is already grabbed same mode(%s) on the same wl_client %p",
            key, e_keyrouter_util_mode_to_string(mode), wc);
 
    g_rec_mutex_unlock(&krt->grab_key_mutex);
@@ -60,7 +60,7 @@ e_keyrouter_keygrab_prepend_to_keylist(struct wl_resource *surface, struct wl_cl
 
    if (!new_keyptr)
      {
-        KLERR("Failled to allocate memory for new_keyptr");
+        ERR("Failled to allocate memory for new_keyptr");
         return TIZEN_KEYROUTER_ERROR_NO_SYSTEM_RESOURCES;
      }
 
@@ -160,10 +160,10 @@ e_keyrouter_keygrab_find_mode_with_surface(struct wl_resource *surface, uint32_t
      mode = NONE;
 
    if (mode != NONE)
-     KLDBG("Find %d key grabbed by (wl_surface: %p) in %s mode",
+     DBG("Find %d key grabbed by (wl_surface: %p) in %s mode",
            key, surface, e_keyrouter_util_mode_to_string(_modes[mode]));
    else
-     KLDBG("%d key is not grabbed by (wl_surface: %p)", key, surface);
+     DBG("%d key is not grabbed by (wl_surface: %p)", key, surface);
 
    return _modes[mode];
 }
@@ -185,10 +185,10 @@ e_keyrouter_keygrab_find_mode_with_client(struct wl_client *client, uint32_t key
      mode = NONE;
 
    if (mode != NONE)
-     KLDBG("Find %d key grabbed by (wl_client: %p) in %s mode",
+     DBG("Find %d key grabbed by (wl_client: %p) in %s mode",
            key, client, e_keyrouter_util_mode_to_string(_modes[mode]));
    else
-     KLDBG("%d key is not grabbed by (wl_client: %p)", key, client);
+     DBG("%d key is not grabbed by (wl_client: %p)", key, client);
 
    return _modes[mode];
 }
@@ -202,7 +202,7 @@ e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, i
 #ifdef HAVE_CYNARA
    if (EINA_FALSE == e_keyrouter_wl_util_do_privilege_check(client, mode, key))
      {
-        KLINF("No permission for %d grab mode ! (key=%d)", mode, key);
+        INF("No permission for %d grab mode ! (key=%d)", mode, key);
         return TIZEN_KEYROUTER_ERROR_NO_PERMISSION;
      }
 #endif
@@ -212,7 +212,7 @@ e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, i
         /* Regarding topmost mode, a client must request to grab a key with a valid surface. */
         if (mode == TIZEN_KEYROUTER_MODE_TOPMOST)
           {
-             KLWRN("Invalid surface for %d grab mode ! (key=%d)", mode, key);
+             WRN("Invalid surface for %d grab mode ! (key=%d)", mode, key);
 
              return TIZEN_KEYROUTER_ERROR_INVALID_SURFACE;
           }
@@ -221,7 +221,7 @@ e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, i
    /* Check the given key range */
    if (krt->max_tizen_hwkeys < key)
      {
-        KLWRN("Invalid range of key ! (keycode:%d) maximum value(%d)", key, krt->max_tizen_hwkeys);
+        WRN("Invalid range of key ! (keycode:%d) maximum value(%d)", key, krt->max_tizen_hwkeys);
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;
      }
 
@@ -229,7 +229,7 @@ e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, i
     * Only key listed in Tizen key layout file can be grabbed. */
    if (!e_keyrouter_hardkeys_keycode_available(krt->HardKeys, key))
      {
-        KLWRN("Invalid key ! Disabled to set keygrab ! (keycode:%d)", key);
+        WRN("Invalid key ! Disabled to set keygrab ! (keycode:%d)", key);
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;
      }
 
@@ -263,7 +263,7 @@ e_keyrouter_keygrab_unset(struct wl_client *client, struct wl_resource *surface,
    /* Check the given key range */
    if (krt->max_tizen_hwkeys < key)
      {
-        KLWRN("Invalid range of key ! (keycode:%d) maximum value(%d)", key, krt->max_tizen_hwkeys);
+        WRN("Invalid range of key ! (keycode:%d) maximum value(%d)", key, krt->max_tizen_hwkeys);
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;
      }
 
@@ -273,7 +273,7 @@ e_keyrouter_keygrab_unset(struct wl_client *client, struct wl_resource *surface,
     * Only key listed in Tizen key layout file can be unset. */
    if (!e_keyrouter_hardkeys_keycode_available(krt->HardKeys, key))
      {
-        KLWRN("Invalid key ! Disabled to unset keygrab! (keycode:%d)", key);
+        WRN("Invalid key ! Disabled to unset keygrab! (keycode:%d)", key);
         g_rec_mutex_unlock(&krt->grab_key_mutex);
 
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;

diff --git a/src/bin/server/e_keyrouter_wl.c b/src/bin/server/e_keyrouter_wl.c
index 269becb94df5550b00a7326b18bbe1961ee2ca5e..ad5257adb02f10dffef216509c9861bd866e9293 100644 (file)
--- a/src/bin/server/e_keyrouter_wl.c
+++ b/src/bin/server/e_keyrouter_wl.c
@@ -303,11 +303,11 @@ _e_keyrouter_cb_keygrab_set(struct wl_client *client, struct wl_resource *resour
 
    if (res == TIZEN_KEYROUTER_ERROR_NONE)
      {
-        KLDBG("Success to %d key %s grab request (wl_client: %p, wl_surface: %p, pid: %d)", key, e_keyrouter_util_mode_to_string(mode),
+        DBG("Success to %d key %s grab request (wl_client: %p, wl_surface: %p, pid: %d)", key, e_keyrouter_util_mode_to_string(mode),
               client, surface, e_keyrouter_util_get_pid(client, surface));
      }
    else
-     KLWRN("Failed to %d key %s grab request (wl_client: %p, wl_surface: %p, pid: %d): res: %d", key, e_keyrouter_util_mode_to_string(mode),
+     WRN("Failed to %d key %s grab request (wl_client: %p, wl_surface: %p, pid: %d): res: %d", key, e_keyrouter_util_mode_to_string(mode),
         client, surface, e_keyrouter_util_get_pid(client, surface), res);
 
    tizen_keyrouter_send_keygrab_notify(resource, surface, key, mode, res);
@@ -326,10 +326,10 @@ _e_keyrouter_cb_keygrab_unset(struct wl_client *client, struct wl_resource *reso
    TRACE_INPUT_END();
 
    if (res == TIZEN_KEYROUTER_ERROR_NONE)
-     KLDBG("Success to %d key ungrab request (wl_client: %p, wl_surface: %p, pid: %d)", key, client, surface,
+     DBG("Success to %d key ungrab request (wl_client: %p, wl_surface: %p, pid: %d)", key, client, surface,
            e_keyrouter_util_get_pid(client, surface));
    else
-     KLWRN("Failed to %d key ungrab request (wl_client: %p, wl_surface: %p, pid: %d): res: %d", key, client, surface,
+     WRN("Failed to %d key ungrab request (wl_client: %p, wl_surface: %p, pid: %d): res: %d", key, client, surface,
            e_keyrouter_util_get_pid(client, surface), res);
 
    tizen_keyrouter_send_keygrab_notify(resource, surface, key, TIZEN_KEYROUTER_MODE_NONE, res);
@@ -368,7 +368,7 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r
    if (0 != (array_len % 3))
      {
         /* FIX ME: Which way is effectively to notify invalid pair to client */
-        KLWRN("Invalid keycode and grab mode pair. Check arguments in a list");
+        WRN("Invalid keycode and grab mode pair. Check arguments in a list");
         TRACE_INPUT_END();
         tizen_keyrouter_send_keygrab_notify_list(resource, surface, NULL);
         return;
@@ -379,11 +379,11 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r
         res = e_keyrouter_keygrab_set(client, surface, grab_request->key, grab_request->mode);
         grab_request->err = res;
         if (res == TIZEN_KEYROUTER_ERROR_NONE)
-          KLDBG("Success to %d key %s grab using list(wl_client: %p, wl_surface: %p, pid: %d)",
+          DBG("Success to %d key %s grab using list(wl_client: %p, wl_surface: %p, pid: %d)",
                 grab_request->key, e_keyrouter_util_mode_to_string(grab_request->mode),
                 client, surface, e_keyrouter_util_get_pid(client, surface));
         else
-          KLWRN("Failed to %d key %s grab using list(wl_client: %p, wl_surface: %p, pid: %d): res: %d",
+          WRN("Failed to %d key %s grab using list(wl_client: %p, wl_surface: %p, pid: %d): res: %d",
                 grab_request->key, e_keyrouter_util_mode_to_string(grab_request->mode),
                 client, surface, e_keyrouter_util_get_pid(client, surface), grab_request->err);
      }
@@ -406,7 +406,7 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource
    if (0 != (array_len % 2))
      {
         /* FIX ME: Which way is effectively to notify invalid pair to client */
-        KLWRN("Invalid keycode and error pair. Check arguments in a list");
+        WRN("Invalid keycode and error pair. Check arguments in a list");
         TRACE_INPUT_END();
         tizen_keyrouter_send_keygrab_notify_list(resource, surface, ungrab_list);
         return;
@@ -417,10 +417,10 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource
         res = e_keyrouter_keygrab_unset(client, surface, ungrab_request->key);
         ungrab_request->err = res;
         if (res == TIZEN_KEYROUTER_ERROR_NONE)
-          KLDBG("Success to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d)",
+          DBG("Success to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d)",
                 ungrab_request->key, client, surface, e_keyrouter_util_get_pid(client, surface));
         else
-          KLWRN("Failed to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d): res: %d",
+          WRN("Failed to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d): res: %d",
                 ungrab_request->key, client, surface, e_keyrouter_util_get_pid(client, surface), ungrab_request->err);
      }
 
@@ -516,11 +516,11 @@ _e_keyrouter_cb_bind(struct wl_client *client, void *data, uint32_t version, uin
 
    resource = wl_resource_create(client, &tizen_keyrouter_interface, version, id);
 
-   KLDBG("wl_resource_create(...,&tizen_keyrouter_interface,...)");
+   DBG("wl_resource_create(...,&tizen_keyrouter_interface,...)");
 
    if (!resource)
      {
-        KLERR("Failed to create resource ! (version :%d, id:%d)", version, id);
+        ERR("Failed to create resource ! (version :%d, id:%d)", version, id);
         wl_client_post_no_memory(client);
         return;
      }
@@ -534,7 +534,7 @@ _e_keyrouter_cb_bind(struct wl_client *client, void *data, uint32_t version, uin
    destroy_listener = E_NEW(struct wl_listener, 1);
    if (!destroy_listener)
      {
-        KLERR("Failed to allocate memory for wl_client destroy listener !");
+        ERR("Failed to allocate memory for wl_client destroy listener !");
         wl_resource_destroy(resource);
         return;
      }
@@ -548,7 +548,7 @@ _e_keyrouter_wl_client_cb_destroy(struct wl_listener *l, void *data)
 {
    struct wl_client *client = data;
 
-   KLDBG("Listener(%p) called: wl_client: %p is died", l, client);
+   DBG("Listener(%p) called: wl_client: %p is died", l, client);
    e_keyrouter_keygrab_remove_client_from_list(client);
 
    wl_list_remove(&l->link);
@@ -562,7 +562,7 @@ _e_keyrouter_wl_surface_cb_destroy(struct wl_listener *l, void *data)
 {
    struct wl_resource *surface = (struct wl_resource *)data;
 
-   KLDBG("Listener(%p) called: surface: %p is died", l, surface);
+   DBG("Listener(%p) called: surface: %p is died", l, surface);
    e_keyrouter_keygrab_remove_surface_from_list(surface);
 
    wl_list_remove(&l->link);
@@ -595,7 +595,7 @@ e_keyrouter_wl_add_client_destroy_listener(struct wl_client *client)
 
    if (!destroy_listener)
      {
-        KLERR("Failed to allocate memory for wl_client destroy listener !");
+        ERR("Failed to allocate memory for wl_client destroy listener !");
         return TIZEN_KEYROUTER_ERROR_NO_SYSTEM_RESOURCES;
      }
 
@@ -631,7 +631,7 @@ e_keyrouter_wl_add_surface_destroy_listener(struct wl_resource *surface)
 
    if (!destroy_listener)
      {
-        KLERR("Failed to allocate memory for wl_surface destroy listener !");
+        ERR("Failed to allocate memory for wl_surface destroy listener !");
         return TIZEN_KEYROUTER_ERROR_NO_SYSTEM_RESOURCES;
      }
 
@@ -677,7 +677,7 @@ e_keyrouter_wl_util_do_privilege_check(struct wl_client *client, uint32_t mode,
    res = e_security_privilege_check(pid, uid, "http://tizen.org/privilege/keygrab");
    if (!res)
      {
-        KLINF("Fail to check privilege,  (pid : %d)", pid);
+        INF("Fail to check privilege,  (pid : %d)", pid);
      }
 
 finish: