From 20dfdb33341f50fc2adea763f1957cb43ac88d9b Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Mon, 1 Mar 2010 12:57:05 +0000 Subject: [PATCH] Almost passes -Wextra Remains the problem of E_Object->type being int, but types constants being considered unsigned int. I guess we could just covert E_Object->type to unsigned, no? SVN revision: 46689 --- src/modules/conf/e_conf.c | 16 ++++++++-------- src/modules/conf/e_mod_config.c | 10 +++++----- src/modules/conf/e_mod_main.c | 28 ++++++++++++---------------- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c index 23d1d3351..c6d354913 100644 --- a/src/modules/conf/e_conf.c +++ b/src/modules/conf/e_conf.c @@ -275,8 +275,8 @@ _e_configure_cb_resize(E_Win *win) evas_object_resize(eco->edje, w, h); } -static void -_e_configure_cb_close(void *data, void *data2) +static void +_e_configure_cb_close(void *data, void *data2 __UNUSED__) { E_Configure *eco; @@ -314,8 +314,8 @@ _e_configure_category_add(E_Configure *eco, const char *label, const char *icon_ return cat; } -static void -_e_configure_category_cb(void *data, void *data2) +static void +_e_configure_category_cb(void *data, void *data2 __UNUSED__) { E_Configure_Category *cat; E_Configure *eco; @@ -413,8 +413,8 @@ _e_configure_focus_cb(void *data, Evas_Object *obj) } } -static void -_e_configure_keydown_cb(void *data, Evas *e, Evas_Object *obj, void *event) +static void +_e_configure_keydown_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) { Evas_Event_Key_Down *ev; E_Win *win; @@ -513,8 +513,8 @@ _e_configure_fill_cat_list(void *data) evas_event_thaw(evas_object_evas_get(eco->cat_list)); } -static int -_e_configure_module_update_cb(void *data, int type, void *event) +static int +_e_configure_module_update_cb(void *data, int type __UNUSED__, void *event __UNUSED__) { E_Configure *eco; int sel = 0; diff --git a/src/modules/conf/e_mod_config.c b/src/modules/conf/e_mod_config.c index 4e72868bb..bbb9907aa 100644 --- a/src/modules/conf/e_mod_config.c +++ b/src/modules/conf/e_mod_config.c @@ -13,7 +13,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); E_Config_Dialog * -e_int_config_conf_module(E_Container *con, const char *params) +e_int_config_conf_module(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd = NULL; E_Config_Dialog_View *v = NULL; @@ -39,7 +39,7 @@ e_int_config_conf_module(E_Container *con, const char *params) } static void * -_create_data(E_Config_Dialog *cfd) +_create_data(E_Config_Dialog *cfd __UNUSED__) { E_Config_Dialog_Data *cfdata = NULL; @@ -49,7 +49,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) { conf->cfd = NULL; E_FREE(cfdata); @@ -62,7 +62,7 @@ _fill_data(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 = NULL, *of = NULL, *ow = NULL; @@ -79,7 +79,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, 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) { conf->menu_augmentation = cfdata->menu_augmentation; if (conf->aug) diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c index 7c2f4aaf3..d9523dbf2 100644 --- a/src/modules/conf/e_mod_main.c +++ b/src/modules/conf/e_mod_main.c @@ -69,7 +69,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) { Evas_Coord mw, mh; @@ -83,13 +83,13 @@ _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 _("Settings"); } 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[PATH_MAX]; @@ -102,13 +102,13 @@ _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__) { return _gadcon_class.name; } static void -_cb_button_click(void *data, void *data2) +_cb_button_click(void *data __UNUSED__, void *data2 __UNUSED__) { E_Action *a; @@ -117,11 +117,10 @@ _cb_button_click(void *data, void *data2) } static void -_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi) +_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) { Eina_List *l; E_Configure_Cat *ecat; - char buf[1024]; EINA_LIST_FOREACH(e_configure_registry, l, ecat) { @@ -156,8 +155,6 @@ _config_pre_activate_cb(void *data, E_Menu *m) EINA_LIST_FOREACH(ecat->items, l, eci) { - char buf[1024]; - if (eci->pri >= 0) { mi = e_menu_item_new(m); @@ -313,7 +310,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown(E_Module *m __UNUSED__) { e_configure_del(); @@ -353,7 +350,7 @@ 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.conf", conf_edd, conf); return 1; @@ -385,7 +382,7 @@ _e_mod_action_conf_cb(E_Object *obj, const char *params) /* menu item callback(s) */ static void -_e_mod_conf_cb(void *data, E_Menu *m, E_Menu_Item *mi) +_e_mod_conf_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) { e_configure_show(m->zone->container); } @@ -442,7 +439,7 @@ _e_mod_submenu_modes_get(void) /* menu item add hook */ static void -_e_mod_menu_add(void *data, E_Menu *m) +_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) { E_Menu_Item *mi; @@ -460,8 +457,6 @@ _e_mod_menu_add(void *data, E_Menu *m) static void _conf_new(void) { - char buf[128]; - conf = E_NEW(Config, 1); conf->version = (MOD_CONFIG_FILE_EPOCH << 16); @@ -485,6 +480,7 @@ _conf_free(void) static int _conf_timer(void *data) { - e_util_dialog_show(_("Configuration Panel Configuration Updated"), data); + e_util_dialog_show(_("Configuration Panel Configuration Updated"), + "%s", (char *)data); return 0; }