From d90e5b12b8813259619d0cd66a2421600fbdbd15 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 19 Aug 2010 19:18:43 +0000 Subject: [PATCH] Add UNUSED. Remove unused variables. Fix formatting, remove whitespace, etc, etc, etc. SVN revision: 51442 --- .../e_int_config_interaction.c | 12 +++--- src/modules/conf_interaction/e_mod_main.c | 16 ++++--- src/modules/conf_scale/e_int_config_scale.c | 2 +- src/modules/conf_scale/e_mod_main.c | 14 +++--- src/modules/gadman/e_mod_config.c | 22 +++++----- src/modules/gadman/e_mod_gadman.c | 43 +++++++++---------- src/modules/gadman/e_mod_main.c | 11 ++--- 7 files changed, 64 insertions(+), 56 deletions(-) diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c index 922a9f111..bc4af7a27 100644 --- a/src/modules/conf_interaction/e_int_config_interaction.c +++ b/src/modules/conf_interaction/e_int_config_interaction.c @@ -50,7 +50,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd) +_create_data(E_Config_Dialog *cfd __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -60,13 +60,13 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } static int -_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { return ((cfdata->thumbscroll_enable != e_config->thumbscroll_enable) || (cfdata->thumbscroll_threshhold != e_config->thumbscroll_threshhold) || @@ -75,7 +75,7 @@ _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { e_config->thumbscroll_enable = cfdata->thumbscroll_enable; e_config->thumbscroll_threshhold = cfdata->thumbscroll_threshhold; @@ -87,7 +87,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob; @@ -140,7 +140,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static void -_enabled_cb(void *data, Evas_Object *obj, void *event_info) +_enabled_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_interaction/e_mod_main.c b/src/modules/conf_interaction/e_mod_main.c index 73a2a7cb2..373a0fa54 100644 --- a/src/modules/conf_interaction/e_mod_main.c +++ b/src/modules/conf_interaction/e_mod_main.c @@ -14,18 +14,24 @@ EAPI E_Module_Api e_modapi = EAPI void * e_modapi_init(E_Module *m) { - e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"), NULL, "preferences-behavior"); - e_configure_registry_item_add("keyboard_and_mouse/interaction", 11, _("Interaction"), NULL, "preferences-interaction", e_int_config_interaction); + e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"), + NULL, "preferences-behavior"); + e_configure_registry_item_add("keyboard_and_mouse/interaction", 11, + _("Interaction"), NULL, + "preferences-interaction", + e_int_config_interaction); conf_module = m; e_module_delayed_set(m, 1); return m; } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown(E_Module *m __UNUSED__) { E_Config_Dialog *cfd; - while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/interaction"))) e_object_del(E_OBJECT(cfd)); + + while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/interaction"))) + e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("keyboard_and_mouse/interaction"); e_configure_registry_category_del("keyboard_and_mouse"); conf_module = NULL; @@ -33,7 +39,7 @@ e_modapi_shutdown(E_Module *m) } EAPI int -e_modapi_save(E_Module *m) +e_modapi_save(E_Module *m __UNUSED__) { return 1; } diff --git a/src/modules/conf_scale/e_int_config_scale.c b/src/modules/conf_scale/e_int_config_scale.c index efbbb86d0..35f43923b 100644 --- a/src/modules/conf_scale/e_int_config_scale.c +++ b/src/modules/conf_scale/e_int_config_scale.c @@ -59,7 +59,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__) /* local function prototypes */ static void * -_create_data(E_Config_Dialog *cfd) +_create_data(E_Config_Dialog *cfd __UNUSED__) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_scale/e_mod_main.c b/src/modules/conf_scale/e_mod_main.c index a8c0f985c..0b03dd7ec 100644 --- a/src/modules/conf_scale/e_mod_main.c +++ b/src/modules/conf_scale/e_mod_main.c @@ -15,18 +15,22 @@ EAPI E_Module_Api e_modapi = EAPI void * e_modapi_init(E_Module *m) { - e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance"); - e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL, "preferences-scale", e_int_config_scale); + e_configure_registry_category_add("appearance", 10, _("Look"), + NULL, "preferences-appearance"); + e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL, + "preferences-scale", e_int_config_scale); conf_module = m; e_module_delayed_set(m, 1); return m; } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown(E_Module *m __UNUSED__) { E_Config_Dialog *cfd; - while ((cfd = e_config_dialog_get("E", "appearance/scale"))) e_object_del(E_OBJECT(cfd)); + + while ((cfd = e_config_dialog_get("E", "appearance/scale"))) + e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("appearance/scale"); e_configure_registry_category_del("appearance"); conf_module = NULL; @@ -34,7 +38,7 @@ e_modapi_shutdown(E_Module *m) } EAPI int -e_modapi_save(E_Module *m) +e_modapi_save(E_Module *m __UNUSED__) { return 1; } diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c index 490c7bf4b..f0b9aada9 100644 --- a/src/modules/gadman/e_mod_config.c +++ b/src/modules/gadman/e_mod_config.c @@ -59,7 +59,7 @@ _config_gadman_module(E_Container *con, const char *params __UNUSED__) } static void * -_create_data(E_Config_Dialog *cfd) +_create_data(E_Config_Dialog *cfd __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -85,7 +85,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { Man->config_dialog = NULL; E_FREE(cfdata->color); @@ -101,7 +101,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf E_Fm2_Config fmc; char path[PATH_MAX]; - otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale); o = e_widget_list_add(evas, 0, 0); @@ -241,7 +240,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf } static int -_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { Eina_List *sel; const char *p = NULL; @@ -313,7 +312,7 @@ _fill_gadgets_list(Evas_Object *ilist) } static void -_cb_add(void *data, void *data2) +_cb_add(void *data, void *data2 __UNUSED__) { E_Config_Dialog_Data *cfdata; Eina_List *l = NULL; @@ -341,7 +340,7 @@ _cb_add(void *data, void *data2) } static void -_avail_list_cb_change(void *data, Evas_Object *obj) +_avail_list_cb_change(void *data, Evas_Object *obj __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -351,7 +350,7 @@ _avail_list_cb_change(void *data, Evas_Object *obj) //Advanced Callbacks static void -_cb_color_changed(void *data, Evas_Object *o) +_cb_color_changed(void *data, Evas_Object *o __UNUSED__) { E_Config_Dialog_Data *cfdata; cfdata = data; @@ -360,7 +359,7 @@ _cb_color_changed(void *data, Evas_Object *o) } static void -_cb_fm_radio_change(void *data, Evas_Object *obj) +_cb_fm_radio_change(void *data, Evas_Object *obj __UNUSED__) { E_Config_Dialog_Data *cfdata; char path[PATH_MAX]; @@ -375,7 +374,7 @@ _cb_fm_radio_change(void *data, Evas_Object *obj) } static void -_cb_fm_change(void *data, Evas_Object *obj, void *event_info) +_cb_fm_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Config_Dialog_Data *cfdata; const char *p; @@ -408,7 +407,7 @@ _cb_fm_change(void *data, Evas_Object *obj, void *event_info) } static void -_cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info) +_cb_fm_sel_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -416,7 +415,7 @@ _cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info) e_widget_change(cfdata->o_sf); } static void -_cb_button_up(void *data1, void *data2) +_cb_button_up(void *data1, void *data2 __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -426,4 +425,3 @@ _cb_button_up(void *data1, void *data2) e_fm2_parent_go(cfdata->o_fm); e_widget_scrollframe_child_pos_set(cfdata->o_sf, 0, 0); } - diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index d37f7ff25..9a080803d 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -227,7 +227,7 @@ E_Gadcon_Client * gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer) { E_Config_Gadcon_Client *cf = NULL; - E_Gadcon_Client *gcc; + E_Gadcon_Client *gcc = NULL; E_Gadcon *gc; int w, h; @@ -313,7 +313,7 @@ gadman_gadget_edit_start(E_Gadcon_Client *gcc) } void -gadman_gadget_edit_end(void *data, Evas_Object *obj, const char *emission, const char *source) +gadman_gadget_edit_end(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { unsigned int layer; @@ -691,7 +691,7 @@ _apply_widget_position(E_Gadcon_Client *gcc) } static void -_attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu) +_attach_menu(void *data __UNUSED__, E_Gadcon_Client *gcc, E_Menu *menu) { E_Menu *mn; E_Menu_Item *mi; @@ -852,7 +852,7 @@ _get_bind_text(const char* action) /* Callbacks */ static void -on_shape_change(void *data, E_Container_Shape *es, E_Container_Shape_Change ch) +on_shape_change(void *data __UNUSED__, E_Container_Shape *es, E_Container_Shape_Change ch __UNUSED__) { const Eina_List *l, *g; E_Gadcon *gc; @@ -881,7 +881,7 @@ on_shape_change(void *data, E_Container_Shape *es, E_Container_Shape_Change ch) } static void -on_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_style_plain(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { E_Gadcon_Client *gcc; @@ -898,7 +898,7 @@ on_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi) } static void -on_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_style_inset(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { E_Gadcon_Client *gcc; @@ -915,7 +915,6 @@ on_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi) e_config_save_queue(); } - static void _menu_style_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { @@ -957,25 +956,25 @@ _menu_style_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) } static void -on_menu_style_float(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_style_float(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { _menu_style_orient(data, E_GADCON_ORIENT_FLOAT); } static void -on_menu_style_horiz(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_style_horiz(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { _menu_style_orient(data, E_GADCON_ORIENT_HORIZ); } static void -on_menu_style_vert(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_style_vert(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { _menu_style_orient(data, E_GADCON_ORIENT_VERT); } static void -on_menu_layer_bg(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_layer_bg(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { const Eina_List *l; E_Config_Gadcon_Client *cf; @@ -1006,7 +1005,7 @@ on_menu_layer_bg(void *data, E_Menu *m, E_Menu_Item *mi) } static void -on_menu_layer_top(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_layer_top(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { const Eina_List *l; E_Config_Gadcon_Client *cf; @@ -1039,13 +1038,13 @@ on_menu_layer_top(void *data, E_Menu *m, E_Menu_Item *mi) } static void -on_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_edit(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { gadman_gadget_edit_start(data); } static void -on_menu_add(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_add(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) { if (Man->visible) gadman_gadgets_hide(); @@ -1053,14 +1052,14 @@ on_menu_add(void *data, E_Menu *m, E_Menu_Item *mi) } static void -on_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi) +on_menu_delete(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { gadman_gadget_del(data); e_config_save_queue(); } static void -on_frame_click(void *data, Evas *e, Evas_Object *obj, void *event_info) +on_frame_click(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Down *ev; E_Gadcon_Client *gcc; @@ -1090,7 +1089,7 @@ on_frame_click(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -on_top(void *data, Evas_Object *o, const char *em, const char *src) +on_top(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) { static int ox, oy, ow, oh; //Object coord static int dy; //Mouse offset @@ -1142,7 +1141,7 @@ on_top(void *data, Evas_Object *o, const char *em, const char *src) } static void -on_right(void *data, Evas_Object *o, const char *em, const char *src) +on_right(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) { Evas_Object *mover; static int ox, oy, ow, oh; //Object coord @@ -1183,7 +1182,7 @@ on_right(void *data, Evas_Object *o, const char *em, const char *src) } static void -on_down(void *data, Evas_Object *o, const char *em, const char *src) +on_down(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) { Evas_Object *mover; static int ox, oy, ow, oh; //Object coord @@ -1224,7 +1223,7 @@ on_down(void *data, Evas_Object *o, const char *em, const char *src) } static void -on_left(void *data, Evas_Object *o, const char *em, const char *src) +on_left(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) { Evas_Object *mover; static int ox, oy, ow, oh; //Object coord @@ -1277,7 +1276,7 @@ on_left(void *data, Evas_Object *o, const char *em, const char *src) } static void -on_move(void *data, Evas_Object *o, const char *em, const char *src) +on_move(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) { Evas_Object *mover; static int dx, dy; //Offset of mouse pointer inside the mover @@ -1358,7 +1357,7 @@ on_move(void *data, Evas_Object *o, const char *em, const char *src) } static void -on_bg_click(void *data, Evas_Object *o, const char *em, const char *src) +on_bg_click(void *data __UNUSED__, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) { gadman_gadgets_hide(); } diff --git a/src/modules/gadman/e_mod_main.c b/src/modules/gadman/e_mod_main.c index 76a04debf..0c7f2967f 100644 --- a/src/modules/gadman/e_mod_main.c +++ b/src/modules/gadman/e_mod_main.c @@ -9,7 +9,8 @@ static void _gadman_maug_add(void *data, E_Menu *m); static void _gadman_action_cb(E_Object *obj, const char *params); /* public module routines. all modules must have these */ -EAPI E_Module_Api e_modapi = { +EAPI E_Module_Api e_modapi = +{ E_MODULE_API_VERSION, "Gadman" }; @@ -101,7 +102,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown(E_Module *m __UNUSED__) { if (Man->maug) e_int_menus_menu_augmentation_del("config/1", Man->maug); @@ -127,14 +128,14 @@ 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.gadman", Man->conf_edd, Man->conf); return 1; } static void -_gadman_maug_cb(void *data, E_Menu *m, E_Menu_Item *mi) +_gadman_maug_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) { e_configure_registry_call("extensions/gadman", m->zone->container, NULL); } @@ -151,7 +152,7 @@ _gadman_maug_add(void *data, E_Menu *m) } static void -_gadman_action_cb(E_Object *obj, const char *params) +_gadman_action_cb(E_Object *obj __UNUSED__, const char *params __UNUSED__) { gadman_gadgets_toggle(); }