From 3ff868ac5ccee60958eae36d3e4858b8731c471c Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Thu, 10 Aug 2017 18:04:47 +0900 Subject: [PATCH] Fix log format Change-Id: I3d66c8c684eaa6bd7fc80f9783eb07396353b0b0 Signed-off-by: Hwankyu Jhun --- src/launchpad.c | 20 ++++++++++---------- src/launchpad_common.c | 6 +++--- src/launchpad_lib.c | 3 +-- src/launchpad_loader.c | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/launchpad.c b/src/launchpad.c index b9dad40..69f841c 100755 --- a/src/launchpad.c +++ b/src/launchpad.c @@ -340,7 +340,7 @@ static int __real_send(int clifd, int ret) { if (send(clifd, &ret, sizeof(int), MSG_NOSIGNAL) < 0) { if (errno == EPIPE) { - _E("send failed due to EPIPE.\n"); + _E("send failed due to EPIPE."); close(clifd); return -1; } @@ -809,7 +809,7 @@ static int __launch_directly(const char *appid, const char *app_path, int clifd, if (pid <= 0) _E("failed to fork app process"); - SECURE_LOGD("==> real launch pid : %d %s\n", pid, app_path); + SECURE_LOGD("==> real launch pid : %d %s", pid, app_path); return pid; } @@ -822,7 +822,7 @@ static int __create_sock_activation(void) if (fds == 1) return SD_LISTEN_FDS_START; else if (fds > 1) - _E("Too many file descriptors received.\n"); + _E("Too many file descriptors received."); else _D("There is no socket stream"); @@ -1424,12 +1424,12 @@ static gboolean __handle_launch_event(gpointer data) goto end; } - SECURE_LOGD("exec : %s\n", menu_info->app_path); - SECURE_LOGD("comp_type : %s\n", menu_info->comp_type); - SECURE_LOGD("internal pool : %s\n", menu_info->internal_pool); - SECURE_LOGD("hwacc : %s\n", menu_info->hwacc); - SECURE_LOGD("app_type : %s\n", menu_info->app_type); - SECURE_LOGD("pkg_type : %s\n", menu_info->pkg_type); + SECURE_LOGD("exec : %s", menu_info->app_path); + SECURE_LOGD("comp_type : %s", menu_info->comp_type); + SECURE_LOGD("internal pool : %s", menu_info->internal_pool); + SECURE_LOGD("hwacc : %s", menu_info->hwacc); + SECURE_LOGD("app_type : %s", menu_info->app_type); + SECURE_LOGD("pkg_type : %s", menu_info->pkg_type); if (menu_info->comp_type && strcmp(menu_info->comp_type, "svcapp") == 0) { @@ -1841,7 +1841,7 @@ int main(int argc, char **argv) } if (__before_loop(argc, argv) != 0) { - _E("process-pool Initialization failed!\n"); + _E("process-pool Initialization failed!"); return -1; } diff --git a/src/launchpad_common.c b/src/launchpad_common.c index 3bfc961..d73952c 100644 --- a/src/launchpad_common.c +++ b/src/launchpad_common.c @@ -575,7 +575,7 @@ void _modify_bundle(bundle *kb, int caller_pid, appinfo_t *menu_info, int cmd) flag = __parse_app_path(ptr, exe, sizeof(exe)); if (flag > 0) { ptr += flag; - SECURE_LOGD("parsing app_path: EXEC - %s\n", exe); + SECURE_LOGD("parsing app_path: EXEC - %s", exe); do { flag = __parse_app_path(ptr, key, sizeof(key)); @@ -593,9 +593,9 @@ void _modify_bundle(bundle *kb, int caller_pid, appinfo_t *menu_info, int cmd) bundle_add(kb, key, value); } while (flag > 0); } else if (flag == 0) - _D("parsing app_path: No arguments\n"); + _D("parsing app_path: No arguments"); else - _D("parsing app_path: Invalid argument\n"); + _D("parsing app_path: Invalid argument"); } } diff --git a/src/launchpad_lib.c b/src/launchpad_lib.c index 748f6af..d1a3b89 100644 --- a/src/launchpad_lib.c +++ b/src/launchpad_lib.c @@ -67,8 +67,7 @@ static int __prepare_exec(const char *appid, const char *app_path, appid, pkg_type, app_path); ret = security_manager_prepare_app(appid); if (ret != SECURITY_MANAGER_SUCCESS) { - _D("fail to set privileges - " \ - "check your package's credential: %d\n", ret); + _E("Failed to set privileges %s:%d", appid, ret); return -1; } diff --git a/src/launchpad_loader.c b/src/launchpad_loader.c index 9a18f2e..6ec1d36 100644 --- a/src/launchpad_loader.c +++ b/src/launchpad_loader.c @@ -158,7 +158,7 @@ static void __preload_lib(bundle *b) for (i = 0; i < len; i++) { handle = dlopen(so_array[i], RTLD_NOW | RTLD_NODELETE); - _D("preload %s# - handle : %p\n", so_array[i], handle); + _D("preload %s# - handle : %p", so_array[i], handle); } } -- 2.7.4