Fix log format

Change-Id: Iee82fa54b44ed1fb98f1616f7e4ab9ca17fd0f97
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/src/aul_sock.c b/src/aul_sock.c
index 2d8d591..367cd5a 100644 (file)
--- a/src/aul_sock.c
+++ b/src/aul_sock.c
@@ -283,7 +283,7 @@ retry_con:
        ret = __connect_client_sock(fd, (struct sockaddr *)&saddr, sizeof(saddr),
                        100 * 1000);
        if (ret < -1) {
-               _E("maybe peer not launched or peer dead\n");
+               _E("maybe peer not launched or peer dead");
                if (retry > 0) {
                        usleep(100 * 1000);
                        retry--;
@@ -624,7 +624,7 @@ retry_recv:
                        if (errno == EINTR) {
                                continue;
                        } else {
-                               _E("recv error %s\n", strerror_r(errno,
+                               _E("recv error %s", strerror_r(errno,
                                                err_buf, sizeof(err_buf)));
                                free(pkt);
                                close(fd);
@@ -729,7 +729,7 @@ int aul_sock_recv_reply_sock_fd(int fd, int *ret_fd, int fd_size)
        vec[0].iov_len = sizeof(recv_buff);
        ret = __recv_message(fd, vec, 1, &vec_len, fds, &fds_len);
        if (ret < 0) {
-               _E("Error[%d]. while receiving message\n", -ret);
+               _E("Error[%d]. while receiving message", -ret);
                if (fds_len > 0)
                        close(fds[0]);
 
@@ -740,7 +740,7 @@ int aul_sock_recv_reply_sock_fd(int fd, int *ret_fd, int fd_size)
        } else if ((fds_len == fd_size) && (fds_len == 1)) {
                ret_fd[0] = fds[0];
        } else {
-               _E("wrong number of FD recevied. Expected:%d Actual:%d\n", fd_size, fds_len);
+               _E("wrong number of FD recevied. Expected:%d Actual:%d", fd_size, fds_len);
                ret = -ECOMM;
        }
 
@@ -777,7 +777,7 @@ retry_con:
        ret = __connect_client_sock(fd, (struct sockaddr *)&saddr,
                                sizeof(saddr), 100 * 1000);
        if (ret < -1) {
-               _E("maybe peer not launched or peer daed\n");
+               _E("maybe peer not launched or peer dead");
                if (retry > 0) {
                        usleep(100 * 1000);
                        retry--;

diff --git a/src/launch.c b/src/launch.c
index bf421e8..f8317d8 100755 (executable)
--- a/src/launch.c
+++ b/src/launch.c
@@ -361,7 +361,7 @@ static int __send_result_to_launchpad(int fd, int res)
 {
        if (send(fd, &res, sizeof(int), MSG_NOSIGNAL) < 0) {
                if (errno == EPIPE) {
-                       _E("send failed due to EPIPE.\n");
+                       _E("send failed due to EPIPE.");
                        close(fd);
                        return -1;
                }

diff --git a/src/launch_with_result.c b/src/launch_with_result.c
index 0c8fab9..fefaf47 100644 (file)
--- a/src/launch_with_result.c
+++ b/src/launch_with_result.c
@@ -161,7 +161,7 @@ static int __call_app_result_callback(bundle *kb, int is_cancel,
 
        if (((info = __find_resultcb(launched_pid, kb)) == NULL)
            || (launched_pid < 0)) {
-               _E("reject by pid - wait pid = %d, recvd pid = %d\n", getpid(),
+               _E("reject by pid - wait pid = %d, recvd pid = %d", getpid(),
                   launched_pid);
 
                /* second chance - support app launched by shell script*/
@@ -169,7 +169,7 @@ static int __call_app_result_callback(bundle *kb, int is_cancel,
                if (pgid <= 1)
                        return -1;
                if ((info = __find_resultcb(pgid, kb)) == NULL) {
-                       _E("second chance : also reject pgid - %d\n", pgid);
+                       _E("second chance : also reject pgid - %d", pgid);
                        return -1;
                }
        }

diff --git a/src/mime.c b/src/mime.c
index 4e72298..19796af 100644 (file)
--- a/src/mime.c
+++ b/src/mime.c
@@ -44,7 +44,7 @@ API int aul_get_mime_from_content(const char *content, char *mimetype,
                return AUL_R_EINVAL;
 
        if ((miregex_tbl = miregex_get_regex_table()) == NULL) {
-               _E("load miregex_table fail\n");
+               _E("load miregex_table fail");
                return AUL_R_ERROR;
        }
 
@@ -52,7 +52,7 @@ API int aul_get_mime_from_content(const char *content, char *mimetype,
                if (__match_content_with_regex(content,
                        &(miregex_tbl->regex_preg))) {
                        founded = miregex_tbl->mimetype;
-                       SECURE_LOGD("content %s => mimetype %s\n", content, founded);
+                       SECURE_LOGD("content %s => mimetype %s", content, founded);
                        break;
                }
                miregex_tbl = miregex_tbl->next;
@@ -77,14 +77,14 @@ API int aul_get_mime_description(const char *mimetype, char *desc, int len)
                return AUL_R_EINVAL;
 
        if ((miregex_tbl = miregex_get_regex_table()) == NULL) {
-               _E("load miregex_table fail\n");
+               _E("load miregex_table fail");
                return AUL_R_ERROR;
        }
 
        while (miregex_tbl) {
                if (strcmp(miregex_tbl->mimetype, mimetype) == 0) {
                        founded = miregex_tbl->desc;
-                       _D("mimetype %s => desc %s\n", mimetype, founded);
+                       _D("mimetype %s => desc %s", mimetype, founded);
                        break;
                }
                miregex_tbl = miregex_tbl->next;

diff --git a/src/miregex.c b/src/miregex.c
index 20e29fd..46cf2ca 100644 (file)
--- a/src/miregex.c
+++ b/src/miregex.c
@@ -128,7 +128,7 @@ static int __add_miregex(const char *name, const char *regex, const char *desc)
                        return -1;
                }
                regerror(error, &(tbl->regex_preg), msg, ret);
-               _E("regex compile error - %s\n", msg);
+               _E("regex compile error - %s", msg);
                if (msg) {
                        free(msg);
                        msg = NULL;

diff --git a/src/service.c b/src/service.c
index d86a99d..5b6885a 100755 (executable)
--- a/src/service.c
+++ b/src/service.c
@@ -304,7 +304,7 @@ static int __get_resolve_info(bundle *b, aul_svc_resolve_info_t *info)
        info->category = (char *)aul_svc_get_category(b);
        info->win_id = (char *)bundle_get_val(b, AUL_SVC_K_WIN_ID);
 
-       SECURE_LOGD("getting resolve info for: operation - %s / uri - %s / mime - %s\n",
+       SECURE_LOGD("getting resolve info for: operation - %s / uri - %s / mime - %s",
                        info->op, info->uri, info->mime);
 
        if (info->uri) {
@@ -606,7 +606,7 @@ static int __get_list_with_submode(char *operation, char *win_id,
        ret = _svc_db_adjust_list_with_submode(mainapp_mode, win_id, pkg_list, uid);
 
        if (ret < 0) {
-               _E("error on get_list_with_submode :%d", ret);
+               _E("error: %d", ret);
                return -1;
        }
 
@@ -740,7 +740,7 @@ static void __invalidate_cache(uid_t uid)
 API int aul_svc_set_operation(bundle *b, const char *operation)
 {
        if (b == NULL) {
-               _E("bundle for aul_svc_set_operation is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -750,7 +750,7 @@ API int aul_svc_set_operation(bundle *b, const char *operation)
 API int aul_svc_set_uri(bundle *b, const char *uri)
 {
        if (b == NULL) {
-               _E("bundle for aul_svc_set_uri is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -760,7 +760,7 @@ API int aul_svc_set_uri(bundle *b, const char *uri)
 API int aul_svc_set_mime(bundle *b, const char *mime)
 {
        if (b == NULL) {
-               _E("bundle for aul_svc_set_mime is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -793,7 +793,7 @@ API int aul_svc_add_data_array(bundle *b, const char *key,
 API int aul_svc_set_pkgname(bundle *b, const char *pkg_name)
 {
        if (b == NULL) {
-               _E("bundle for aul_svc_set_pkgname is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -806,7 +806,7 @@ API int aul_svc_set_appid(bundle *b, const char *appid)
        int ret;
 
        if (b == NULL || appid == NULL) {
-               _E("bundle for aul_svc_set_appid is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -825,7 +825,7 @@ API int aul_svc_set_appid(bundle *b, const char *appid)
 API int aul_svc_set_category(bundle *b, const char *category)
 {
        if (b == NULL) {
-               _E("bundle for aul_svc_set_category is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -835,7 +835,7 @@ API int aul_svc_set_category(bundle *b, const char *category)
 API int aul_svc_set_launch_mode(bundle *b, const char *mode)
 {
        if (b == NULL) {
-               _E("bundle for aul_svc_set_launch_mode is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -857,7 +857,7 @@ static int __run_service(bundle *b, int request_code,
        gchar *checksum;
 
        if (b == NULL) {
-               _E("bundle for aul_svc_set_appid is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -889,7 +889,7 @@ static int __run_service(bundle *b, int request_code,
                return ret;
        }
 
-       SECURE_LOGD("op - %s / mime - %s / scheme - %s\n",
+       SECURE_LOGD("op - %s / mime - %s / scheme - %s",
                                        info.op, info.origin_mime, info.scheme);
 
        checksum = __make_checksum(info.op, info.uri, info.origin_mime);
@@ -1164,12 +1164,12 @@ API int aul_svc_get_list_for_uid(bundle *b, aul_svc_info_iter_fn iter_fn,
        char *query2 = NULL;
 
        if (b == NULL) {
-               _E("bundle for aul_svc_run_service is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
        if (iter_fn == NULL) {
-               _E("iter_fn for aul_svc_run_service is NULL");
+               _E("iter_fn is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -1182,7 +1182,7 @@ API int aul_svc_get_list_for_uid(bundle *b, aul_svc_info_iter_fn iter_fn,
                return ret;
        }
 
-       _D("operation - %s / shceme - %s / mime - %s\n", info.op, info.scheme,
+       _D("operation - %s / shceme - %s / mime - %s", info.op, info.scheme,
           info.mime);
 
        query2 = __make_query_with_collation(info.op, info.uri,
@@ -1228,7 +1228,7 @@ API int aul_svc_get_list_for_uid(bundle *b, aul_svc_info_iter_fn iter_fn,
 
        for (iter = pkg_list; iter != NULL; iter = g_slist_next(iter)) {
                pkgname = iter->data;
-               SECURE_LOGD("PKGNAME : %s\n", pkgname);
+               SECURE_LOGD("PKGNAME : %s", pkgname);
                if (iter_fn(pkgname, data) != 0)
                        break;
                g_free(pkgname);
@@ -1488,7 +1488,7 @@ API int aul_svc_allow_transient_app(bundle *b, int wid)
        snprintf(win_id, MAX_LOCAL_BUFSZ, "%d", wid);
 
        if (b == NULL) {
-               _E("bundle for aul_svc_allow_transient_app is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -1544,7 +1544,7 @@ API int aul_send_service_result(bundle *b)
 API int aul_svc_subscribe_launch_result(bundle *b, const char *result)
 {
        if (b == NULL) {
-               _E("bundle for aul_svc_subscribe_launch_result is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -1556,7 +1556,7 @@ API int aul_svc_set_loader_id(bundle *b, int loader_id)
        char tmp[MAX_LOCAL_BUFSZ];
 
        if (b == NULL) {
-               _E("bundle for aul_svc_set_loader_id is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 
@@ -1572,7 +1572,7 @@ API int aul_svc_set_loader_id(bundle *b, int loader_id)
 API int aul_svc_set_loader_name(bundle *b, const char *loader_name)
 {
        if (b == NULL) {
-               _E("bundle for aul_svc_set_loader_name is NULL");
+               _E("bundle is NULL");
                return AUL_SVC_RET_EINVAL;
        }
 

diff --git a/src/service_db.c b/src/service_db.c
index 48e263f..6e08487 100755 (executable)
--- a/src/service_db.c
+++ b/src/service_db.c
@@ -102,7 +102,7 @@ static int __init(uid_t uid, bool readonly)
        char *db_path;
 
        if (svc_db) {
-               _D("Already initialized\n");
+               _D("Already initialized");
                return 0;
        }
 
@@ -203,7 +203,7 @@ static int __init_app_info_db(uid_t uid)
        char *db_path;
 
        if (app_info_db && global_app_info_db) {
-               _D("Already initialized\n");
+               _D("Already initialized");
                return 0;
        }
 
@@ -225,7 +225,7 @@ static int __init_app_info_db(uid_t uid)
        rc = sqlite3_exec(app_info_db, "PRAGMA journal_mode = PERSIST",
                                        NULL, NULL, NULL);
        if (SQLITE_OK != rc) {
-               _D("Fail to change journal mode\n");
+               _D("Fail to change journal mode");
                goto err;
        }
 
@@ -244,7 +244,7 @@ static int __init_app_info_db(uid_t uid)
        rc = sqlite3_exec(global_app_info_db, "PRAGMA journal_mode = PERSIST",
                        NULL, NULL, NULL);
        if (SQLITE_OK != rc) {
-               _D("Fail to change journal mode\n");
+               _D("Fail to change journal mode");
                goto err;
        }
 
@@ -385,7 +385,7 @@ int _svc_db_delete_with_pkgname(const char *pkg_name, uid_t uid)
        int r;
 
        if (pkg_name == NULL) {
-               _E("Invalid argument: data to delete is NULL\n");
+               _E("Invalid argument: data to delete is NULL");
                return -1;
        }
 
@@ -449,7 +449,7 @@ int _svc_db_is_defapp(const char *pkg_name, uid_t uid)
        int r;
 
        if (pkg_name == NULL) {
-               _E("Invalid argument: data to delete is NULL\n");
+               _E("Invalid argument: data to delete is NULL");
                return 0;
        }
 
@@ -747,7 +747,7 @@ int _svc_db_exec_query(const char *query, GSList **pkg_list, uid_t uid)
        if (__init_app_info_db(uid) < 0)
                return 0;
 
-       SECURE_LOGD("query : %s\n", query);
+       SECURE_LOGD("query : %s", query);
 
        r = __get_list_with_query(app_info_db, query, pkg_list);
        if (r < 0) {