From 8aaa3502622ae06e84ff033584765a6ce1ef5399 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Thu, 1 Feb 2018 14:20:20 +0900 Subject: [PATCH] Use ERR instead of CRI if *DATA_GET* returns NULL This patch set is for remains. --- src/lib/elementary/elm_widget.h | 2 +- src/lib/evas/canvas/evas_object_box.c | 4 ++-- src/lib/evas/canvas/evas_object_grid.c | 4 ++-- src/lib/evas/canvas/evas_object_table.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index 3a8267b76b..e0df6cf245 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -765,7 +765,7 @@ Efl_Canvas_Object * _efl_ui_widget_bg_get(Efl_Ui_Widget *obj); ptr = efl_data_scope_get(o, EFL_UI_WIDGET_CLASS); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return __VA_ARGS__; \ } diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index bbe66b23e7..0a768d6cb1 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -48,7 +48,7 @@ static void _sizing_eval(Evas_Object *obj); EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ fflush(stderr); \ return; \ @@ -58,7 +58,7 @@ if (!ptr) \ EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ fflush(stderr); \ return val; \ diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index 8aab7cffd4..f323384ee6 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -49,7 +49,7 @@ struct _Evas_Object_Grid_Accessor EVAS_OBJECT_GRID_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -58,7 +58,7 @@ struct _Evas_Object_Grid_Accessor EVAS_OBJECT_GRID_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index a07461f0f3..6db28e7a16 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -105,7 +105,7 @@ struct _Evas_Object_Table_Accessor EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -114,7 +114,7 @@ if (!ptr) \ EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ }