rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=e779eafd7daecc4793060408358951efe6e97bcc
commit e779eafd7daecc4793060408358951efe6e97bcc
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Tue Jul 21 09:34:27 2015 +0300
Add error message to every abort() call
---
src/bin/history/history_part.c | 20 ++++++++---
src/bin/history/history_state.c | 10 ++++--
src/bin/project_manager/project_manager.c | 5 ++-
src/bin/project_manager/widget_manager.c | 5 ++-
src/bin/ui/blocks/property_macros.h | 55 ++++++++++++++++++++++++-------
src/bin/ui/blocks/ui_widget_list.c | 1 +
src/bin/ui/connector.c | 35 ++++++++++++++++----
src/bin/ui/editors/animator.c | 1 +
src/bin/ui/editors/colorclass_manager.c | 5 ++-
src/bin/ui/editors/sound_editor.c | 1 -
src/bin/ui/editors/style_editor.c | 5 ++-
src/bin/ui/live_view/live_view.c | 5 ++-
src/bin/ui/workspace/highlight.c | 1 +
13 files changed, 119 insertions(+), 30 deletions(-)
diff --git a/src/bin/history/history_part.c b/src/bin/history/history_part.c
index 17508c3..56f550a 100644
--- a/src/bin/history/history_part.c
+++ b/src/bin/history/history_part.c
@@ -157,7 +157,10 @@ _part_redo(Evas_Object *source, Part_Diff *change)
case ADD:
if (!workspace_edit_object_part_add(app->workspace, change->part,
change->params->type, NULL))
- abort();
+ {
+ ERR("Can't add part to workspace");
+ abort();
+ }
if (change->params->type == EDJE_PART_TYPE_IMAGE)
{
EINA_LIST_FOREACH_SAFE(change->states, l, l_next, state)
@@ -200,7 +203,10 @@ _part_redo(Evas_Object *source, Part_Diff *change)
ui_widget_list_part_selected_set(widget_list, change->part, true);
break;
default:
- abort();
+ {
+ ERR("Wrong action type");
+ abort();
+ }
break;
}
live_view_widget_style_set(app->live_view, app->project, style);
@@ -244,7 +250,10 @@ _part_undo(Evas_Object *source, Part_Diff *change)
case DEL:
if (!workspace_edit_object_part_add(app->workspace, change->part,
change->params->type, NULL))
- abort();
+ {
+ ERR("Can't add part to workspace");
+ abort();
+ }
_part_params_restore(source, change->part, change->params);
EINA_LIST_FOREACH_SAFE(change->states, l, l_next, state)
{
@@ -280,7 +289,10 @@ _part_undo(Evas_Object *source, Part_Diff *change)
ui_widget_list_part_selected_set(widget_list, change->part, true);
break;
default:
- abort();
+ {
+ ERR("Wrong action type");
+ abort();
+ }
break;
}
live_view_widget_style_set(app->live_view, app->project, style);
diff --git a/src/bin/history/history_state.c b/src/bin/history/history_state.c
index ffb1a8e..d29e287 100644
--- a/src/bin/history/history_state.c
+++ b/src/bin/history/history_state.c
@@ -593,7 +593,10 @@ _state_redo(Evas_Object *source, State_Diff *change)
change->state->value);
break;
default:
- abort();
+ {
+ ERR("Wrong action type");
+ abort();
+ }
break;
}
if (result) _history_ui_state_update(source, change);
@@ -619,7 +622,10 @@ _state_undo(Evas_Object *source, State_Diff *change)
change->type);
break;
default:
- abort();
+ {
+ ERR("Wrong action type");
+ abort();
+ }
break;
}
diff --git a/src/bin/project_manager/project_manager.c
b/src/bin/project_manager/project_manager.c
index ef1ce0c..2415183 100644
--- a/src/bin/project_manager/project_manager.c
+++ b/src/bin/project_manager/project_manager.c
@@ -366,7 +366,10 @@ _project_linked_images_copy(Project_Thread *worker)
edje_edit_obj = edje_edit_object_add(e);
if (!edje_object_file_set(edje_edit_obj, worker->project->saved_edj,
eina_list_data_get(list)))
- abort();
+ {
+ ERR("Can't set object file");
+ abort();
+ }
ecore_thread_main_loop_end();
edje_file_collection_list_free(list);
diff --git a/src/bin/project_manager/widget_manager.c
b/src/bin/project_manager/widget_manager.c
index a8ccdd8..e6ac33f 100644
--- a/src/bin/project_manager/widget_manager.c
+++ b/src/bin/project_manager/widget_manager.c
@@ -313,7 +313,10 @@ wm_style_data_load(Style *style, Evas *e, Eina_File
*mmap_file)
edje_edit_obj = edje_edit_object_add(e);
if (!edje_object_mmap_set(edje_edit_obj, mmap_file, style->full_group_name))
- abort();
+ {
+ ERR("Can't set mmap object");
+ abort();
+ }
edje_object_freeze(edje_edit_obj);
evas_object_freeze_events_set(edje_edit_obj, true);
diff --git a/src/bin/ui/blocks/property_macros.h
b/src/bin/ui/blocks/property_macros.h
index 68065b8..f620883 100644
--- a/src/bin/ui/blocks/property_macros.h
+++ b/src/bin/ui/blocks/property_macros.h
@@ -154,7 +154,10 @@ _on_##MEMBER##_##VALUE##_change(void *data, \
TYPE old_value = edje_edit_##SUB##_##VALUE##_get(pd->wm_style->obj ARGS); \
value /= MULTIPLIER; \
if (!edje_edit_##SUB##_##VALUE##_set(pd->wm_style->obj ARGS, value)) \
- abort(); \
+ { \
+ ERR("edje_edit_"#SUB"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
history_diff_add(pd->wm_style->obj, PROPERTY, MODIFY, HISTORY_TYPE,
old_value, \
value, pd->wm_style->full_group_name,\
(void*)edje_edit_##SUB##_##VALUE##_set, #SUB"_"#VALUE, \
@@ -415,7 +418,10 @@ _on_##MEMBER##_##VALUE##_change(void *data, \
Eina_Bool value = elm_check_state_get(obj); \
Eina_Bool old_value = edje_edit_##SUB##_##VALUE##_get(pd->wm_style->obj
ARGS);\
if (!edje_edit_##SUB##_##VALUE##_set(pd->wm_style->obj ARGS, value)) \
- abort(); \
+ { \
+ ERR("edje_edit_"#SUB"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
history_diff_add(pd->wm_style->obj, PROPERTY, MODIFY, VAL_INT, old_value, \
value, pd->wm_style->full_group_name,\
(void*)edje_edit_##SUB##_##VALUE##_set, #SUB"_"#VALUE
ARGS_DIFF); \
@@ -517,7 +523,10 @@ _on_##MEMBER##_##VALUE##_change(void *data, \
Ewe_Combobox_Item *item = (Ewe_Combobox_Item *)event_info; \
Eina_Stringshare *old_value =
edje_edit_##SUB##_##VALUE##_get(pd->wm_style->obj ARGS); \
if (!edje_edit_##SUB##_##VALUE##_set(pd->wm_style->obj ARGS, (char
*)item->title)) \
- abort(); \
+ { \
+ ERR("edje_edit_"#SUB"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
history_diff_add(pd->wm_style->obj, PROPERTY, MODIFY, VAL_STRING,
old_value, \
item->title, pd->wm_style->full_group_name, \
(void*)edje_edit_##SUB##_##VALUE##_set, #SUB"_"#VALUE
ARGS); \
@@ -724,12 +733,18 @@ _on_group_##SUB1##_##VALUE##_change(void *data, \
if ((value CHECK value_##SUB2##_##VALUE) && (value_##SUB2##_##VALUE != 0)) \
{ \
if (!edje_edit_group_##SUB2##_##VALUE##_set(pd->wm_style->obj, value))
\
- abort(); \
+ { \
+ ERR("edje_edit_group_"#SUB2"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
elm_spinner_value_set(pd->group.SUB2##_##VALUE, value); \
value_##SUB2##_##VALUE = value; \
} \
if (!edje_edit_group_##SUB1##_##VALUE##_set(pd->wm_style->obj, value)) \
- abort(); \
+ { \
+ ERR("edje_edit_group_"#SUB1"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
if (!strcmp("min", #SUB1)) \
{ \
history_diff_add(pd->wm_style->obj, PROPERTY, CONTAINER, VAL_GROUP,
old_value_##SUB1##_##VALUE, value, \
@@ -1237,11 +1252,17 @@ _on_##MEMBER##_##VALUE##_change(void *data, \
TYPE opposite_value = edje_edit_##SUB##_##DIF_VALUE##_get(pd->wm_style->obj
PART_ITEM_ARGS); \
value /= MULTIPLIER; \
if (!edje_edit_##SUB##_##VALUE##_set(pd->wm_style->obj PART_ITEM_ARGS,
value)) \
- abort(); \
+ { \
+ ERR("edje_edit_"#SUB"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
if (value CHECK opposite_value) \
{ \
if (!edje_edit_##SUB##_##DIF_VALUE##_set(pd->wm_style->obj
PART_ITEM_ARGS, value)) \
- abort(); \
+ { \
+ ERR("edje_edit_"#SUB"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
elm_spinner_value_set(pd->state.DIF_VALUE, value); \
} \
project_changed(false); \
@@ -1271,7 +1292,10 @@ _on_##MEMBER##_##VALUE##_change(void *data, \
TYPE value = elm_spinner_value_get(obj); \
value /= MULTIPLIER; \
if (!edje_edit_##SUB##_##VALUE##_set(pd->wm_style->obj PART_ITEM_ARGS,
value)) \
- abort(); \
+ { \
+ ERR("edje_edit_"#SUB"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
project_changed(false); \
workspace_edit_object_recalc(pd->workspace); \
}
@@ -1513,11 +1537,17 @@ _on_##MEMBER##_##VALUE##_change(void *data, \
TYPE opposite_value = edje_edit_##SUB##_##DIF_VALUE##_get(pd->wm_style->obj
STATE_ARGS); \
value /= MULTIPLIER; \
if (!edje_edit_##SUB##_##VALUE##_set(pd->wm_style->obj STATE_ARGS, value)) \
- abort(); \
+ { \
+ ERR("edje_edit_"#SUB"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
if ((value CHECK opposite_value) && (opposite_value != -1)) \
{ \
if (!edje_edit_##SUB##_##DIF_VALUE##_set(pd->wm_style->obj STATE_ARGS,
value)) \
- abort(); \
+ { \
+ ERR("edje_edit_"#SUB"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
elm_spinner_value_set(pd->state.DIF_VALUE, value); \
} \
history_diff_add(pd->wm_style->obj, PROPERTY, MODIFY, HISTORY_TYPE,
old_value, \
@@ -1779,7 +1809,10 @@ _on_##MEMBER##_##VALUE##_change(void *data, \
pd->wm_part->curr_state, \
pd->wm_part->curr_state_value, \
r, g, b, a))\
- abort(); \
+ { \
+ ERR("edje_edit_"#SUB"_"#VALUE"_set failed"); \
+ abort(); \
+ } \
evas_object_color_set(pd->MEMBER.VALUE##_obj, r*a/255, g*a/255, b*a/255,
a); \
if ((r != old_r) || (g != old_g) || (b != old_b) || (a != old_a)) \
history_diff_add(pd->wm_style->obj, PROPERTY, MODIFY, VAL_FOUR, old_r,
old_g, old_b, \
diff --git a/src/bin/ui/blocks/ui_widget_list.c
b/src/bin/ui/blocks/ui_widget_list.c
index c0b9494..8e90df9 100644
--- a/src/bin/ui/blocks/ui_widget_list.c
+++ b/src/bin/ui/blocks/ui_widget_list.c
@@ -1292,6 +1292,7 @@ ui_widget_list_part_add(Evas_Object *object, Style
*style, const char *name)
}
else
{
+ ERR("Wrong style type");
abort();
}
diff --git a/src/bin/ui/connector.c b/src/bin/ui/connector.c
index ed5fa71..6b4e646 100644
--- a/src/bin/ui/connector.c
+++ b/src/bin/ui/connector.c
@@ -163,7 +163,10 @@ _above_part(void *data,
if (!part) return;
history_diff_add(style->obj, PART_TARGET, RESTACK, part->name);
if (!workspace_edit_object_part_above(ap->workspace, part->name))
- abort();
+ {
+ ERR("workspace_edit_object_part_above returned FALSE");
+ abort();
+ }
live_view_widget_style_set(ap->live_view, ap->project, style);
project_changed(true);
}
@@ -184,7 +187,10 @@ _below_part(void *data,
if (!part) return;
history_diff_add(style->obj, PART_TARGET, RESTACK, part->name);
if (!workspace_edit_object_part_below(ap->workspace, part->name))
- abort();
+ {
+ ERR("workspace_edit_object_part_below returned FALSE");
+ abort();
+ }
live_view_widget_style_set(ap->live_view, ap->project, style);
project_changed(true);
}
@@ -263,7 +269,10 @@ _show_part(void *data,
assert(part_name != NULL);
if (!workspace_edit_object_visible_set(ap->workspace, part_name, true))
- abort();
+ {
+ ERR("Can't make workspace_edit_object visible");
+ abort();
+ }
}
/*
@@ -323,7 +332,10 @@ _hide_part(void *data,
assert(part_name != NULL);
if (!workspace_edit_object_visible_set(ap->workspace, part_name, false))
- abort();
+ {
+ ERR("Can't hide workspace_edit_object");
+ abort();
+ }
}
static void
@@ -436,7 +448,10 @@ _add_layout_cb(void *data,
}
if (!edje_edit_group_add(ap->project->global_object, name))
- abort();
+ {
+ ERR("Can't add group");
+ abort();
+ }
pm_save_to_dev(ap->project, NULL, true);
layout = wm_style_add(name, name, LAYOUT, NULL);
@@ -1001,7 +1016,10 @@ _progress_end(void *data, PM_Project_Result result)
break;
}
default:
- abort();
+ {
+ ERR("Wrong result");
+ abort();
+ }
}
#ifdef HAVE_ENVENTOR
@@ -1643,7 +1661,10 @@ _selected_layout_delete(Evas_Object *genlist, App_Data
*ap)
pm_save_to_dev(ap->project, NULL, true);
evas_object_del(style->obj);
if (!edje_edit_group_del(ap->project->global_object,
style->full_group_name))
- abort();
+ {
+ ERR("Can't del group");
+ abort();
+ }
ap->project->layouts = eina_inlist_remove(ap->project->layouts,
EINA_INLIST_GET(style));
ui_widget_list_layouts_reload(genlist, ap->project);
diff --git a/src/bin/ui/editors/animator.c b/src/bin/ui/editors/animator.c
index f59cde7..fcf331a 100644
--- a/src/bin/ui/editors/animator.c
+++ b/src/bin/ui/editors/animator.c
@@ -304,6 +304,7 @@ _on_bt_prog_del(void *data,
program_name = elm_object_item_part_text_get(glit, "elm.text");
if (!edje_edit_program_del(animator->style->obj, program_name))
{
+ ERR("Can't del program");
abort();
}
else
diff --git a/src/bin/ui/editors/colorclass_manager.c
b/src/bin/ui/editors/colorclass_manager.c
index 7bc6598..90dd6dc 100644
--- a/src/bin/ui/editors/colorclass_manager.c
+++ b/src/bin/ui/editors/colorclass_manager.c
@@ -302,7 +302,10 @@ _change_bg_cb(void *data,
}
break;
default:
- abort();
+ {
+ ERR("Wrong state");
+ abort();
+ }
break;
}
diff --git a/src/bin/ui/editors/sound_editor.c
b/src/bin/ui/editors/sound_editor.c
index fe9d0e4..3accf77 100644
--- a/src/bin/ui/editors/sound_editor.c
+++ b/src/bin/ui/editors/sound_editor.c
@@ -359,7 +359,6 @@ _tone_play(Sound_Editor *edit, int tone_frq)
{
ERR("Couldn't attach input and output!");
abort();
- return;
}
value = elm_slider_value_get(edit->rewind);
diff --git a/src/bin/ui/editors/style_editor.c
b/src/bin/ui/editors/style_editor.c
index f7912c9..cbe8460 100644
--- a/src/bin/ui/editors/style_editor.c
+++ b/src/bin/ui/editors/style_editor.c
@@ -1479,7 +1479,10 @@ _text_tab_update(Style_Editor *style_edit, Evas_Object
*tabs, Ewe_Tabs_Item *it,
}
}
if (!_hex_to_rgb(color, &r, &g, &b, &a))
- abort();
+ {
+ ERR("Can't convert color value");
+ abort();
+ }
evas_object_color_set(text_color, r*a/255, g*a/255, b*a/255, a);
eina_tmpstr_del(font);
diff --git a/src/bin/ui/live_view/live_view.c b/src/bin/ui/live_view/live_view.c
index d891971..7ec57ea 100644
--- a/src/bin/ui/live_view/live_view.c
+++ b/src/bin/ui/live_view/live_view.c
@@ -59,7 +59,10 @@ _change_bg_cb(void *data,
}
break;
default:
- abort();
+ {
+ ERR("Wrong state");
+ abort();
+ }
break;
}
elm_object_part_content_set(live_layout, SWALLOW_BG, bg);
diff --git a/src/bin/ui/workspace/highlight.c b/src/bin/ui/workspace/highlight.c
index 25e6109..c28cf6d 100644
--- a/src/bin/ui/workspace/highlight.c
+++ b/src/bin/ui/workspace/highlight.c
@@ -539,6 +539,7 @@ _handler_object_add(Evas_Object *parent,
cursor_type_set(border, CURSOR_FLEUR);
break;
default:
+ ERR("Wrong handler type");
abort();
break;
}
--
