From: jy910.yun Date: Fri, 10 May 2013 06:43:15 +0000 (+0900) Subject: change the wrong log to _D regarding sysnoti and queue X-Git-Tag: submit/tizen_ivi_release/20140401.030119~85 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2531aed9ba7cd8653abbc2502d5fc40435b4c0c2;p=platform%2Fcore%2Fsystem%2Fsystem-server.git change the wrong log to _D regarding sysnoti and queue Change-Id: I7b0e7ce22d933a6368a2f270767a6c2b97a6ccc1 Signed-off-by: jy910.yun --- diff --git a/src/core/queue.c b/src/core/queue.c index 5f3d567..80d33a7 100644 --- a/src/core/queue.c +++ b/src/core/queue.c @@ -75,7 +75,7 @@ int ss_action_entry_add_internal(char *type, predef_act_list = eina_list_prepend(predef_act_list, data); - _E("[SYSMAN] add predefine action entry suceessfully - %s", + _I("[SYSMAN] add predefine action entry suceessfully - %s", data->type); return 0; err: @@ -121,7 +121,7 @@ int ss_action_entry_add(struct sysnoti *msg) predef_act_list = eina_list_prepend(predef_act_list, data); - _E("[SYSMAN]add predefine action entry suceessfully - %s", + _I("[SYSMAN]add predefine action entry suceessfully - %s", data->type); return 0; err: @@ -157,9 +157,7 @@ int ss_action_entry_call_internal(char *type, int argc, ...) int ret; ret=ss_run_queue_add(data, argc, argv); - _E("ss_run_queue_add : %d", ret); ret=ss_core_action_run(); - _E("ss_core_action_run : %d", ret); return 0; } } @@ -177,16 +175,12 @@ int ss_action_entry_call(struct sysnoti *msg, int sockfd) if ((data != NULL) && (!strcmp(data->type, msg->type))) { if (data->is_accessible != NULL && data->is_accessible(sockfd) == 0) { - _E - ("%d cannot call that predefine module", - msg->pid); + _E("%d cannot call that predefine module", msg->pid); return -1; } int ret; ret=ss_run_queue_add(data, msg->argc, msg->argv); - _E("ss_run_queue_add : %d",ret); ret=ss_core_action_run(); - _E("ss_core_action_run : %d",ret); return 0; } } diff --git a/src/core/sysnoti.c b/src/core/sysnoti.c index 965d47c..c460490 100644 --- a/src/core/sysnoti.c +++ b/src/core/sysnoti.c @@ -54,7 +54,7 @@ static void print_sysnoti_msg(const char *title, struct sysnoti *msg) if (get_cmdline_name(msg->pid, exe_name, PATH_MAX) < 0) snprintf(exe_name, sizeof(exe_name), "Unknown (maybe dead)"); - _E("pid : %d name: %s cmd : %d type : %s path : %s", + _D("pid : %d name: %s cmd : %d type : %s path : %s", msg->pid, exe_name, msg->cmd, msg->type, msg->path); } @@ -129,14 +129,13 @@ static inline char *recv_str(int fd) if(errno == EINTR) { _E("Re-read for error(EINTR)"); retry_count++; - continue; - } - else { + continue; + } else { _E("Read fail for str"); free(str); str = NULL; return NULL; - } + } } else break; } @@ -212,15 +211,14 @@ static int sysnoti_cb(void *data, Ecore_Fd_Handler * fd_handler) bool sync; if (!ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) { - _E - ("ecore_main_fd_handler_active_get error , return\n"); + _E("ecore_main_fd_handler_active_get error , return"); return 1; } fd = ecore_main_fd_handler_fd_get(fd_handler); msg = malloc(sizeof(struct sysnoti)); if (msg == NULL) { - _E("%s : Not enough memory", __FUNCTION__); + _E("Not enough memory"); return 1; } @@ -233,7 +231,7 @@ static int sysnoti_cb(void *data, Ecore_Fd_Handler * fd_handler) return -1; } if (read_message(client_sockfd, msg) < 0) { - _E("%s : recv error msg", __FUNCTION__); + _E("recv error msg"); print_sysnoti_msg(__FUNCTION__, msg); free_message(msg); write(client_sockfd, &ret, sizeof(int)); @@ -247,7 +245,7 @@ static int sysnoti_cb(void *data, Ecore_Fd_Handler * fd_handler) print_sysnoti_msg(__FUNCTION__, msg); if (msg->argc > SYSMAN_MAXARG) { - _E("%s : error argument", __FUNCTION__); + _E("error argument"); free_message(msg); if (sync) write(client_sockfd, &ret, sizeof(int)); @@ -282,11 +280,11 @@ static int ss_sysnoti_server_init(void) fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd < 0) { - _E("%s: socket create failed\n", __FUNCTION__); + _E("socket create failed"); return -1; } if((fsetxattr(fd, "security.SMACK64IPOUT", "@", 2, 0)) < 0 ) { - _E("%s: Socket SMACK labeling failed\n", __FUNCTION__); + _E("Socket SMACK labeling failed"); if(errno != EOPNOTSUPP) { close(fd); return -1; @@ -294,7 +292,7 @@ static int ss_sysnoti_server_init(void) } if((fsetxattr(fd, "security.SMACK64IPIN", "*", 2, 0)) < 0 ) { - _E("%s: Socket SMACK labeling failed\n", __FUNCTION__); + _E("Socket SMACK labeling failed"); if(errno != EOPNOTSUPP) { close(fd); return -1; @@ -307,7 +305,7 @@ static int ss_sysnoti_server_init(void) sizeof(serveraddr.sun_path)); if (bind(fd, (struct sockaddr *)&serveraddr, sizeof(struct sockaddr)) < 0) { - _E("%s: socket bind failed\n", __FUNCTION__); + _E("socket bind failed"); close(fd); return -1; } @@ -320,7 +318,6 @@ static int ss_sysnoti_server_init(void) close(fd); return -1; } - _I("socket create & listen ok\n"); return fd; }