Incorporated Dlog API changes

This patch incorporated dlog internal API "__dlog_print()"
changes in w-home application.

Change-Id: I4913f9c1002da440f1e46be13881aef571a4b973

diff --git a/src/add-viewer_pkgmgr.c b/src/add-viewer_pkgmgr.c
index f05f3d26b8807c44823a3a15c0359ec5d0340d4b..32c39b9512e3c18767a2dfd41f4395a4b97a9faa 100644 (file)
--- a/src/add-viewer_pkgmgr.c
+++ b/src/add-viewer_pkgmgr.c
@@ -207,14 +207,14 @@ static int start_cb(const char *pkgname, const char *val, void *data)
        item = calloc(1, sizeof(*item));
        if (!item) {
                char err_buf[256] = { 0, };
-               ErrPrint("Heap: %s\n", strerror_r(errno, err_buf, sizeof(err_buf)));
+               ErrPrint("Heap: %d\n", strerror_r(errno, err_buf, sizeof(err_buf)));
                return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 
        item->pkgname = strdup(pkgname);
        if (!item->pkgname) {
                char err_buf[256] = { 0, };
-               ErrPrint("Heap: %s\n", strerror_r(errno, err_buf, sizeof(err_buf)));
+               ErrPrint("Heap: %d\n", strerror_r(errno, err_buf, sizeof(err_buf)));
                DbgFree(item);
                return WIDGET_ERROR_OUT_OF_MEMORY;
        }
@@ -260,7 +260,7 @@ static int icon_path_cb(const char *pkgname, const char *val, void *data)
        item->icon = strdup(val);
        if (!item->icon) {
                char err_buf[256] = { 0, };
-               ErrPrint("Heap: %s\n", strerror_r(errno, err_buf, sizeof(err_buf)));
+               ErrPrint("Heap: %d\n", strerror_r(errno, err_buf, sizeof(err_buf)));
                return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 
@@ -317,7 +317,7 @@ static int change_pkgname_cb(const char *pkgname, const char *val, void *data)
        new_pkgname = strdup(val);
        if (!new_pkgname) {
                char err_buf[256] = { 0, };
-               ErrPrint("Heap: %s\n", strerror_r(errno, err_buf, sizeof(err_buf)));
+               ErrPrint("Heap: %d\n", strerror_r(errno, err_buf, sizeof(err_buf)));
                return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 

diff --git a/src/add-viewer_util.c b/src/add-viewer_util.c
index 4e718276eece5950e1f7846bf1781a555c2008ff..272d2dace9c6a78d027f7040f44dc64af9e6566b 100755 (executable)
--- a/src/add-viewer_util.c
+++ b/src/add-viewer_util.c
@@ -81,7 +81,7 @@ HAPI char *add_viewer_util_highlight_keyword(const char *name, const char *filte
        highlighted_name = malloc(ret_len);
        if (!highlighted_name) {
                char err_buf[256] = { 0, };
-               ErrPrint("Heap: %s\n", strerror_r(errno, err_buf, sizeof(err_buf)));
+               ErrPrint("Heap: %d\n", strerror_r(errno, err_buf, sizeof(err_buf)));
                return NULL;
        }
 

diff --git a/src/moments/moments_status_view.c b/src/moments/moments_status_view.c
index 13a5325a5cfcfdf24aa7cd50400bcf5c725afc8b..accc3a5b66910a3ee4a95b09cd83645bd3631f3e 100755 (executable)
--- a/src/moments/moments_status_view.c
+++ b/src/moments/moments_status_view.c
@@ -148,7 +148,7 @@ void moments_status_view_destroy(void)
 
 void moments_status_battery_update(int percent, int converted_percent, bool is_charging)
 {
-       _D("Update battery text[%d%], icon[%d], is_charging[%d]", percent, converted_percent, is_charging);
+       _D("Update battery text[%d], icon[%d], is_charging[%d]", percent, converted_percent, is_charging);
 
        char battery_text[5] = {0, };
        char battery_icon[PATH_MAX] = {0, };

diff --git a/src/notification/noti_time.c b/src/notification/noti_time.c
index 0fb67d3964f64af56b9c13af93f4ee0488802e28..a387cd9bd3de3f32308abb13ee34db001c88f932 100755 (executable)
--- a/src/notification/noti_time.c
+++ b/src/notification/noti_time.c
@@ -554,7 +554,7 @@ static int _get_date(time_t *intime, char *buf, int buf_len)
                _E("formatted_str_len is less than 0");
 
        buf = i18n_ustring_copy_au_n(buf, u_formatted_str, (int32_t)buf_len);
-       _SD("date:(%d)[%s][%d]", formatted_str_len, buf, *intime);
+       _SD("date:(%d)[%s][%ld]", formatted_str_len, buf, (long)*intime);
 
        return 0;
 }
@@ -588,7 +588,7 @@ static int _get_ampm(time_t *intime, char *buf, int buf_len, int *ampm_len)
        (*ampm_len) = i18n_ustring_get_length(u_formatted_str);
 
        buf = i18n_ustring_copy_au_n(buf, u_formatted_str, (int32_t)buf_len);
-       _SD("ampm:(%d)[%s][%d]", formatted_str_len, buf, *intime);
+       _SD("ampm:(%d)[%s][%ld]", formatted_str_len, buf, (long)*intime);
 
        return 0;
 }
@@ -624,7 +624,7 @@ static int _get_time(time_t *intime, char *buf, int buf_len, Eina_Bool is_time_2
                _E("formatted_str_len is less than 0");
 
        buf = i18n_ustring_copy_au_n(buf, u_formatted_str, (int32_t)buf_len);
-       _SD("time:(%d)[%s][%d]", formatted_str_len, buf, *intime);
+       _SD("time:(%d)[%s][%ld]", formatted_str_len, buf, (long)*intime);
 
        return 0;
 }

diff --git a/src/pkgmgr.c b/src/pkgmgr.c
index 5de4b1f85af5b98936a12995cf3d9cd05e51ff6c..91552cc91ef00cb136720cb1075553df15fdf5c9 100755 (executable)
--- a/src/pkgmgr.c
+++ b/src/pkgmgr.c
@@ -409,7 +409,7 @@ static int _get_widget_list_cb(const char *widget_id, int is_prime, void *data)
        id = strdup(widget_id);
        retv_if(!id, -1);
 
-       _D("widget_id(%s %d) with %s", id, is_prime, data);
+       _D("widget_id(%s %d) with %s", id, is_prime, (char* )data);
 
        pkg_mgr_info.widget_list = eina_list_append(pkg_mgr_info.widget_list, id);
 

diff --git a/src/util.c b/src/util.c
index 9d7b193374fed1174ae74ed4641bf177a20600aa..e8a2634dba5c6f1c656d3097fc98cb54e55e6cf7 100755 (executable)
--- a/src/util.c
+++ b/src/util.c
@@ -215,10 +215,10 @@ HAPI void _evas_object_event_changed_size_hints_cb(void *data, Evas *e, Evas_Obj
        Evas_Coord w, h;
 
        evas_object_size_hint_min_get(obj, &w, &h);
-       _D("%s : min (%d:%d)", data, w, h);
+       _D("%s : min (%d:%d)", (char* )data, w, h);
 
        evas_object_size_hint_max_get(obj, &w, &h);
-       _D("%s : max (%d:%d)", data, w, h);
+       _D("%s : max (%d:%d)", (char* )data, w, h);
 }
 
 
@@ -231,13 +231,13 @@ HAPI void _evas_object_resize_cb(void *data, Evas *e, Evas_Object *obj, void *ev
        Evas_Coord h;
 
        evas_object_geometry_get(obj, &x, &y, &w, &h);
-       _D("%s(%p) is resized to (%d, %d, %d, %d)", data, obj, x, y, w, h);
+       _D("%s(%p) is resized to (%d, %d, %d, %d)", (char* )data, obj, x, y, w, h);
 
        evas_object_size_hint_min_get(obj, &w, &h);
-       _D("%s : min (%d:%d)", data, w, h);
+       _D("%s : min (%d:%d)", (char* )data, w, h);
 
        evas_object_size_hint_max_get(obj, &w, &h);
-       _D("%s : max (%d:%d)", data, w, h);
+       _D("%s : max (%d:%d)", (char* )data, w, h);
 }
 
 
@@ -318,7 +318,7 @@ HAPI void apps_util_post_message_for_launch_fail(const char *name)
 
 static void _svc_cb(bundle *b, int request_code, appsvc_result_val result, void *data)
 {
-       _D("Request code : %d");
+       _D("Request code : %d", request_code);
 
        if (result != APPSVC_RES_OK) {
                char* inform;