From 5b0a3101459e360ea4743b3cd56aefa9b5b20093 Mon Sep 17 00:00:00 2001 From: Daniel Zaoui Date: Wed, 29 Nov 2017 11:15:32 +0200 Subject: [PATCH] Fix warnings --- src/lib/clouseau_debug.c | 8 +++---- src/lib/extensions/focus_inspector/gui.c | 8 +++---- src/lib/extensions/focus_inspector/main.c | 21 +++++++++---------- .../extensions/focus_inspector/tree_view.c | 4 ++-- .../extensions/objects_introspection/main.c | 14 ++++++------- 5 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/lib/clouseau_debug.c b/src/lib/clouseau_debug.c index c50e6a3..fb2d814 100644 --- a/src/lib/clouseau_debug.c +++ b/src/lib/clouseau_debug.c @@ -74,7 +74,7 @@ static int _win_screenshot_op = EINA_DEBUG_OPCODE_INVALID; static int _focus_manager_list_op = EINA_DEBUG_OPCODE_INVALID; static int _focus_manager_detail_op = EINA_DEBUG_OPCODE_INVALID; -static Eet_Data_Descriptor *managers = NULL, *manager_details = NULL; +static Eet_Data_Descriptor *manager_details = NULL; #include "clouseau_focus_serialization.x" enum { @@ -921,13 +921,13 @@ _main_loop_win_screenshot_cb(Eina_Debug_Session *session, int srcid, void *buffe WRAPPER_TO_XFER_MAIN_LOOP(_win_screenshot_cb) static Eina_Bool -_only_manager(const void *container, void *data, void *fdata) +_only_manager(const void *container EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { return efl_isa(data, EFL_UI_FOCUS_MANAGER_INTERFACE); } static void -_main_loop_focus_manager_list_cb(Eina_Debug_Session *session, int srcid, void *buffer, int size) +_main_loop_focus_manager_list_cb(Eina_Debug_Session *session, int srcid, void *buffer EINA_UNUSED, int size EINA_UNUSED) { Eina_Iterator *obj_iterator, *manager_iterator; Eina_Array *array; @@ -1007,7 +1007,7 @@ _fetch_children(Efl_Ui_Focus_Manager *m) } static Eina_Bool -_main_loop_focus_manager_detail_cb(Eina_Debug_Session *session, int srcid, void *buffer, int size) +_main_loop_focus_manager_detail_cb(Eina_Debug_Session *session, int srcid, void *buffer, int size EINA_UNUSED) { Clouseau_Focus_Manager_Data *res; uint64_t ptr64; diff --git a/src/lib/extensions/focus_inspector/gui.c b/src/lib/extensions/focus_inspector/gui.c index 0c0b532..d96c76c 100644 --- a/src/lib/extensions/focus_inspector/gui.c +++ b/src/lib/extensions/focus_inspector/gui.c @@ -6,7 +6,7 @@ static Evas_Object *table, *managers, *redirect, *history, *scroller; static Elm_Genlist_Item_Class *itc; static char* -_text_get(void *data, Elm_Genlist *list, const char *part) +_text_get(void *data, Elm_Genlist *list EINA_UNUSED, const char *part EINA_UNUSED) { Efl_Ui_Focus_Manager *manager = data; Eina_Strbuf *res = eina_strbuf_new(); @@ -16,7 +16,7 @@ _text_get(void *data, Elm_Genlist *list, const char *part) } static void -_sel_relation_func(void *data, Evas_Object *obj, void *event_info) +_sel_relation_func(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Instance *inst = evas_object_data_get(obj, "__instance"); tree_view_relation_display(inst, elm_radio_state_value_get(obj)); @@ -95,7 +95,7 @@ ui_create(Instance *inst, Evas_Object *obj) } static void -_sel(void *data, Evas_Object *obj, void *event_info) +_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { com_defailt_manager(data, elm_object_item_data_get(event_info)); } @@ -129,7 +129,7 @@ EAPI void ui_manager_data_arrived(Instance *inst, Clouseau_Focus_Manager_Data *data) { Clouseau_Focus_Relation *rel; - Evas_Object *box, *o; + Evas_Object *o; Eina_List *n, *sorted = NULL; EINA_LIST_FREE(inst->realized.objects, o) diff --git a/src/lib/extensions/focus_inspector/main.c b/src/lib/extensions/focus_inspector/main.c index e3244e4..db69acd 100644 --- a/src/lib/extensions/focus_inspector/main.c +++ b/src/lib/extensions/focus_inspector/main.c @@ -9,19 +9,19 @@ static Instance inst; static int _focus_manager_list_op = EINA_DEBUG_OPCODE_INVALID; static int _focus_manager_detail_op = EINA_DEBUG_OPCODE_INVALID; -static Eet_Data_Descriptor *managers = NULL, *manager_details = NULL; +static Eet_Data_Descriptor *manager_details = NULL; #include "../../clouseau_focus_serialization.x" static Eina_Bool -_main_loop_focus_manager_list_cb(Eina_Debug_Session *session, int src, void *buffer, int size) +_main_loop_focus_manager_list_cb(Eina_Debug_Session *session, int src EINA_UNUSED, void *buffer, int size) { - int managers = size / sizeof(Efl_Ui_Focus_Manager*); - Efl_Ui_Focus_Manager *manager_arr[managers]; + int nb_managers = size / sizeof(Efl_Ui_Focus_Manager*); + Efl_Ui_Focus_Manager *manager_arr[nb_managers]; Clouseau_Extension *ext = eina_debug_session_data_get(session); memcpy(manager_arr, buffer, size); - ui_managers_add(ext->data, manager_arr, managers); + ui_managers_add(ext->data, manager_arr, nb_managers); return EINA_TRUE; } @@ -29,7 +29,7 @@ _main_loop_focus_manager_list_cb(Eina_Debug_Session *session, int src, void *buf WRAPPER_TO_XFER_MAIN_LOOP(_focus_manager_list_cb) static Eina_Bool -_main_loop_focus_manager_detail_cb(Eina_Debug_Session *session, int src, void *buffer, int size) +_main_loop_focus_manager_detail_cb(Eina_Debug_Session *session, int src EINA_UNUSED, void *buffer, int size) { Clouseau_Extension *ext = eina_debug_session_data_get(session); Clouseau_Focus_Manager_Data *pd; @@ -53,7 +53,6 @@ static void _session_changed(Clouseau_Extension *ext) { int i = 0; - Instance *inst = ext->data; Eina_Debug_Opcode *ops = _ops(); while (ops[i].opcode_name) @@ -74,18 +73,18 @@ _app_changed(Clouseau_Extension *ext) } EAPI void -com_refresh_managers(Instance *inst) +com_refresh_managers(Instance *ext_inst) { - int i = eina_debug_session_send(inst->ext->session, inst->ext->app_id, _focus_manager_list_op, NULL, 0); + eina_debug_session_send(ext_inst->ext->session, ext_inst->ext->app_id, _focus_manager_list_op, NULL, 0); } EAPI void -com_defailt_manager(Instance *inst, Efl_Ui_Focus_Manager *manager) +com_defailt_manager(Instance *ext_inst, Efl_Ui_Focus_Manager *manager) { void *tmp[1]; tmp[0] = manager; - int i = eina_debug_session_send(inst->ext->session, inst->ext->app_id, _focus_manager_detail_op, tmp, sizeof(void*)); + eina_debug_session_send(ext_inst->ext->session, ext_inst->ext->app_id, _focus_manager_detail_op, tmp, sizeof(void*)); } EAPI const char * diff --git a/src/lib/extensions/focus_inspector/tree_view.c b/src/lib/extensions/focus_inspector/tree_view.c index 4c79ccb..7e577ed 100644 --- a/src/lib/extensions/focus_inspector/tree_view.c +++ b/src/lib/extensions/focus_inspector/tree_view.c @@ -5,7 +5,7 @@ static void find(Instance *pd, void *parent, void (*found)(void *data, Instance *pd, Clouseau_Focus_Relation *relation), void *data) { - for (int i = 0; pd->realized.data->relations && i < eina_list_count(pd->realized.data->relations); ++i) + for (unsigned int i = 0; pd->realized.data->relations && i < eina_list_count(pd->realized.data->relations); ++i) { Clouseau_Focus_Relation *rel; rel = eina_list_nth(pd->realized.data->relations, i); @@ -201,7 +201,7 @@ _arrow_from_to(Evas_Object *vg, Eina_Position2D from, Eina_Position2D to) } static void -_geom_change(void *data, Evas *e, Evas_Object *obj, void *event_info) +_geom_change(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Eina_Rectangle pos1, pos2; Eina_Position2D from, to; diff --git a/src/lib/extensions/objects_introspection/main.c b/src/lib/extensions/objects_introspection/main.c index 5de0342..cea4201 100644 --- a/src/lib/extensions/objects_introspection/main.c +++ b/src/lib/extensions/objects_introspection/main.c @@ -348,14 +348,14 @@ _snapshot_load(Clouseau_Extension *ext, void *buffer, int size, int version EINA } static void -_obj_info_expand_request_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info) +_obj_info_expand_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Elm_Object_Item *glit = event_info; elm_genlist_item_expanded_set(glit, EINA_TRUE); } static void -_obj_info_contract_request_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info) +_obj_info_contract_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Elm_Object_Item *glit = event_info; elm_genlist_item_expanded_set(glit, EINA_FALSE); @@ -421,7 +421,7 @@ _obj_info_expanded_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info } static void -_obj_info_contracted_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info) +_obj_info_contracted_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Elm_Object_Item *glit = event_info; elm_genlist_item_subitems_clear(glit); @@ -651,14 +651,14 @@ _obj_info_get(Eina_Debug_Session *session, int src, void *buffer, int size) } static void -_objs_expand_request_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info) +_objs_expand_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Elm_Object_Item *glit = event_info; elm_genlist_item_expanded_set(glit, EINA_TRUE); } static void -_objs_contract_request_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info) +_objs_contract_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Elm_Object_Item *glit = event_info; elm_genlist_item_expanded_set(glit, EINA_FALSE); @@ -701,7 +701,7 @@ _objs_expanded_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info) } static void -_objs_contracted_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info) +_objs_contracted_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Elm_Object_Item *glit = event_info; elm_genlist_item_subitems_clear(glit); @@ -1042,7 +1042,7 @@ _item_realize(Instance *inst, Obj_Info *info) } static void -_jump_entry_changed(void *data, Evas_Object *obj, void *event_info) +_jump_entry_changed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { Eo *en = obj; Eo *inwin = data;