rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=6d217be5afe584607815830bdcdde7b6ecedad1b
commit 6d217be5afe584607815830bdcdde7b6ecedad1b Author: Andrii Kroitor <[email protected]> Date: Mon Sep 12 17:47:55 2016 +0300 fix false-unused variables --- .../project_manager/project_manager_export_edj.c | 8 ++++---- .../project_manager_export_resources.c | 4 ++-- .../project_manager/project_manager_import_edc.c | 4 ++-- src/bin/resource_manager/resource_manager_load.c | 2 +- src/bin/resource_manager/resource_manager_react.c | 4 ++-- src/bin/ui/colorclass_manager.c | 2 +- src/bin/ui/cursor.c | 2 +- src/bin/ui/history_ui.c | 6 +++--- src/bin/ui/live_view/elementary/live_ctxpopup.c | 24 +++++++++++----------- src/bin/ui/live_view/elementary/live_gengrid.c | 2 -- src/bin/ui/live_view/elementary/live_genlist.c | 2 +- src/bin/ui/live_view/elementary/live_list.c | 4 +--- .../live_view/elementary/live_multibuttonentry.c | 2 -- .../ui/live_view/elementary/live_segment_control.c | 2 -- src/bin/ui/property/property_common.c | 2 +- src/bin/ui/style_manager.c | 2 +- src/bin/ui/tabs.c | 2 +- src/bin/ui/workspace/demo_group.c | 2 +- src/bin/ui/workspace/group_navigator.c | 4 ++-- src/bin/ui/workspace/highlight.c | 2 +- 20 files changed, 37 insertions(+), 45 deletions(-) diff --git a/src/bin/project_manager/project_manager_export_edj.c b/src/bin/project_manager/project_manager_export_edj.c index bd28116..d1c060c 100644 --- a/src/bin/project_manager/project_manager_export_edj.c +++ b/src/bin/project_manager/project_manager_export_edj.c @@ -21,7 +21,7 @@ /* Export develop edj file */ static Eina_Bool -_develop_edj_export_data_cb(void *data __UNUSED__, +_develop_edj_export_data_cb(void *data, int type __UNUSED__, void *event_info) { @@ -38,7 +38,7 @@ _develop_edj_export_data_cb(void *data __UNUSED__, static Eina_Bool _develop_edj_export_del_cb(void *data, int type __UNUSED__, - void *event_info __UNUSED__) + void *event_info) { Project_Thread *ptd = (Project_Thread *)data; Ecore_Exe_Event_Del *edje_pick_exit = (Ecore_Exe_Event_Del *)event_info; @@ -114,7 +114,7 @@ _develop_export(Project_Thread *ptd) /* Export release edj file */ static Eina_Bool -_data_from_edje_cc(void *data __UNUSED__, +_data_from_edje_cc(void *data, int type __UNUSED__, void *event_info) { @@ -133,7 +133,7 @@ _data_from_edje_cc(void *data __UNUSED__, static unsigned char _finish_from_release_edje_cc(void *data, int type __UNUSED__, - void *event_info __UNUSED__) + void *event_info) { Edje_Exe_Data *edje_cc_data = (Edje_Exe_Data *)data; Project_Thread *ptd = (Project_Thread *)edje_cc_data->data; diff --git a/src/bin/project_manager/project_manager_export_resources.c b/src/bin/project_manager/project_manager_export_resources.c index 62efccc..5b19ad0 100644 --- a/src/bin/project_manager/project_manager_export_resources.c +++ b/src/bin/project_manager/project_manager_export_resources.c @@ -37,7 +37,7 @@ _resources_export_feedback_cb(void *data __UNUSED__, } void -_resources_export_cancel_cb(void *data __UNUSED__, Ecore_Thread *th __UNUSED__) +_resources_export_cancel_cb(void *data, Ecore_Thread *th __UNUSED__) { Feedback_Thread_Data *ftd = (Feedback_Thread_Data *)data; Project_Thread *ptd = ecore_thread_global_data_find("ptd"); @@ -50,7 +50,7 @@ _resources_export_cancel_cb(void *data __UNUSED__, Ecore_Thread *th __UNUSED__) } void -_resources_export_end_cb(void *data __UNUSED__, Ecore_Thread *th __UNUSED__) +_resources_export_end_cb(void *data, Ecore_Thread *th __UNUSED__) { Feedback_Thread_Data *ftd = (Feedback_Thread_Data *)data; diff --git a/src/bin/project_manager/project_manager_import_edc.c b/src/bin/project_manager/project_manager_import_edc.c index 88434bb..af664ee 100644 --- a/src/bin/project_manager/project_manager_import_edc.c +++ b/src/bin/project_manager/project_manager_import_edc.c @@ -21,7 +21,7 @@ static Eina_Bool -_data_from_edje_cc(void *data __UNUSED__, +_data_from_edje_cc(void *data, int type __UNUSED__, void *event_info) { @@ -40,7 +40,7 @@ _data_from_edje_cc(void *data __UNUSED__, static Eina_Bool _finish_from_edje_cc(void *data, int type __UNUSED__, - void *event_info __UNUSED__) + void *event_info) { Edje_Exe_Data *edje_cc_data = (Edje_Exe_Data *)data; Project_Thread *ptd = (Project_Thread *)edje_cc_data->data; diff --git a/src/bin/resource_manager/resource_manager_load.c b/src/bin/resource_manager/resource_manager_load.c index cd03bc8..b896628 100644 --- a/src/bin/resource_manager/resource_manager_load.c +++ b/src/bin/resource_manager/resource_manager_load.c @@ -208,7 +208,7 @@ _sound_resources_load(Project *project) } Eina_Bool -_font_resources_load(Project *project __UNUSED__) +_font_resources_load(Project *project) { Font2 *res; Eina_List *fonts; diff --git a/src/bin/resource_manager/resource_manager_react.c b/src/bin/resource_manager/resource_manager_react.c index 29da11c..0ef7630 100644 --- a/src/bin/resource_manager/resource_manager_react.c +++ b/src/bin/resource_manager/resource_manager_react.c @@ -360,7 +360,7 @@ image_deleted(void *data, static void _style_added(void *data, Evas_Object *obj __UNUSED__, - void *ei __UNUSED__) + void *ei) { Style2 *res; const char *name = (const char *)ei; @@ -417,7 +417,7 @@ _group_data_renamed(void *data, group_data->common.name = eina_stringshare_add(ren->new_name); } static void -_editor_part_added_cb(void *data __UNUSED__, +_editor_part_added_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info) { diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c index b1f4249..7bfab7f 100644 --- a/src/bin/ui/colorclass_manager.c +++ b/src/bin/ui/colorclass_manager.c @@ -60,7 +60,7 @@ static Colorclasses_Manager mng; static void _validation(void *data, - Evas_Object *obj __UNUSED__, + Evas_Object *obj, void *event_info __UNUSED__) { Evas_Object *popup = data; diff --git a/src/bin/ui/cursor.c b/src/bin/ui/cursor.c index 8f3dfbf..380e1a4 100644 --- a/src/bin/ui/cursor.c +++ b/src/bin/ui/cursor.c @@ -100,7 +100,7 @@ _eflete_cursor_mouse_in(void *data __UNUSED__, static void _eflete_cursor_mouse_out(void *data __UNUSED__, - Evas *e __UNUSED__, + Evas *e, Evas_Object *obj, void *event_info) { diff --git a/src/bin/ui/history_ui.c b/src/bin/ui/history_ui.c index 8a35d88..930a85b 100644 --- a/src/bin/ui/history_ui.c +++ b/src/bin/ui/history_ui.c @@ -145,7 +145,7 @@ _undo_item_cleanup(void *data, static void _undo_item_selected(void *data, Evas_Object *obj __UNUSED__, - void *ei __UNUSED__) + void *ei) { History_New_UI_data *hd = data; int i; @@ -223,7 +223,7 @@ history_ui_update(Evas_Object *obj) } static void -_btn_undo_cb(void *data __UNUSED__, +_btn_undo_cb(void *data, Evas_Object *obj __UNUSED__, void *eo __UNUSED__) { @@ -232,7 +232,7 @@ _btn_undo_cb(void *data __UNUSED__, } static void -_btn_redo_cb(void *data __UNUSED__, +_btn_redo_cb(void *data, Evas_Object *obj __UNUSED__, void *eo __UNUSED__) { diff --git a/src/bin/ui/live_view/elementary/live_ctxpopup.c b/src/bin/ui/live_view/elementary/live_ctxpopup.c index 980f425..e129542 100644 --- a/src/bin/ui/live_view/elementary/live_ctxpopup.c +++ b/src/bin/ui/live_view/elementary/live_ctxpopup.c @@ -82,7 +82,7 @@ _ctx_popup_create(Evas_Object *parent, } static void -_labels_icons_vertical_3items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_labels_icons_vertical_3items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 1, false, true, true); @@ -90,7 +90,7 @@ _labels_icons_vertical_3items_cb(void *data __UNUSED__, Evas_Object *obj, void * } static void -_nolabels_icons_vertical_3items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_nolabels_icons_vertical_3items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 1, false, true, false); @@ -98,7 +98,7 @@ _nolabels_icons_vertical_3items_cb(void *data __UNUSED__, Evas_Object *obj, void } static void -_labels_noicons_vertical_3items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_labels_noicons_vertical_3items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 1, false, false, true); @@ -106,7 +106,7 @@ _labels_noicons_vertical_3items_cb(void *data __UNUSED__, Evas_Object *obj, void } static void -_labels_icons_horizontal_3items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_labels_icons_horizontal_3items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 1, true, true, true); @@ -114,7 +114,7 @@ _labels_icons_horizontal_3items_cb(void *data __UNUSED__, Evas_Object *obj, void } static void -_nolabels_icons_horizontal_3items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_nolabels_icons_horizontal_3items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 1, true, true, false); @@ -122,7 +122,7 @@ _nolabels_icons_horizontal_3items_cb(void *data __UNUSED__, Evas_Object *obj, vo } static void -_labels_noicons_horizontal_3items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_labels_noicons_horizontal_3items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 1, true, false, true); @@ -130,7 +130,7 @@ _labels_noicons_horizontal_3items_cb(void *data __UNUSED__, Evas_Object *obj, vo } static void -_labels_icons_vertical_30items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_labels_icons_vertical_30items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 10, false, true, true); @@ -138,7 +138,7 @@ _labels_icons_vertical_30items_cb(void *data __UNUSED__, Evas_Object *obj, void } static void -_nolabels_icons_vertical_30items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_nolabels_icons_vertical_30items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 10, false, true, false); @@ -146,7 +146,7 @@ _nolabels_icons_vertical_30items_cb(void *data __UNUSED__, Evas_Object *obj, voi } static void -_labels_noicons_vertical_30items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_labels_noicons_vertical_30items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 10, false, false, true); @@ -154,7 +154,7 @@ _labels_noicons_vertical_30items_cb(void *data __UNUSED__, Evas_Object *obj, voi } static void -_labels_icons_horizontal_30items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_labels_icons_horizontal_30items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 10, true, true, true); @@ -162,7 +162,7 @@ _labels_icons_horizontal_30items_cb(void *data __UNUSED__, Evas_Object *obj, voi } static void -_nolabels_icons_horizontal_30items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_nolabels_icons_horizontal_30items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 10, true, true, false); @@ -170,7 +170,7 @@ _nolabels_icons_horizontal_30items_cb(void *data __UNUSED__, Evas_Object *obj, v } static void -_labels_noicons_horizontal_30items_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) +_labels_noicons_horizontal_30items_cb(void *data, Evas_Object *obj, void *event_info) { Eina_Stringshare *style_name = evas_object_data_get(obj, "style_name"); _ctx_popup_create(obj, data, style_name, 10, true, false, true); diff --git a/src/bin/ui/live_view/elementary/live_gengrid.c b/src/bin/ui/live_view/elementary/live_gengrid.c index a084e8f..3bf4433 100644 --- a/src/bin/ui/live_view/elementary/live_gengrid.c +++ b/src/bin/ui/live_view/elementary/live_gengrid.c @@ -69,8 +69,6 @@ _gengrid_send_signal(void *data __UNUSED__, Demo_Signal *sig = (Demo_Signal *)ei; Elm_Object_Item *item = NULL; - assert(data != NULL); - item = elm_gengrid_first_item_get(obj); assert(sig != NULL); assert(sig->sig_name != NULL); diff --git a/src/bin/ui/live_view/elementary/live_genlist.c b/src/bin/ui/live_view/elementary/live_genlist.c index d5fcdea..1930ec7 100644 --- a/src/bin/ui/live_view/elementary/live_genlist.c +++ b/src/bin/ui/live_view/elementary/live_genlist.c @@ -151,7 +151,7 @@ _glist_content_get(void *data __UNUSED__, static void _glist_expanded_cb(void *data __UNUSED__, - Evas_Object *obj __UNUSED__, + Evas_Object *obj, void *event_info) { Elm_Object_Item *tree_main = (Elm_Object_Item *)event_info; diff --git a/src/bin/ui/live_view/elementary/live_list.c b/src/bin/ui/live_view/elementary/live_list.c index f22bf73..24668c3 100644 --- a/src/bin/ui/live_view/elementary/live_list.c +++ b/src/bin/ui/live_view/elementary/live_list.c @@ -88,13 +88,11 @@ _on_list_text_check(void *data __UNUSED__, static void _list_send_signal(void *data __UNUSED__, Evas_Object *obj, - void *ei __UNUSED__) + void *ei) { Demo_Signal *sig = (Demo_Signal *)ei; Elm_Object_Item *item = NULL; - assert(data != NULL); - item = elm_list_first_item_get(obj); assert(sig != NULL); assert(sig->sig_name != NULL); diff --git a/src/bin/ui/live_view/elementary/live_multibuttonentry.c b/src/bin/ui/live_view/elementary/live_multibuttonentry.c index 230c2d0..e5ec843 100644 --- a/src/bin/ui/live_view/elementary/live_multibuttonentry.c +++ b/src/bin/ui/live_view/elementary/live_multibuttonentry.c @@ -87,8 +87,6 @@ _multibutton_send_signal(void *data __UNUSED__, Demo_Signal *sig = (Demo_Signal *)ei; Elm_Object_Item *item = NULL; - assert(data != NULL); - item = elm_multibuttonentry_first_item_get(obj); assert(sig != NULL); assert(sig->sig_name != NULL); diff --git a/src/bin/ui/live_view/elementary/live_segment_control.c b/src/bin/ui/live_view/elementary/live_segment_control.c index d998a6f..2ad1749 100644 --- a/src/bin/ui/live_view/elementary/live_segment_control.c +++ b/src/bin/ui/live_view/elementary/live_segment_control.c @@ -86,8 +86,6 @@ _sc_send_signal(void *data __UNUSED__, Elm_Object_Item *item = NULL; - assert(data != NULL); - assert(sig != NULL); assert(sig->sig_name != NULL); assert(sig->source_name != NULL); diff --git a/src/bin/ui/property/property_common.c b/src/bin/ui/property/property_common.c index f16ddc9..54a97a5 100644 --- a/src/bin/ui/property/property_common.c +++ b/src/bin/ui/property/property_common.c @@ -274,7 +274,7 @@ _combobox_cc_item_del(void *data, } static void -_combobox_item_pressed_cb(void *data __UNUSED__, Evas_Object *obj, +_combobox_item_pressed_cb(void *data, Evas_Object *obj, void *event_info) { Combobox_Item *item_obj, *item = elm_object_item_data_get(event_info); diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c index f925393..9fd6ade 100644 --- a/src/bin/ui/style_manager.c +++ b/src/bin/ui/style_manager.c @@ -139,7 +139,7 @@ _on_glit_selected(void *data __UNUSED__, static void _validate(void *data, - Evas_Object *obj __UNUSED__, + Evas_Object *obj, void *event_info __UNUSED__) { Evas_Object *popup = data; diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c index 8f41c5d..d20037e 100644 --- a/src/bin/ui/tabs.c +++ b/src/bin/ui/tabs.c @@ -141,7 +141,7 @@ _content_set(void *data, static void _mode_changed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) + void *event_info) { Evas_Object *content; diff --git a/src/bin/ui/workspace/demo_group.c b/src/bin/ui/workspace/demo_group.c index 11801d8..b4e7d01 100644 --- a/src/bin/ui/workspace/demo_group.c +++ b/src/bin/ui/workspace/demo_group.c @@ -211,7 +211,7 @@ _clicked_cb(void *data, } static Evas_Object * -_content_get(void *data __UNUSED__, +_content_get(void *data, Evas_Object *obj, const char *part) { diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c index b3acddf..6624f44 100644 --- a/src/bin/ui/workspace/group_navigator.c +++ b/src/bin/ui/workspace/group_navigator.c @@ -770,7 +770,7 @@ _selected_cb(void *data, static void _on_part_name_changed(void *data, - Evas_Object *obj __UNUSED__, + Evas_Object *obj, void *event_info __UNUSED__) { Part_List *pl = data; @@ -791,7 +791,7 @@ _on_part_name_changed(void *data, static void _state_validate(void *data, - Evas_Object *obj __UNUSED__, + Evas_Object *obj, void *event_info __UNUSED__) { Part_List *pl = data; diff --git a/src/bin/ui/workspace/highlight.c b/src/bin/ui/workspace/highlight.c index 6f3fab1..7824ae8 100644 --- a/src/bin/ui/workspace/highlight.c +++ b/src/bin/ui/workspace/highlight.c @@ -445,7 +445,7 @@ _handler_up_cb(void *data, static void _handler_mouse_in_cb(void *data, Evas *evas __UNUSED__, - Evas_Object *obj __UNUSED__, + Evas_Object *obj, void *event_info __UNUSED__) { Highlight *highlight = (Highlight *)data; --
