From 5919e72ad2a274c5b75642833c476b937580c79f Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 19 Aug 2010 15:49:25 +0000 Subject: [PATCH] Add UNUSED where needed. SVN revision: 51407 --- src/modules/ibox/e_mod_config.c | 4 +- src/modules/ibox/e_mod_main.c | 87 +++++++++++++++------------------ 2 files changed, 41 insertions(+), 50 deletions(-) diff --git a/src/modules/ibox/e_mod_config.c b/src/modules/ibox/e_mod_config.c index fd97f38ce..62d8ef712 100644 --- a/src/modules/ibox/e_mod_config.c +++ b/src/modules/ibox/e_mod_config.c @@ -82,7 +82,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { E_Radio_Group *rg; Evas_Object *o, *of, *ob; @@ -197,7 +197,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) /****** callbacks **********/ static void -_cb_zone_policy_change(void *data, Evas_Object *obj) +_cb_zone_policy_change(void *data, Evas_Object *obj __UNUSED__) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index 6c277dc87..1382eb212 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -60,12 +60,13 @@ struct _IBox_Icon Evas_Object *o_holder2; Evas_Object *o_icon2; E_Border *border; - struct { - unsigned char start : 1; - unsigned char dnd : 1; - int x, y; - int dx, dy; - } drag; + struct + { + unsigned char start : 1; + unsigned char dnd : 1; + int x, y; + int dx, dy; + } drag; }; static IBox *_ibox_new(Evas *evas, E_Zone *zone); @@ -180,8 +181,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) Instance *inst; inst = gcc->data; - if (orient != -1) - inst->orient = orient; + if ((int)orient != -1) inst->orient = orient; switch (inst->orient) { @@ -213,16 +213,16 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) } static char * -_gc_label(E_Gadcon_Client_Class *client_class) +_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("IBox"); } static Evas_Object * -_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) { Evas_Object *o; - char buf[4096]; + char buf[PATH_MAX]; o = edje_object_add(evas); snprintf(buf, sizeof(buf), "%s/e-module-ibox.edj", @@ -232,7 +232,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) } static const char * -_gc_id_new(E_Gadcon_Client_Class *client_class) +_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__) { Config_Item *ci; @@ -241,7 +241,7 @@ _gc_id_new(E_Gadcon_Client_Class *client_class) } static void -_gc_id_del(E_Gadcon_Client_Class *client_class, const char *id) +_gc_id_del(E_Gadcon_Client_Class *client_class __UNUSED__, const char *id __UNUSED__) { /* yes - don't do this. on shutdown gadgets are deleted and this means config * for them is deleted - that means empty config is saved. keep them around @@ -257,12 +257,6 @@ _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id) */ } -/**/ -/***************************************************************************/ - -/***************************************************************************/ -/**/ - static IBox * _ibox_new(Evas *evas, E_Zone *zone) { @@ -289,7 +283,7 @@ _ibox_free(IBox *b) } static void -_ibox_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_empty_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Down *ev; IBox *b; @@ -631,7 +625,7 @@ _ibox_zone_find(E_Zone *zone) } static void -_ibox_cb_obj_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Instance *inst; @@ -641,7 +635,7 @@ _ibox_cb_obj_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -_ibox_cb_menu_post(void *data, E_Menu *m) +_ibox_cb_menu_post(void *data __UNUSED__, E_Menu *m __UNUSED__) { if (!ibox_config->menu) return; e_object_del(E_OBJECT(ibox_config->menu)); @@ -649,7 +643,7 @@ _ibox_cb_menu_post(void *data, E_Menu *m) } static void -_ibox_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_icon_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { IBox_Icon *ic; @@ -663,7 +657,7 @@ _ibox_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -_ibox_cb_icon_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_icon_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Out *ev; IBox_Icon *ic; @@ -676,7 +670,7 @@ _ibox_cb_icon_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -_ibox_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Down *ev; IBox_Icon *ic; @@ -721,7 +715,7 @@ _ibox_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info } static void -_ibox_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_icon_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Up *ev; IBox_Icon *ic; @@ -736,7 +730,7 @@ _ibox_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -_ibox_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Move *ev; IBox_Icon *ic; @@ -780,7 +774,7 @@ _ibox_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info } static void -_ibox_cb_icon_move(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_icon_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { IBox_Icon *ic; Evas_Coord x, y; @@ -792,7 +786,7 @@ _ibox_cb_icon_move(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -_ibox_cb_icon_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_icon_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { IBox_Icon *ic; Evas_Coord w, h; @@ -814,7 +808,7 @@ _ibox_cb_drag_finished(E_Drag *drag, int dropped) } static void -_ibox_cb_drop_move(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_drop_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { IBox *b; Evas_Coord x, y; @@ -825,7 +819,7 @@ _ibox_cb_drop_move(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -_ibox_cb_drop_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ibox_cb_drop_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { IBox *b; Evas_Coord w, h; @@ -895,7 +889,7 @@ _ibox_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y) } static void -_ibox_inst_cb_enter(void *data, const char *type, void *event_info) +_ibox_inst_cb_enter(void *data, const char *type __UNUSED__, void *event_info) { E_Event_Dnd_Enter *ev; Instance *inst; @@ -922,7 +916,7 @@ _ibox_inst_cb_enter(void *data, const char *type, void *event_info) } static void -_ibox_inst_cb_move(void *data, const char *type, void *event_info) +_ibox_inst_cb_move(void *data, const char *type __UNUSED__, void *event_info) { E_Event_Dnd_Move *ev; Instance *inst; @@ -934,7 +928,7 @@ _ibox_inst_cb_move(void *data, const char *type, void *event_info) } static void -_ibox_inst_cb_leave(void *data, const char *type, void *event_info) +_ibox_inst_cb_leave(void *data, const char *type __UNUSED__, void *event_info __UNUSED__) { Instance *inst; @@ -1018,7 +1012,7 @@ _ibox_inst_cb_drop(void *data, const char *type, void *event_info) } static Eina_Bool -_ibox_cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *event) +_ibox_cb_event_border_add(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Border_Add *ev; IBox *b; @@ -1053,7 +1047,7 @@ _ibox_cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *even } static Eina_Bool -_ibox_cb_event_border_remove(__UNUSED__ void *data, int type, void *event) +_ibox_cb_event_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Border_Remove *ev; IBox *b; @@ -1081,7 +1075,7 @@ _ibox_cb_event_border_remove(__UNUSED__ void *data, int type, void *event) } static Eina_Bool -_ibox_cb_event_border_iconify(__UNUSED__ void *data, __UNUSED__ int type, void *event) +_ibox_cb_event_border_iconify(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Border_Iconify *ev; IBox *b; @@ -1114,7 +1108,7 @@ _ibox_cb_event_border_iconify(__UNUSED__ void *data, __UNUSED__ int type, void * } static Eina_Bool -_ibox_cb_event_border_uniconify(__UNUSED__ void *data, __UNUSED__ int type, void *event) +_ibox_cb_event_border_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Border_Uniconify *ev; IBox *b; @@ -1144,7 +1138,7 @@ _ibox_cb_event_border_uniconify(__UNUSED__ void *data, __UNUSED__ int type, void } static Eina_Bool -_ibox_cb_event_border_icon_change(__UNUSED__ void *data, __UNUSED__ int type, void *event) +_ibox_cb_event_border_icon_change(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Border_Icon_Change *ev; IBox *b; @@ -1170,7 +1164,7 @@ _ibox_cb_event_border_icon_change(__UNUSED__ void *data, __UNUSED__ int type, vo } static Eina_Bool -_ibox_cb_event_border_urgent_change(__UNUSED__ void *data, __UNUSED__ int type, void *event) +_ibox_cb_event_border_urgent_change(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Border_Urgent_Change *ev; IBox *b; @@ -1202,7 +1196,7 @@ _ibox_cb_event_border_urgent_change(__UNUSED__ void *data, __UNUSED__ int type, } static Eina_Bool -_ibox_cb_event_border_zone_set(__UNUSED__ void *data, __UNUSED__ int type, void *event) +_ibox_cb_event_border_zone_set(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Border_Zone_Set *ev; @@ -1215,7 +1209,7 @@ _ibox_cb_event_border_zone_set(__UNUSED__ void *data, __UNUSED__ int type, void } static Eina_Bool -_ibox_cb_event_desk_show(__UNUSED__ void *data, __UNUSED__ int type, void *event) +_ibox_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Desk_Show *ev; IBox *b; @@ -1293,7 +1287,7 @@ _ibox_config_update(Config_Item *ci) } static void -_ibox_cb_menu_configuration(void *data, E_Menu *m, E_Menu_Item *mi) +_ibox_cb_menu_configuration(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { IBox *b; int ok = 1; @@ -1460,7 +1454,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown(E_Module *m __UNUSED__) { e_gadcon_provider_unregister(&_gadcon_class); @@ -1501,11 +1495,8 @@ e_modapi_shutdown(E_Module *m) } EAPI int -e_modapi_save(E_Module *m) +e_modapi_save(E_Module *m __UNUSED__) { e_config_domain_save("module.ibox", conf_edd, ibox_config); return 1; } - -/**/ -/***************************************************************************/