From d3fdafe754c9dcbd92b2ce4767528710db854a67 Mon Sep 17 00:00:00 2001 From: Kiseok Chang Date: Wed, 19 Dec 2018 15:38:24 +0900 Subject: [PATCH] Fix dlog format errors Change-Id: Id2f8a10ed4a900f5fe580c0cb271561069d7e59e Signed-off-by: Kiseok Chang --- src/common/utils.c | 6 +++--- src/data/system/settings_language.c | 2 +- src/main.c | 2 +- src/view/common/view_datetime.c | 31 +++++++++++++------------------ src/view/system/view_clock.c | 12 +++++------- src/view/system/view_clock_mode.c | 4 ++-- 6 files changed, 25 insertions(+), 32 deletions(-) mode change 100644 => 100755 src/data/system/settings_language.c mode change 100644 => 100755 src/main.c diff --git a/src/common/utils.c b/src/common/utils.c index 90fe959..144be2f 100755 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -578,20 +578,20 @@ void utils_dbg_obj_focus(Evas_Object *item, int num) }; if (!item) { - dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] item (%d) == NULL", __FILE__, __LINE__); + _ERR("item == NULL"); return; } text = elm_object_text_get(item); type = elm_object_widget_type_get(item); - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] ITEM: %s TYPE: %s [%p]", __FILE__, __LINE__, text, type, item); + _ERR("ITEM: %s TYPE: %s [%p]", text, type, item); for (dir = ELM_FOCUS_PREVIOUS; dir < sizeof(dir_names) / sizeof(dir_names[0]); ++dir) { focus_to = elm_object_focus_next_object_get(item, dir); text = elm_object_text_get(focus_to); type = elm_object_widget_type_get(focus_to); - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] >>>>>>>>>>> %s: %s TYPE: %s [%p]", __FILE__, __LINE__, dir_names[dir], text, type, focus_to); + _DBG(">>>>>>>>>>> %s: %s TYPE: %s [%p]", dir_names[dir], text, type, focus_to); } } diff --git a/src/data/system/settings_language.c b/src/data/system/settings_language.c old mode 100644 new mode 100755 index 97cba32..2240781 --- a/src/data/system/settings_language.c +++ b/src/data/system/settings_language.c @@ -80,7 +80,7 @@ char *settings_language_get_language_display_str(void) r = i18n_ulocale_get_display_language(lang, lang, res, sizeof(res)); if (r < 0) { - _ERR("Failed to get display language: %s.", get_last_result()); + _ERR("Failed to get display language: %s.", get_error_message(get_last_result())); free(lang); return strdup(STR_UNKNOWN); } diff --git a/src/main.c b/src/main.c old mode 100644 new mode 100755 index 9dec304..c12437c --- a/src/main.c +++ b/src/main.c @@ -180,7 +180,7 @@ static void _app_control(app_control_h control, void *data) v_class = appctl_subview_values[i].class_getter(); viewmgr_pop_all_views(); if (!viewmgr_push_view(v_class->view_id)) - _ERR("View %d push failed", v_class->view_id); + _ERR("View %p push failed", v_class->view_id); free(subview); return; } diff --git a/src/view/common/view_datetime.c b/src/view/common/view_datetime.c index e246a4a..e44b3aa 100755 --- a/src/view/common/view_datetime.c +++ b/src/view/common/view_datetime.c @@ -65,14 +65,14 @@ Evas_Object *view_datetime_create(Evas_Object *parent, const char *part, bool is datetime_data = calloc(1, sizeof(view_datetime_data_t)); if (!datetime_data) { - dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] !datetime_data", __FILE__, __LINE__); + _ERR("datetime_data == NULL"); return NULL; } datetime = utils_add_datetime(parent, part, field_year, field_month, field_date, field_hour, field_minute, field_ampm, NULL); if (!datetime) { - dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] datetime == NULL", __FILE__, __LINE__); + _ERR("datetime == NULL"); free(datetime_data); return NULL; } @@ -111,7 +111,7 @@ static void _datetime_destroy_cb(void *data, Evas *e, Evas_Object *obj, void *ev static void _DBG_datetime(Evas_Object *datetime) { const char *datetime_style = elm_object_style_get(datetime); - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] DATE_TIME: STYLE: %s", __FILE__, __LINE__, datetime_style); + _DBG("DATE_TIME: STYLE: %s", datetime_style); int i; for (i = 0; i <= 5; ++i) { @@ -120,7 +120,7 @@ static void _DBG_datetime(Evas_Object *datetime) Evas_Object *spinner = elm_object_part_content_get(datetime, buf); if (!spinner) { - dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] part(%s) == NULL", __FILE__, __LINE__, buf); + _ERR("part(%s) == NULL", buf); continue; } @@ -133,8 +133,7 @@ static void _DBG_datetime(Evas_Object *datetime) const char *btn_style = elm_object_style_get(btn); const char *txt = elm_object_text_get(btn); - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] {Part(%s) TYPE:(%s) STYLE: %s} INC: %s DEC: %s BTN: %s-[%s]", - __FILE__, __LINE__, + _DBG("{Part(%s) TYPE:(%s) STYLE: %s} INC: %s DEC: %s BTN: %s-[%s]", buf, evas_object_type_get(spinner), spinner_style, @@ -150,7 +149,7 @@ Evas_Object *view_datetime_get_spinner(Evas_Object *datetime, int field) Evas_Object *spinner = elm_object_part_content_get(datetime, buf); if (!spinner) { - dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] part(%s) == NULL", __FILE__, __LINE__, buf); + _ERR("part(%s) == NULL", buf); return NULL; } @@ -171,14 +170,11 @@ static void _datetime_btn_keydown_cb(int id, void *data, Evas *e, Evas_Object * if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)) { evas_object_hide(datetime_data->popup); - dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_BACK]", - __FILE__, __LINE__); + _DBG("btn PRESSED [KEY_ID_BACK]"); } else if (!strcmp(ev->keyname, KEY_UP)) { - dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_UP]", - __FILE__, __LINE__); + _DBG("btn PRESSED [KEY_ID_UP]"); } else if (!strcmp(ev->keyname, KEY_DOWN)) { - dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_DOWN]", - __FILE__, __LINE__); + _DBG("btn PRESSED [KEY_ID_DOWN]"); } if (datetime_data->hide_cb) @@ -199,19 +195,19 @@ static void _set_spinner_btn_callbacks(Evas_Object *popup, Evas_Object *dt, int static void _datetime_focused_cb(int id, void *data, Evas_Object *obj, Elm_Object_Item *item) { - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] Datetime %p focused", __FILE__, __LINE__, obj); + _INFO("Datetime %p focused", obj); elm_win_focus_highlight_style_set(data, "datetime"); } static void _datetime_unfocused_cb(int id, void *data, Evas_Object *obj, Elm_Object_Item *item) { - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] Datetime %p unfocused", __FILE__, __LINE__, obj); + _INFO("Datetime %p unfocused", obj); elm_win_focus_highlight_style_set(data, "default"); } static void _datetime_keydown_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev) { - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] Datetime %p keydown %s", __FILE__, __LINE__, obj, ev->key); + _INFO("Datetime %p keydown %s", obj, ev->key); Evas_Object *neighbour = NULL; @@ -220,6 +216,5 @@ static void _datetime_keydown_cb(int id, void *data, Evas *e, Evas_Object *obj, elm_object_focus_set(neighbour, EINA_TRUE); } - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] Datetime %p keydown %s neighbour: %s(%p)", __FILE__, __LINE__, - obj, ev->key, evas_object_type_get(neighbour), neighbour); + _INFO("Datetime %p keydown %s neighbour: %s(%p)", obj, ev->key, evas_object_type_get(neighbour), neighbour); } diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c index 77e2d22..986a51a 100755 --- a/src/view/system/view_clock.c +++ b/src/view/system/view_clock.c @@ -262,7 +262,7 @@ static bool _datetime_popup_create(clock_view_priv_data *priv) { priv->datetime_popup = elm_popup_add(priv->base); if (!priv->datetime_popup) { - dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] priv->datetime_popup == NULL", __FILE__, __LINE__); + _ERR("priv->datetime_popup == NULL"); return false; } @@ -270,7 +270,7 @@ static bool _datetime_popup_create(clock_view_priv_data *priv) priv->datetime_popup_datetime = view_datetime_create(priv->datetime_popup, NULL, false, _datetime_popup_hide_cb, priv); if (!priv->datetime_popup_datetime) { - dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] priv->datetime_popup == NULL", __FILE__, __LINE__); + _ERR("priv->datetime_popup == NULL"); return false; } @@ -306,8 +306,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) priv->popup = elm_popup_add(win); if (!priv->popup) { - dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] priv->popup == NULL", - __FILE__, __LINE__); + _ERR("priv->popup == NULL"); free(priv); return NULL; } @@ -320,7 +319,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) parent = elm_object_parent_widget_get(priv->popup); const char *type2 = evas_object_type_get(parent); - dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] SMP: %s P: %s", __FILE__, __LINE__, type1, type2); + _DBG("SMP: %s P: %s", type1, type2); base = utils_add_layout(win, GRP_VIEW_CLOCK, EINA_FALSE); if (!base) { @@ -460,8 +459,7 @@ void _update(void *view_data, int update_type, void *data) if (update_type != CLOCK_DISPLAY_MODE_UPDATE) return; - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] VIEW UPDATE %p, priv->view_mode_on_show=%d", - __FILE__, __LINE__, priv, priv->view_mode_on_show); + _DBG("VIEW UPDATE %p, priv->view_mode_on_show=%d", priv, priv->view_mode_on_show); priv->view_mode_on_show = (int)(long)data; SETTING_TRACE_END; diff --git a/src/view/system/view_clock_mode.c b/src/view/system/view_clock_mode.c index 9f80a11..a8d3d2c 100755 --- a/src/view/system/view_clock_mode.c +++ b/src/view/system/view_clock_mode.c @@ -121,7 +121,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev) { - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] BUTTON = %d", __FILE__, __LINE__, ev->keycode); + _DBG("BUTTON = %d", ev->keycode); if (!data) return; @@ -140,7 +140,7 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Eve static void _mouse_down_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Down *ev) { - dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] MOUSE", __FILE__, __LINE__); + _DBG("MOUSE"); viewmgr_pop_view(); viewmgr_update_view(VIEW_CLOCK, CLOCK_DISPLAY_MODE_UPDATE, (void *)(long)id); -- 2.7.4