From: JengHyun Kang Date: Mon, 26 Sep 2016 07:19:16 +0000 (+0900) Subject: Remove line feeds in logs X-Git-Tag: submit/tizen/20160926.083253^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7a30d406fa96f4f6fd006cf8ec4414736f467cc;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-keyrouter.git Remove line feeds in logs Change-Id: I0444dbffe0cae039609e18b1a404554559879c69 --- diff --git a/src/e_mod_keyrouter_combination.c b/src/e_mod_keyrouter_combination.c index 0e4dfcc..e103333 100644 --- a/src/e_mod_keyrouter_combination.c +++ b/src/e_mod_keyrouter_combination.c @@ -59,20 +59,20 @@ _e_keyrouter_dbus_connection_init() { DBusError dBus_error; - KLINF("_e_keyrouter_dbus_connection_init() \n"); + KLINF("_e_keyrouter_dbus_connection_init()"); dbus_error_init(&dBus_error); g_key_combination.keyrouter_dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &dBus_error); if (dbus_error_is_set(&dBus_error)) { - KLWRN("[DBUS-ERROR] %s \n",dBus_error.message); + KLWRN("[DBUS-ERROR] %s",dBus_error.message); dbus_error_free(&dBus_error); } if (!g_key_combination.keyrouter_dbus_conn) { - KLWRN("[DBUS-CONNECTION-FAIL] DBUS connection is failed \n"); + KLWRN("[DBUS-CONNECTION-FAIL] DBUS connection is failed"); } } @@ -89,7 +89,7 @@ e_keyrouter_key_combination_init() g_key_combination._master_combinations = g_array_new(FALSE, FALSE, sizeof(GArray*)); if (ini_parse((const char *) g_key_combination.combinationFilePath, _e_keyrouter_parse_ini_config, g_key_combination._master_combinations) < 0) { - KLWRN("Can't load %s file\n", g_key_combination.combinationFilePath); + KLWRN("Can't load %s file", g_key_combination.combinationFilePath); } g_key_combination.combination_timeout = COMBINATION_TIME_OUT; @@ -111,7 +111,7 @@ _e_keyrouter_substring(char *string, int position) pointer = malloc(strlen(string) + 1); if (pointer == NULL) { - KLWRN("Unable to allocate memory.\n"); + KLWRN("Unable to allocate memory."); return NULL; } @@ -139,7 +139,7 @@ _e_keyrouter_parse_ini_config(void* user, const char* section, const char* name, c_num = _e_keyrouter_substring(dup, 12/*"Combination"*/); if (c_num == NULL) { - KLWRN("\n Unable to read config. substring is null. \n"); + KLWRN(" Unable to read config. substring is null."); return -1; } @@ -148,7 +148,7 @@ _e_keyrouter_parse_ini_config(void* user, const char* section, const char* name, free(dup); if (section_number <= 0 || section_number > MAX_SUPPORTED_COMBINATION) { - KLWRN("\n^[[36m Unable to read config. section_number is invalid. ^[[0m\n"); + KLWRN("^[[36m Unable to read config. section_number is invalid. ^[[0m"); return -1; } section_number--; @@ -164,7 +164,7 @@ _e_keyrouter_parse_ini_config(void* user, const char* section, const char* name, local_section = malloc(needed + 1); if (local_section == NULL) { - KLWRN("\n^[[36m Failed to allocate memory for local_section ^[[0m\n"); + KLWRN("^[[36m Failed to allocate memory for local_section ^[[0m"); return -1; } snprintf(local_section, needed + 1, "%s%d", "Combination", section_number + 1); @@ -257,12 +257,12 @@ e_keyrouter_process_key_combination(Time cur_time, int keycode, int state) if (!keyCombinationInitialize) { - KLWRN("KeyCombinatioin support is not initiazlied yet \n"); + KLWRN("KeyCombinatioin support is not initiazlied yet"); return ; } if (g_key_combination._master_combinations == NULL) { - KLDBG(" Not searching key combination as Master combination is NULL \n"); + KLDBG(" Not searching key combination as Master combination is NULL"); } if (state == ECORE_EVENT_KEY_UP) { @@ -284,7 +284,7 @@ _e_keyrouter_send_dbus_message(DBusConnection *bus, int Input) dbus_message_append_args(message, DBUS_TYPE_INT32, &Input, DBUS_TYPE_INVALID); if (!dbus_connection_send(bus, message, NULL)) - KLWRN( "DBUS sending MSG FAILED!!\n"); + KLWRN( "DBUS sending MSG FAILED!!"); dbus_message_unref(message); return 1; @@ -390,7 +390,7 @@ _e_keyrouter_search_key_combination(int keycode, Time timestamp) matched = g_array_index(g_key_combination._current_matched_combinations,GArray*,0); for (i = 0; i < matched->len; i++) - KLDBG("[32m Matched Combination:|%d| [0m\n", g_array_index(matched,int,i)); + KLDBG("[32m Matched Combination:|%d| [0m", g_array_index(matched,int,i)); foundAt = 0; for (i = 0; i < g_key_combination._master_combinations->len; i++) @@ -410,7 +410,7 @@ _e_keyrouter_search_key_combination(int keycode, Time timestamp) } if (foundAt) { - KLDBG("[32m COMBINATION FOUND AT : %d [0m\n", foundAt); + KLDBG("[32m COMBINATION FOUND AT : %d [0m", foundAt); break; } } diff --git a/src/e_mod_keyrouter_conf.c b/src/e_mod_keyrouter_conf.c index d43b7a7..4247795 100644 --- a/src/e_mod_keyrouter_conf.c +++ b/src/e_mod_keyrouter_conf.c @@ -31,7 +31,7 @@ e_keyrouter_conf_init(E_Keyrouter_Config_Data *kconfig) if (!kconfig->conf) { - KLDBG("Failed to find module.keyrouter config file.\n"); + KLDBG("Failed to find module.keyrouter config file."); } } diff --git a/src/e_mod_keyrouter_events.c b/src/e_mod_keyrouter_events.c index 31daefd..1f8249f 100644 --- a/src/e_mod_keyrouter_events.c +++ b/src/e_mod_keyrouter_events.c @@ -37,7 +37,7 @@ _e_keyrouter_event_generate_key(Ecore_Event_Key *ev, int type, struct wl_client Ecore_Event_Key *ev_cpy; int len; - KLDBG("Generate new key event! wc_send: %p(%d)\n", send_surface, e_keyrouter_util_get_pid(send_surface, NULL)); + KLDBG("Generate new key event! wc_send: %p(%d)", send_surface, e_keyrouter_util_get_pid(send_surface, NULL)); len = sizeof(Ecore_Event_Key) + strlen(ev->key) + strlen(ev->keyname) + ((ev->compose) ? strlen(ev->compose) : 0) + 3; ev_cpy = calloc(1, len); @@ -60,17 +60,17 @@ e_keyrouter_process_key_event(void *event, int type) if (!ev) goto finish; - KLDBG("[%s] keyname: %s, key: %s, keycode: %d\n", (type == ECORE_EVENT_KEY_DOWN) ? "KEY_PRESS" : "KEY_RELEASE", ev->keyname, ev->key, ev->keycode); + KLDBG("[%s] keyname: %s, key: %s, keycode: %d", (type == ECORE_EVENT_KEY_DOWN) ? "KEY_PRESS" : "KEY_RELEASE", ev->keyname, ev->key, ev->keycode); if (ev->data) { - KLDBG("data is exist send to compositor: %p\n", ev->data); + KLDBG("data is exist send to compositor: %p", ev->data); goto finish; } if (ev->modifiers != 0) { - KLINF("Modifier key delivered to Focus window : Key %s(%d) \n", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode); + KLINF("Modifier key delivered to Focus window : Key %s(%d)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode); goto finish; } @@ -80,32 +80,32 @@ e_keyrouter_process_key_event(void *event, int type) if (wc) { _e_keyrouter_event_generate_key(ev, type, wc); - KLDBG("Sent key to playback-daemon\n"); + KLDBG("Sent key to playback-daemon"); } } if (krt->max_tizen_hwkeys < ev->keycode) { - KLWRN("The key(%d) is too larger to process keyrouting: Invalid keycode\n", ev->keycode); + KLWRN("The key(%d) is too larger to process keyrouting: Invalid keycode", ev->keycode); goto finish; } if ((ECORE_EVENT_KEY_DOWN == type) && !krt->HardKeys[ev->keycode].keycode) { - KLDBG("The press key(%d) isn't a grabbable key or has not been grabbed yet !\n", ev->keycode); + KLDBG("The press key(%d) isn't a grabbable key or has not been grabbed yet !", ev->keycode); goto finish; } if ((ECORE_EVENT_KEY_UP == type) && (!krt->HardKeys[ev->keycode].press_ptr)) { - KLDBG("The release key(%d) isn't a grabbable key or has not been grabbed yet !\n", ev->keycode); + KLDBG("The release key(%d) isn't a grabbable key or has not been grabbed yet !", ev->keycode); goto finish; } - //KLDBG("The key(%d) is going to be sent to the proper wl client(s) !\n", ev->keycode); + //KLDBG("The key(%d) is going to be sent to the proper wl client(s) !", ev->keycode); /* Call process key combination to lookup for any particular combinaton */ e_keyrouter_process_key_combination(ev->timestamp, ev->keycode, type); - KLDBG("[%s] keyname: %s, key: %s, keycode: %d\n", (type == ECORE_EVENT_KEY_DOWN) ? "KEY_PRESS" : "KEY_RELEASE", ev->keyname, ev->key, ev->keycode); + KLDBG("[%s] keyname: %s, key: %s, keycode: %d", (type == ECORE_EVENT_KEY_DOWN) ? "KEY_PRESS" : "KEY_RELEASE", ev->keyname, ev->key, ev->keycode); if (_e_keyrouter_send_key_events(type, ev)) res = EINA_FALSE; @@ -147,7 +147,7 @@ _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev) pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("Release Pair : %s(%s:%d)(Focus: %d) => E_Client (%p) WL_Client (%p) (pid: %d) (pname: %s)\n", + KLINF("Release Pair : %s(%s:%d)(Focus: %d) => E_Client (%p) WL_Client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->focused, key_node_data->surface, key_node_data->wc, pid, pname); @@ -189,7 +189,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("PICTURE OFF : %s(%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)\n", + KLINF("PICTURE OFF : %s(%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode, key_node_data->surface, key_node_data->wc, pid, pname); E_FREE(pname); } @@ -204,7 +204,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) res = e_keyrouter_add_surface_destroy_listener(delivered_surface); if (res != TIZEN_KEYROUTER_ERROR_NONE) { - KLWRN("Failed to add surface to destroy listener (res: %d)\n", res); + KLWRN("Failed to add surface to destroy listener (res: %d)", res); } } return res; @@ -219,7 +219,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("EXCLUSIVE : %s(%s:%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)\n", + KLINF("EXCLUSIVE : %s(%s:%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc, pid, pname); E_FREE(pname); @@ -237,7 +237,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("OVERRIDABLE_EXCLUSIVE : %s(%s:%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)\n", + KLINF("OVERRIDABLE_EXCLUSIVE : %s(%s:%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc, pid, pname); E_FREE(pname); @@ -260,7 +260,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) res = _e_keyrouter_send_key_event(type, key_node_data->surface, NULL, ev, key_node_data->focused, TIZEN_KEYROUTER_MODE_TOPMOST); - KLINF("TOPMOST (TOP_POSITION) : %s (%s:%d) => Surface (%p) (pid: %d) (pname: %s)\n", + KLINF("TOPMOST (TOP_POSITION) : %s (%s:%d) => Surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, pid, pname); @@ -276,7 +276,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) res = _e_keyrouter_send_key_event(type, key_node_data->surface, NULL, ev, key_node_data->focused, TIZEN_KEYROUTER_MODE_TOPMOST); - KLINF("TOPMOST (TOP_POSITION) : %s (%s:%d) => Surface (%p) (pid: %d) (pname: %s)\n", + KLINF("TOPMOST (TOP_POSITION) : %s (%s:%d) => Surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, pid, pname); @@ -299,7 +299,7 @@ need_shared: res = e_keyrouter_add_surface_destroy_listener(delivered_surface); if (res != TIZEN_KEYROUTER_ERROR_NONE) { - KLWRN("Failed to add surface to destroy listener (res: %d)\n", res); + KLWRN("Failed to add surface to destroy listener (res: %d)", res); } } EINA_LIST_FOREACH(krt->HardKeys[keycode].shared_ptr, l, key_node_data) @@ -317,7 +317,7 @@ need_shared: _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev, key_node_data->focused, TIZEN_KEYROUTER_MODE_SHARED); pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("SHARED : %s(%s:%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)\n", + KLINF("SHARED : %s(%s:%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc, pid, pname); E_FREE(pname); } @@ -352,7 +352,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface_focus, NULL,ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_SHARED); - KLINF("FOCUS DIRECT : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)\n", + KLINF("FOCUS DIRECT : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface_focus, pid, pname); *delivered_surface = surface_focus; E_FREE(pname); @@ -372,7 +372,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, // Check if window stack reaches to focus window if (ec_top == ec_focus) { - KLINF("%p is focus client & surface_focus %p. ==> %p\n", ec_top, surface_focus, surface); + KLINF("%p is focus client & surface_focus %p. ==> %p", ec_top, surface_focus, surface); below_focus = EINA_TRUE; } @@ -383,7 +383,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface, NULL, ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_REGISTERED); - KLINF("FORCE DELIVER : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)\n", + KLINF("FORCE DELIVER : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface, pid, pname); *delivered_surface = surface; @@ -408,7 +408,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, { // Registered None property is set for this surface // No event will be delivered to this surface. - KLINF("Surface(%p) is a none register window.\n", surface); + KLINF("Surface(%p) is a none register window.", surface); continue; } @@ -429,7 +429,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface, NULL, ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_REGISTERED); - KLINF("REGISTER : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)\n", + KLINF("REGISTER : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface, pid, pname); *delivered_surface = surface; krt->isRegisterDelivery = EINA_TRUE; @@ -440,7 +440,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, } else { - KLDBG("Key_list is Null for registered surface %p\n", surface); + KLDBG("Key_list is Null for registered surface %p", surface); } } @@ -455,7 +455,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface, NULL, ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_SHARED); - KLINF("NOT REGISTER : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)\n", + KLINF("NOT REGISTER : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface, pid, pname); *delivered_surface = surface; E_FREE(pname); @@ -472,7 +472,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface, NULL,ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_SHARED); - KLINF("FOCUS : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)\n", + KLINF("FOCUS : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface, pid, pname); *delivered_surface = surface; E_FREE(pname); @@ -482,7 +482,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, } } - KLINF("Couldnt Deliver key:(%s:%d) to any window. Focused Surface: %p\n", ev->keyname, ev->keycode, surface_focus); + KLINF("Couldnt Deliver key:(%s:%d) to any window. Focused Surface: %p", ev->keyname, ev->keycode, surface_focus); return res; } @@ -499,7 +499,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx) { if (!ec_top->visible && ec_top == ec_focus) { - KLDBG("Top Client(%p) is invisible(%d) but focus client\n", ec_top, ec_top->visible); + KLDBG("Top Client(%p) is invisible(%d) but focus client", ec_top, ec_top->visible); return EINA_FALSE; } if (!ec_top->visible) @@ -517,7 +517,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx) if (ec_top == wl_resource_get_user_data(key_node_data->surface)) { krt->HardKeys[arr_idx].top_ptr = eina_list_promote_list(krt->HardKeys[arr_idx].top_ptr, l); - KLDBG("Move a client(ec: %p, surface: %p) to first index of list(key: %d)\n", + KLDBG("Move a client(ec: %p, surface: %p) to first index of list(key: %d)", ec_top, key_node_data->surface, arr_idx); return EINA_TRUE; } @@ -526,7 +526,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx) if (ec_top == ec_focus) { - KLDBG("The Client(%p) is a focus client\n", ec_top); + KLDBG("The Client(%p) is a focus client", ec_top); return EINA_FALSE; } @@ -552,7 +552,7 @@ _e_keyrouter_send_key_event(int type, struct wl_resource *surface, struct wl_cli if (!wc_send) { - KLWRN("surface: %p or wc: %p returns null wayland client\n", surface, wc); + KLWRN("surface: %p or wc: %p returns null wayland client", surface, wc); return EINA_FALSE; } @@ -565,7 +565,7 @@ _e_keyrouter_send_key_event(int type, struct wl_resource *surface, struct wl_cli { focused = EINA_TRUE; ev->data = wc_send; - KLDBG("Send only one key! wc_send: %p(%d)\n", wc_send, e_keyrouter_util_get_pid(wc_send, NULL)); + KLDBG("Send only one key! wc_send: %p(%d)", wc_send, e_keyrouter_util_get_pid(wc_send, NULL)); } else if (focused == EINA_TRUE) { @@ -677,7 +677,7 @@ e_keyrouter_util_keycode_get_from_string(char * name) keycode = _e_keyrouter_keycode_get_from_keysym(keymap, keysym); - KLDBG("request name: %s, return value: %d\n", name, keycode); + KLDBG("request name: %s, return value: %d", name, keycode); return keycode; diff --git a/src/e_mod_keyrouter_list.c b/src/e_mod_keyrouter_list.c index 6631f34..22f2250 100644 --- a/src/e_mod_keyrouter_list.c +++ b/src/e_mod_keyrouter_list.c @@ -53,7 +53,7 @@ e_keyrouter_set_keygrab_in_list(struct wl_resource *surface, struct wl_client *c EINA_SAFETY_ON_FALSE_RETURN_VAL(res == TIZEN_KEYROUTER_ERROR_NONE, res); - KLINF("Succeed to set keygrab info surface: %p, client: %p key: %d mode: %s\n", + KLINF("Succeed to set keygrab info surface: %p, client: %p key: %d mode: %s", surface, client, key, _mode_str_get(mode)); return res; @@ -90,7 +90,7 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien keylist_ptr = krt->HardKeys[key].pic_off_ptr; break; default: - KLWRN("Unknown key(%d) and grab mode(%d)\n", key, mode); + KLWRN("Unknown key(%d) and grab mode(%d)", key, mode); return TIZEN_KEYROUTER_ERROR_INVALID_MODE; } @@ -102,7 +102,7 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien { if (key_node_data->surface == surface) { - KLDBG("The key(%d) is already grabbed same mode(%d) on the same surface %p\n", + KLDBG("The key(%d) is already grabbed same mode(%d) on the same surface %p", key, mode, surface); return TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY; } @@ -111,7 +111,7 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien { if (key_node_data->wc == wc) { - KLDBG("The key(%d) is already grabbed same mode(%d) on the same wl_client %p\n", + KLDBG("The key(%d) is already grabbed same mode(%d) on the same wl_client %p", key, mode, wc); return TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY; } @@ -158,7 +158,7 @@ e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc if (!new_keyptr) { - KLERR("Failled to allocate memory for new_keyptr\n"); + KLERR("Failled to allocate memory for new_keyptr"); return TIZEN_KEYROUTER_ERROR_NO_SYSTEM_RESOURCES; } @@ -192,7 +192,7 @@ e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc krt->HardKeys[key].pic_off_ptr = eina_list_prepend(krt->HardKeys[key].pic_off_ptr, new_keyptr); break; default: - KLWRN("Unknown key(%d) and grab mode(%d)\n", key, mode); + KLWRN("Unknown key(%d) and grab mode(%d)", key, mode); E_FREE(new_keyptr); return TIZEN_KEYROUTER_ERROR_INVALID_MODE; } @@ -248,7 +248,7 @@ e_keyrouter_find_and_remove_client_from_list(struct wl_resource *surface, struct *list = eina_list_remove_list(*list, l); E_FREE(key_node_data); } - KLDBG("Remove a %s Mode Grabbed key(%d) by surface(%p)\n", _mode_str_get(mode), key, surface); + KLDBG("Remove a %s Mode Grabbed key(%d) by surface(%p)", _mode_str_get(mode), key, surface); } } else if ((wc == key_node_data->wc)) @@ -262,7 +262,7 @@ e_keyrouter_find_and_remove_client_from_list(struct wl_resource *surface, struct *list = eina_list_remove_list(*list, l); E_FREE(key_node_data); } - KLDBG("Remove a %s Mode Grabbed key(%d) by wc(%p)\n", _mode_str_get(mode), key, wc); + KLDBG("Remove a %s Mode Grabbed key(%d) by wc(%p)", _mode_str_get(mode), key, wc); } } } @@ -290,14 +290,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien { krt->HardKeys[i].excl_ptr = eina_list_remove_list(krt->HardKeys[i].excl_ptr, l); E_FREE(key_node_data); - KLINF("Remove a Exclusive Mode Grabbed key(%d) by surface(%p)\n", i, surface); + KLINF("Remove a Exclusive Mode Grabbed key(%d) by surface(%p)", i, surface); } } else if ((wc == key_node_data->wc)) { krt->HardKeys[i].excl_ptr = eina_list_remove_list(krt->HardKeys[i].excl_ptr, l); E_FREE(key_node_data); - KLINF("Remove a Exclusive Mode Grabbed key(%d) by wc(%p)\n", i, wc); + KLINF("Remove a Exclusive Mode Grabbed key(%d) by wc(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].or_excl_ptr, l, l_next, key_node_data) @@ -310,14 +310,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien { krt->HardKeys[i].or_excl_ptr = eina_list_remove_list(krt->HardKeys[i].or_excl_ptr, l); E_FREE(key_node_data); - KLINF("Remove a Overridable_Exclusive Mode Grabbed key(%d) by surface(%p)\n", i, surface); + KLINF("Remove a Overridable_Exclusive Mode Grabbed key(%d) by surface(%p)", i, surface); } } else if ((wc == key_node_data->wc)) { krt->HardKeys[i].or_excl_ptr = eina_list_remove_list(krt->HardKeys[i].or_excl_ptr, l); E_FREE(key_node_data); - KLINF("Remove a Overridable_Exclusive Mode Grabbed key(%d) by wc(%p)\n", i, wc); + KLINF("Remove a Overridable_Exclusive Mode Grabbed key(%d) by wc(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].top_ptr, l, l_next, key_node_data) @@ -330,14 +330,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien { krt->HardKeys[i].top_ptr = eina_list_remove_list(krt->HardKeys[i].top_ptr, l); E_FREE(key_node_data); - KLINF("Remove a Topmost Mode Grabbed key(%d) by surface(%p)\n", i, surface); + KLINF("Remove a Topmost Mode Grabbed key(%d) by surface(%p)", i, surface); } } else if ((wc == key_node_data->wc)) { krt->HardKeys[i].top_ptr = eina_list_remove_list(krt->HardKeys[i].top_ptr, l); E_FREE(key_node_data); - KLINF("Remove a Topmost Mode Grabbed key(%d) by wc(%p)\n", i, wc); + KLINF("Remove a Topmost Mode Grabbed key(%d) by wc(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].shared_ptr, l, l_next, key_node_data) @@ -350,14 +350,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien { krt->HardKeys[i].shared_ptr = eina_list_remove_list(krt->HardKeys[i].shared_ptr, l); E_FREE(key_node_data); - KLINF("Remove a Shared Mode Grabbed key(%d) by surface(%p)\n", i, surface); + KLINF("Remove a Shared Mode Grabbed key(%d) by surface(%p)", i, surface); } } else if ((wc == key_node_data->wc)) { krt->HardKeys[i].shared_ptr = eina_list_remove_list(krt->HardKeys[i].shared_ptr, l); E_FREE(key_node_data); - KLINF("Remove a Shared Mode Grabbed key(%d) by wc(%p)\n", i, wc); + KLINF("Remove a Shared Mode Grabbed key(%d) by wc(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].press_ptr, l, l_next, key_node_data) @@ -369,13 +369,13 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien if (surface == key_node_data->surface) { key_node_data->deleted = EINA_TRUE; - KLINF("Remove a Pressed key(%d) by surface(%p)\n", i, surface); + KLINF("Remove a Pressed key(%d) by surface(%p)", i, surface); } } else if ((wc == key_node_data->wc)) { key_node_data->deleted = EINA_TRUE; - KLINF("Remove a Pressed key(%d) by wc(%p)\n", i, wc); + KLINF("Remove a Pressed key(%d) by wc(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].pic_off_ptr, l, l_next, key_node_data) @@ -414,7 +414,7 @@ e_keyrouter_find_key_in_register_list(uint32_t key) { if(*key_data == key) { - KLDBG("Find %d key by register surface %p\n", key, rwin_info->surface); + KLDBG("Find %d key by register surface %p", key, rwin_info->surface); return EINA_TRUE; } } @@ -457,18 +457,18 @@ e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc, { if(*key_data == key) { - KLDBG("Find %d key grabbed by (surface: %p, in %s mode\n", key, surface, "TIZEN_KEYROUTER_MODE_REGISTERED"); + KLDBG("Find %d key grabbed by (surface: %p, in %s mode", key, surface, "TIZEN_KEYROUTER_MODE_REGISTERED"); return TIZEN_KEYROUTER_MODE_REGISTERED; } } } } - KLDBG("%d key is not grabbed by (surface: %p, wl_client: %p)\n", key, surface, wc); + KLDBG("%d key is not grabbed by (surface: %p, wl_client: %p)", key, surface, wc); return TIZEN_KEYROUTER_MODE_NONE; finish: - KLDBG("Find %d key grabbed by (surface: %p, wl_client: %p) in %s mode\n", + KLDBG("Find %d key grabbed by (surface: %p, wl_client: %p) in %s mode", key, surface, wc, _mode_str_get(mode)); return mode; } @@ -517,7 +517,7 @@ _e_keyrouter_build_register_list(void) if (EINA_TRUE == below_focus && !e_keyrouter_is_registered_window(surface)) { - KLDBG("%p is none registered window, below focus surface\n", surface); + KLDBG("%p is none registered window, below focus surface", surface); break; } @@ -540,7 +540,7 @@ _e_keyrouter_build_register_list(void) node->deleted = EINA_FALSE; krt->HardKeys[*ddata].registered_ptr = node; - KLDBG("%d key's register surface is %p\n", *ddata, surface); + KLDBG("%d key's register surface is %p", *ddata, surface); } } @@ -617,13 +617,13 @@ e_keyrouter_unset_keyregister(struct wl_resource *surface, struct wl_client *cli if (!key_list) { - KLDBG("Removing %p surface from register list, as NULL key list \n", surface); + KLDBG("Removing %p surface from register list, as NULL key list", surface); _e_keyrouter_remove_registered_surface_in_list(surface); } _e_keyrouter_build_register_list(); - KLDBG("Succeed to set keyregister info surface: %p, client: %p key: %d\n", + KLDBG("Succeed to set keyregister info surface: %p, client: %p key: %d", surface, client, key); return res; @@ -649,7 +649,7 @@ _e_keyrouter_add_registered_surface_in_list(struct wl_resource *surface, int key if (*key_data == key) { - KLDBG("Registered Key(%d) already registered by surface(%p)\n", key, surface); + KLDBG("Registered Key(%d) already registered by surface(%p)", key, surface); key_finded = EINA_TRUE; break; } @@ -661,7 +661,7 @@ _e_keyrouter_add_registered_surface_in_list(struct wl_resource *surface, int key rwin_info->keys = eina_list_append(rwin_info->keys, key_added); surface_finded = EINA_TRUE; - KLINF("Registered Key(%d) is added to surface (%p)\n", key, surface); + KLINF("Registered Key(%d) is added to surface (%p)", key, surface); break; } } @@ -675,7 +675,7 @@ _e_keyrouter_add_registered_surface_in_list(struct wl_resource *surface, int key rwin_added->keys = eina_list_append(rwin_added->keys, key_added); krt->registered_window_list = eina_list_append(krt->registered_window_list, rwin_added); - KLINF("Surface(%p) and key(%d) is added list\n", surface, key); + KLINF("Surface(%p) and key(%d) is added list", surface, key); } } @@ -700,7 +700,7 @@ _e_keyrouter_remove_registered_surface_in_list(struct wl_resource *surface) } krt->registered_window_list = eina_list_remove_list(krt->registered_window_list, l); E_FREE(data); - KLDBG("Remove a %p surface in register list\n", surface); + KLDBG("Remove a %p surface in register list", surface); break; } } @@ -720,7 +720,7 @@ e_keyrouter_is_registered_window(struct wl_resource *surface) if (data->surface == surface) { - KLDBG("Surface %p is registered window\n", surface); + KLDBG("Surface %p is registered window", surface); return EINA_TRUE; } } diff --git a/src/e_mod_main_wl.c b/src/e_mod_main_wl.c index 702b99b..27a0675 100644 --- a/src/e_mod_main_wl.c +++ b/src/e_mod_main_wl.c @@ -51,7 +51,7 @@ _e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, if (EINA_FALSE == _e_keyrouter_util_do_privilege_check(client, wl_client_get_fd(client), mode, key)) { - KLINF("No permission for %d grab mode ! (key=%d)\n", mode, key); + KLINF("No permission for %d grab mode ! (key=%d)", mode, key); return TIZEN_KEYROUTER_ERROR_NO_PERMISSION; } #endif @@ -62,7 +62,7 @@ _e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, if (mode == TIZEN_KEYROUTER_MODE_TOPMOST || mode == TIZEN_KEYROUTER_MODE_REGISTERED) { - KLWRN("Invalid surface for %d grab mode ! (key=%d)\n", mode, key); + KLWRN("Invalid surface for %d grab mode ! (key=%d)", mode, key); return TIZEN_KEYROUTER_ERROR_INVALID_SURFACE; } @@ -71,7 +71,7 @@ _e_keyrouter_keygrab_set(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)\n", key); + KLWRN("Invalid range of key ! (keycode:%d)", key); return TIZEN_KEYROUTER_ERROR_INVALID_KEY; } @@ -79,14 +79,14 @@ _e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, * Only key listed in Tizen key layout file can be grabbed. */ if (0 == krt->HardKeys[key].keycode) { - KLWRN("Invalid key ! Disabled to grab ! (keycode:%d)\n", key); + KLWRN("Invalid key ! Disabled to grab ! (keycode:%d)", key); return TIZEN_KEYROUTER_ERROR_INVALID_KEY; } /* Check whether the mode is valid or not */ if (TIZEN_KEYROUTER_MODE_REGISTERED < mode) { - KLWRN("Invalid range of mode ! (mode:%d)\n", mode); + KLWRN("Invalid range of mode ! (mode:%d)", mode); return TIZEN_KEYROUTER_ERROR_INVALID_MODE; } @@ -155,7 +155,7 @@ _e_keyrouter_cb_keygrab_set(struct wl_client *client, struct wl_resource *resour int res = 0; TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_set); - KLINF("Key grab request (client: %p, surface: %p, pid: %d, key:%d, mode:%d)\n", client, surface, e_keyrouter_util_get_pid(client, surface), key, mode); + KLINF("Key grab request (client: %p, surface: %p, pid: %d, key:%d, mode:%d)", client, surface, e_keyrouter_util_get_pid(client, surface), key, mode); res = _e_keyrouter_keygrab_set(client, surface, key, mode); @@ -170,7 +170,7 @@ _e_keyrouter_cb_keygrab_unset(struct wl_client *client, struct wl_resource *reso int res = 0; TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_unset); - KLINF("Key ungrab request (client: %p, surface: %p, pid: %d, key:%d)\n", client, surface, e_keyrouter_util_get_pid(client, surface), key); + KLINF("Key ungrab request (client: %p, surface: %p, pid: %d, key:%d)", client, surface, e_keyrouter_util_get_pid(client, surface), key); res = _e_keyrouter_keygrab_unset(client, surface, key); @@ -206,7 +206,7 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r if (0 != (_e_keyrouter_wl_array_length(grab_list) % 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\n"); + KLWRN("Invalid keycode and grab mode pair. Check arguments in a list"); TRACE_INPUT_END(); tizen_keyrouter_send_keygrab_notify_list(resource, surface, NULL); return; @@ -214,7 +214,7 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r wl_array_for_each(grab_request, grab_list) { - KLINF("Grab request using list (client: %p, surface: %p, pid: %d, key: %d, mode: %d]\n", client, surface, e_keyrouter_util_get_pid(client, surface), grab_request->key, grab_request->mode); + KLINF("Grab request using list (client: %p, surface: %p, pid: %d, key: %d, mode: %d]", client, surface, e_keyrouter_util_get_pid(client, surface), grab_request->key, grab_request->mode); res = _e_keyrouter_keygrab_set(client, surface, grab_request->key, grab_request->mode); grab_request->err = res; } @@ -234,7 +234,7 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource if (0 != (_e_keyrouter_wl_array_length(ungrab_list) % 2)) { /* FIX ME: Which way is effectively to notify invalid pair to client */ - KLWRN("Invalid keycode and error pair. Check arguments in a list\n"); + KLWRN("Invalid keycode and error pair. Check arguments in a list"); TRACE_INPUT_END(); tizen_keyrouter_send_keygrab_notify_list(resource, surface, ungrab_list); return; @@ -242,7 +242,7 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource wl_array_for_each(ungrab_request, ungrab_list) { - KLINF("Ungrab request using list (client: %p, surface: %p, pid: %d, key: %d, res: %d]\n", client, surface, e_keyrouter_util_get_pid(client, surface), ungrab_request->key, res); + KLINF("Ungrab request using list (client: %p, surface: %p, pid: %d, key: %d, res: %d]", client, surface, e_keyrouter_util_get_pid(client, surface), ungrab_request->key, res); res = _e_keyrouter_keygrab_unset(client, surface, ungrab_request->key); ungrab_request->err = res; } @@ -271,11 +271,11 @@ static void _e_keyrouter_cb_set_input_config(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface, uint32_t config_mode, uint32_t value) { Eina_Bool res = EINA_TRUE; - KLINF("Given Surface(%p) for mode %d with value = %d \n", surface, config_mode, value); + KLINF("Given Surface(%p) for mode %d with value = %d", surface, config_mode, value); if (surface == NULL && config_mode != TIZEN_KEYROUTER_CONFIG_MODE_PICTURE_OFF) { - KLWRN("Error Surface is NULL \n"); + KLWRN("Error Surface is NULL"); res = EINA_FALSE; goto send_input_config_notify; } @@ -320,14 +320,14 @@ _e_keyrouter_cb_set_input_config(struct wl_client *client, struct wl_resource *r break; default: - KLWRN("Wrong mode requested: %d \n", config_mode); + KLWRN("Wrong mode requested: %d", config_mode); res= EINA_FALSE; goto send_input_config_notify; } if (value) { - KLDBG("Add a surface(%p) destory listener\n", surface); + KLDBG("Add a surface(%p) destory listener", surface); e_keyrouter_add_surface_destroy_listener(surface); } send_input_config_notify: @@ -345,7 +345,7 @@ IsNoneKeyRegisterWindow(struct wl_resource *surface) { if (surface_ldata == surface) { - KLDBG("Given surface(%p) is in NoneKeyRegisterWindow \n", surface); + KLDBG("Given surface(%p) is in NoneKeyRegisterWindow", surface); return EINA_TRUE; } } @@ -407,7 +407,7 @@ _e_keyrouter_cb_set_register_none_key(struct wl_client *client, struct wl_resour krt->registered_none_key_window_list = eina_list_remove(krt->registered_none_key_window_list, surface); } - KLDBG("Set Registered None Key called on surface (%p) with data (%d)\n", surface, krt->register_none_key); + KLDBG("Set Registered None Key called on surface (%p) with data (%d)", surface, krt->register_none_key); tizen_keyrouter_send_set_register_none_key_notify(resource, NULL, krt->register_none_key); } @@ -528,7 +528,7 @@ e_keyrouter_add_client_destroy_listener(struct wl_client *client) if (!destroy_listener) { - KLERR("Failed to allocate memory for wl_client destroy listener !\n"); + KLERR("Failed to allocate memory for wl_client destroy listener !"); return TIZEN_KEYROUTER_ERROR_NO_SYSTEM_RESOURCES; } @@ -564,7 +564,7 @@ e_keyrouter_add_surface_destroy_listener(struct wl_resource *surface) if (!destroy_listener) { - KLERR("Failed to allocate memory for wl_surface destroy listener !\n"); + KLERR("Failed to allocate memory for wl_surface destroy listener !"); return TIZEN_KEYROUTER_ERROR_NO_SYSTEM_RESOURCES; } @@ -604,11 +604,11 @@ _e_keyrouter_cb_bind(struct wl_client *client, void *data, uint32_t version, uin resource = wl_resource_create(client, &tizen_keyrouter_interface, MIN(version, 1), id); - KLDBG("wl_resource_create(...,&tizen_keyrouter_interface,...)\n"); + KLDBG("wl_resource_create(...,&tizen_keyrouter_interface,...)"); if (!resource) { - KLERR("Failed to create resource ! (version :%d, id:%d)\n", version, id); + KLERR("Failed to create resource ! (version :%d, id:%d)", version, id); wl_client_post_no_memory(client); return; } @@ -658,7 +658,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)\n", log_path); + KLERR("failed: open file(%s)", log_path); return; } @@ -724,7 +724,7 @@ _e_keyrouter_keygrab_print(void *data, const char *log_path) log_fl = fopen(log_path, "a"); if (!log_fl) { - KLERR("failed: open file(%s)\n", log_path); + KLERR("failed: open file(%s)", log_path); return; } @@ -752,7 +752,7 @@ _e_keyrouter_keygrab_print(void *data, const char *log_path) } fprintf(log_fl, " ----- End -----\n\n"); - fprintf(log_fl, " ----- Grabbed keys Info -----\n"); + fprintf(log_fl, " ----- Grabbed keys Info -----\n\n"); for (i = 8; i < krt->max_tizen_hwkeys; i++) { if (!krt->HardKeys[i].keycode) continue; @@ -896,7 +896,7 @@ _e_keyrouter_cb_power_change(device_callback_e type, void* value, void* user_dat krt->isPictureOffEnabled = 0; break; } - KLDBG("Picture off flag changed to %d \n", krt->isPictureOffEnabled); + KLDBG("Picture off flag changed to %d", krt->isPictureOffEnabled); } static Eina_Bool _e_keyrouter_cb_idler(void *data) @@ -918,14 +918,14 @@ _e_keyrouter_init(E_Module *m) if (!krt) { - KLERR("Failed to allocate memory for krt !\n"); + KLERR("Failed to allocate memory for krt !"); TRACE_INPUT_END(); return NULL; } if (!e_comp) { - KLERR("Failed to initialize keyrouter module ! (e_comp == NULL)\n"); + KLERR("Failed to initialize keyrouter module ! (e_comp == NULL)"); goto err; } @@ -955,7 +955,7 @@ _e_keyrouter_init(E_Module *m) krt->global = wl_global_create(e_comp_wl->wl.disp, &tizen_keyrouter_interface, 1, krt, _e_keyrouter_cb_bind); if (!krt->global) { - KLERR("Failed to create global !\n"); + KLERR("Failed to create global !"); goto err; } @@ -1088,7 +1088,7 @@ _e_keyrouter_query_tizen_key_table(void) if (0 > data->keycode || krt->max_tizen_hwkeys < data->keycode) { - KLWRN("Given keycode(%d) is invalid. It must be bigger than zero, smaller than the maximum value(%d) or equal to it.\n", data->keycode, kconf->max_keycode); + KLWRN("Given keycode(%d) is invalid. It must be bigger than zero, smaller than the maximum value(%d) or equal to it.", data->keycode, kconf->max_keycode); continue; } @@ -1104,7 +1104,7 @@ _e_keyrouter_query_tizen_key_table(void) res = xkb_keymap_key_set_repeats(e_comp_wl->xkb.keymap, data->keycode, 0); if (!res) { - KLWRN("Failed to set repeat key(%d), value(%d)\n", data->keycode, 0); + KLWRN("Failed to set repeat key(%d), value(%d)", data->keycode, 0); } } } @@ -1112,13 +1112,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\n", e_comp_wl_input_keymap_path_get(names)); + KLINF("Server create a new cache file: %s", e_comp_wl_input_keymap_path_get(names)); res = unlink(e_comp_wl_input_keymap_path_get(names)); e_comp_wl_input_keymap_set(NULL, NULL, NULL, NULL, NULL, xkb_context_ref(e_comp_wl->xkb.context), xkb_keymap_ref(e_comp_wl->xkb.keymap)); } else - KLINF("Currently cache file is exist. Do not change it.\n"); + KLINF("Currently cache file is exist. Do not change it."); return EINA_TRUE; } @@ -1173,7 +1173,7 @@ _e_keyrouter_client_cb_stack(void *data, int type, void *event) (void) ev; (void) ec; - //KLDBG("ec: %p, visibile: %d, focused: %d, take_focus: %d, want_focus: %d, bordername: %s, input_only: %d\n", + //KLDBG("ec: %p, visibile: %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; @@ -1205,7 +1205,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\n", l, client); + KLDBG("Listener(%p) called: wl_client: %p is died", l, client); e_keyrouter_remove_client_from_list(NULL, client); wl_list_remove(&l->link); @@ -1219,7 +1219,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\n", l, surface); + KLDBG("Listener(%p) called: surface: %p is died", l, surface); e_keyrouter_remove_client_from_list(surface, NULL); wl_list_remove(&l->link); @@ -1247,10 +1247,10 @@ _e_keyrouter_util_cynara_log(const char *func_name, int err) ret = cynara_strerror(err, buf, CYNARA_BUFSIZE); if (ret != CYNARA_API_SUCCESS) { - KLWRN("Failed to cynara_strerror: %d (error log about %s: %d)\n", ret, func_name, err); + KLWRN("Failed to cynara_strerror: %d (error log about %s: %d)", ret, func_name, err); return; } - KLWRN("%s is failed: %s\n", func_name, buf); + KLWRN("%s is failed: %s", func_name, buf); } static Eina_Bool @@ -1278,7 +1278,7 @@ _e_keyrouter_util_do_privilege_check(struct wl_client *client, int socket_fd, ui retried = EINA_TRUE; for(retry_cnt = 0; retry_cnt < 5; retry_cnt++) { - KLDBG("Retry cynara initialize: %d\n", retry_cnt+1); + KLDBG("Retry cynara initialize: %d", retry_cnt+1); ret = cynara_initialize(&krt->p_cynara, NULL); if (EINA_UNLIKELY(CYNARA_API_SUCCESS != ret)) { @@ -1287,7 +1287,7 @@ _e_keyrouter_util_do_privilege_check(struct wl_client *client, int socket_fd, ui } else { - KLDBG("Success cynara initialize to try %d times\n", retry_cnt+1); + KLDBG("Success cynara initialize to try %d times", retry_cnt+1); break; } } @@ -1323,7 +1323,7 @@ _e_keyrouter_util_do_privilege_check(struct wl_client *client, int socket_fd, ui } else { - KLINF("Fail to check cynara, error : %d (pid : %d)\n", ret, pid); + KLINF("Fail to check cynara, error : %d (pid : %d)", ret, pid); } finish: E_FREE(client_session);