From 73d01fe6327060e4a7cce01e4afc50115ca00c6c Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 19 Aug 2010 16:29:01 +0000 Subject: [PATCH] Add UNUSED where needed. SVN revision: 51410 --- src/modules/fileman/e_fwin.c | 46 ++++++++++++++---------------- src/modules/fileman/e_mod_config.c | 42 ++++++++++++++------------- src/modules/fileman/e_mod_dbus.c | 33 ++++++++++----------- src/modules/fileman/e_mod_main.c | 16 ++++++----- 4 files changed, 69 insertions(+), 68 deletions(-) diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 5df19234b..6b41c8b05 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -1102,7 +1102,7 @@ _e_fwin_cb_resize(E_Win *win) } static void -_e_fwin_deleted(void *data, Evas_Object *obj, void *event_info) +_e_fwin_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Fwin_Page *page; @@ -1111,7 +1111,7 @@ _e_fwin_deleted(void *data, Evas_Object *obj, void *event_info) } static void -_e_fwin_changed(void *data, Evas_Object *obj, void *event_info) +_e_fwin_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__) { E_Fwin *fwin; E_Fwin_Page *page; @@ -1211,7 +1211,7 @@ _e_fwin_changed(void *data, Evas_Object *obj, void *event_info) } static void -_e_fwin_selected(void *data, Evas_Object *obj, void *event_info) +_e_fwin_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Fwin_Page *page; Eina_List *selected; @@ -1224,7 +1224,7 @@ _e_fwin_selected(void *data, Evas_Object *obj, void *event_info) } static void -_e_fwin_selection_change(void *data, Evas_Object *obj, void *event_info) +_e_fwin_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Eina_List *l; E_Fwin_Page *page; @@ -1238,7 +1238,7 @@ _e_fwin_selection_change(void *data, Evas_Object *obj, void *event_info) } static void -_e_fwin_cb_all_change(void *data, Evas_Object *obj) +_e_fwin_cb_all_change(void *data, Evas_Object *obj __UNUSED__) { E_Fwin_Apps_Dialog *fad; Efreet_Desktop *desktop = NULL; @@ -1252,7 +1252,7 @@ _e_fwin_cb_all_change(void *data, Evas_Object *obj) } static void -_e_fwin_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info) +_e_fwin_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Key_Down *ev; E_Fwin *fwin; @@ -1348,7 +1348,7 @@ _e_fwin_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info) /* fwin zone callbacks */ static void -_e_fwin_zone_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) +_e_fwin_zone_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Fwin *fwin; @@ -1401,7 +1401,7 @@ _e_fwin_zone_del(void *data, int type, void *event) /* fm menu extend */ static void -_e_fwin_menu_extend(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info) +_e_fwin_menu_extend(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info __UNUSED__) { E_Fwin_Page *page; E_Menu_Item *mi; @@ -1426,13 +1426,13 @@ _e_fwin_menu_extend(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *in } static void -_e_fwin_parent(void *data, E_Menu *m, E_Menu_Item *mi) +_e_fwin_parent(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { e_fm2_parent_go(data); } static void -_e_fwin_cb_menu_open_fast(void *data, E_Menu *m, E_Menu_Item *mi) +_e_fwin_cb_menu_open_fast(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) { E_Fwin_Page *page; Efreet_Desktop *desk; @@ -1440,8 +1440,8 @@ _e_fwin_cb_menu_open_fast(void *data, E_Menu *m, E_Menu_Item *mi) page = data; desk = e_object_data_get(E_OBJECT(mi)); - if (page && desk) - _e_fwin_desktop_run(desk, page, EINA_TRUE); + if ((page) && (desk)) + _e_fwin_desktop_run(desk, page, EINA_TRUE); } static void @@ -1486,7 +1486,7 @@ _e_fwin_cb_menu_extend_open_with(void *data, E_Menu *m) } static void -_e_fwin_cb_menu_extend_start(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info) +_e_fwin_cb_menu_extend_start(void *data, Evas_Object *obj __UNUSED__, E_Menu *m, E_Fm2_Icon_Info *info __UNUSED__) { E_Menu_Item *mi; E_Fwin_Page *page; @@ -1508,7 +1508,7 @@ _e_fwin_cb_menu_extend_start(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon } static void -_e_fwin_cb_menu_open(void *data, E_Menu *m, E_Menu_Item *mi) +_e_fwin_cb_menu_open(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { E_Fwin_Page *page; Eina_List *selected; @@ -1521,7 +1521,7 @@ _e_fwin_cb_menu_open(void *data, E_Menu *m, E_Menu_Item *mi) } static void -_e_fwin_cb_menu_open_with(void *data, E_Menu *m, E_Menu_Item *mi) +_e_fwin_cb_menu_open_with(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { E_Fwin_Page *page; Eina_List *selected = NULL; @@ -1533,7 +1533,6 @@ _e_fwin_cb_menu_open_with(void *data, E_Menu *m, E_Menu_Item *mi) eina_list_free(selected); } - /* 'open with' dialog*/ static void _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always) @@ -1912,7 +1911,7 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always) } static void -_e_fwin_file_open_dialog_cb_key_down(void *data, Evas *e, Evas_Object *o, void *event_info) +_e_fwin_file_open_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info) { Evas_Event_Key_Down *ev = event_info; E_Fwin_Page *page = data; @@ -1948,7 +1947,7 @@ _e_fwin_dlg_cb_desk_list_sort(const void *data1, const void *data2) } static void -_e_fwin_cb_exec_cmd_changed(void *data, void *data2) +_e_fwin_cb_exec_cmd_changed(void *data, void *data2 __UNUSED__) { E_Fwin_Apps_Dialog *fad = NULL; Efreet_Desktop *desktop = NULL; @@ -1968,9 +1967,8 @@ _e_fwin_cb_exec_cmd_changed(void *data, void *data2) efreet_desktop_free(desktop); } - static void -_e_fwin_cb_open(void *data, E_Dialog *dia) +_e_fwin_cb_open(void *data, E_Dialog *dia __UNUSED__) { E_Fwin_Apps_Dialog *fad; Efreet_Desktop *desktop = NULL; @@ -2010,7 +2008,7 @@ _e_fwin_cb_open(void *data, E_Dialog *dia) } static void -_e_fwin_cb_close(void *data, E_Dialog *dia) +_e_fwin_cb_close(void *data, E_Dialog *dia __UNUSED__) { E_Fwin_Apps_Dialog *fad; @@ -2032,7 +2030,6 @@ _e_fwin_cb_dialog_free(void *obj) E_FREE(fad); } - /* scrolling ability */ static void _e_fwin_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) @@ -2270,12 +2267,11 @@ _e_fwin_op_registry_entry_iter(E_Fwin_Page *page) } static void -_e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj, const char *emission, const char *source) +_e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { int id; - + id = (long)data; if (!id) return; - e_fm2_operation_abort(id); } diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c index 092bd4f13..b8df1ecbe 100644 --- a/src/modules/fileman/e_mod_config.c +++ b/src/modules/fileman/e_mod_config.c @@ -6,20 +6,21 @@ struct _E_Config_Dialog_Data { /* general view mode */ - struct { - int mode; - int open_dirs_in_place; - int selector; - int single_click; - int no_subdir_jump; - int no_subdir_drop; - int always_order; - int link_drop; - int fit_custom_pos; - int show_full_path; - int show_desktop_icons; - int show_toolbar; - } view; + struct + { + int mode; + int open_dirs_in_place; + int selector; + int single_click; + int no_subdir_jump; + int no_subdir_drop; + int always_order; + int link_drop; + int fit_custom_pos; + int show_full_path; + int show_desktop_icons; + int show_toolbar; + } view; /* display of icons */ struct { @@ -39,9 +40,10 @@ struct _E_Config_Dialog_Data struct { int case_sen; - struct { - int first, last; - } dirs; + struct + { + int first, last; + } dirs; } sort; } list; /* control how you can select files */ @@ -136,7 +138,7 @@ _free_data(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) { fileman_config->view.mode = cfdata->view.mode; fileman_config->view.open_dirs_in_place = cfdata->view.open_dirs_in_place; @@ -173,7 +175,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *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 ((fileman_config->view.mode != cfdata->view.mode) || @@ -195,7 +197,7 @@ _basic_check_changed(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, *ob, *of, *otb; E_Radio_Group *rg; diff --git a/src/modules/fileman/e_mod_dbus.c b/src/modules/fileman/e_mod_dbus.c index f8ecb646c..df168d3d7 100644 --- a/src/modules/fileman/e_mod_dbus.c +++ b/src/modules/fileman/e_mod_dbus.c @@ -14,9 +14,10 @@ struct _E_Fileman_DBus_Daemon E_DBus_Interface *iface; E_DBus_Object *obj; - struct { - DBusPendingCall *request_name; - } pending; + struct + { + DBusPendingCall *request_name; + } pending; }; static DBusMessage * @@ -28,8 +29,7 @@ _e_fileman_dbus_daemon_error(DBusMessage *message, const char *msg) static void _e_fileman_dbus_daemon_object_init(E_Fileman_DBus_Daemon *d) { - if (d->obj) - return; + if (d->obj) return; d->obj = e_dbus_object_add(d->conn, E_FILEMAN_PATH, d); if (!d->obj) @@ -63,7 +63,7 @@ _e_fileman_dbus_daemon_free(E_Fileman_DBus_Daemon *d) } DBusMessage * -_e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj, DBusMessage *message) +_e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *message) { DBusMessageIter itr; const char *directory = NULL, *p; @@ -180,19 +180,20 @@ _e_fileman_dbus_daemon_new(void) d->pending.request_name = e_dbus_request_name (d->conn, E_FILEMAN_BUS_NAME, DBUS_NAME_FLAG_REPLACE_EXISTING, - _e_fileman_dbus_daemon_request_name_cb, d); + _e_fileman_dbus_daemon_request_name_cb, d); if (!d->pending.request_name) goto error; - const struct { - const char *method; - const char *signature; - const char *ret_signature; - E_DBus_Method_Cb func; - } *itr, desc[] = { - {"OpenDirectory", "s", "", _e_fileman_dbus_daemon_open_directory_cb}, - {NULL} - }; + const struct + { + const char *method; + const char *signature; + const char *ret_signature; + E_DBus_Method_Cb func; + } *itr, desc[] = { + {"OpenDirectory", "s", "", _e_fileman_dbus_daemon_open_directory_cb}, + {NULL} + }; for (itr = desc; itr->method != NULL; itr++) e_dbus_interface_method_add diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index fd3d796a7..2a075eac5 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -103,7 +103,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown(E_Module *m __UNUSED__) { Eina_List *l, *ll, *lll; E_Manager *man; @@ -158,7 +158,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.fileman", conf_edd, fileman_config); return 1; @@ -221,7 +221,7 @@ _e_mod_action_fileman_cb(E_Object *obj, const char *params) //~ } static void -_e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi) +_e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) { char *path; @@ -231,15 +231,16 @@ _e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi) } static void -_e_mod_menu_virtual_cb(void *data, E_Menu *m, E_Menu_Item *mi) +_e_mod_menu_virtual_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) { if (m->zone) e_fwin_new(m->zone->container, data, "/"); } static void -_e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi) +_e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) { E_Volume *vol = data; + if (vol->mounted) { if (m->zone) @@ -248,6 +249,7 @@ _e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi) else { char buf[PATH_MAX]; + snprintf(buf, sizeof(buf), "removable:%s", vol->udi); e_fwin_new(e_container_current_get(e_manager_current_get()), buf, "/"); @@ -306,7 +308,7 @@ _e_mod_fileman_parse_gtk_bookmarks(E_Menu *m, Eina_Bool need_separator) /* menu item add hook */ void -_e_mod_menu_generate(void *data, E_Menu *m) +_e_mod_menu_generate(void *data __UNUSED__, E_Menu *m) { E_Menu_Item *mi; E_Volume *vol; @@ -374,7 +376,7 @@ _e_mod_menu_generate(void *data, E_Menu *m) } void -_e_mod_menu_add(void *data, E_Menu *m) +_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) { #ifdef ENABLE_FILES E_Menu_Item *mi;