enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

cleanup -Wextra warnings. 

SVN revision: 41496
This commit is contained in:
Gustavo Sverzut Barbieri 2009-07-25 05:53:01 +00:00
parent 64e97e62a0
commit e29156c909
10 changed files with 60 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/everything/e_mod_main.c
View File

@ -102,7 +102,7 @@ e_modapi_init(E_Module *m)
}
EAPI int
e_modapi_shutdown(E_Module *m)
e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
@ -142,7 +142,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.everything", conf_edd, evry_conf);
return 1;
@ -150,7 +150,7 @@ e_modapi_save(E_Module *m)
/* action callback */
static void
_e_mod_action_exebuf_cb(E_Object *obj, const char *params)
_e_mod_action_exebuf_cb(E_Object *obj, const char *params __UNUSED__)
{
E_Zone *zone = NULL;
@ -184,14 +184,14 @@ _e_mod_run_defer_cb(void *data)
}
static void
_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi)
_e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
{
ecore_idle_enterer_add(_e_mod_run_defer_cb, m->zone);
}
/* 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;

44
src/modules/everything/evry.c
View File

@ -55,8 +55,6 @@ static void _evry_tab_scroll_to(Evry_Plugin *p);
static void _evry_item_desel(Evry_Item *it);
static void _evry_item_sel(Evry_Item *it);
static void _evry_plugin_action(int finished);
static void _evry_action_select(void);
static void _evry_cb_plugin_sel(void *data1, void *data2);
static int _evry_animator(void *data);
static int _evry_scroll_timer(void *data);
static int _evry_push_state(void);
@ -80,7 +78,6 @@ static Ecore_Timer *update_timer = NULL;
static Evas_Object *o_list = NULL;
static Evas_Object *o_main = NULL;
static Evas_Object *o_selector = NULL;
static Evas_Object *o_selector_frame = NULL;
static int ev_last_is_mouse;
static Evry_Item *item_mouseover = NULL;
static Ecore_Animator *scroll_animator = NULL;
@ -258,9 +255,6 @@ EAPI void
evry_hide(void)
{
Ecore_Event *ev;
char *str;
Evry_Plugin *plugin;
Eina_List *l;
Evry_State *s;
if (!popup) return;
@ -608,7 +602,7 @@ _evry_pop_state(void)
/* TODO config options for users preferred keys */
static int
_evry_cb_key_down(void *data, int type, void *event)
_evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Key *ev;
Evry_State *s = cur_state;
@ -698,7 +692,7 @@ _evry_cb_key_down(void *data, int type, void *event)
}
static int
_evry_cb_mouse_down(void *data, int type, void *event)
_evry_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Button *ev;
Evry_State *s =cur_state;
@ -724,7 +718,7 @@ _evry_cb_mouse_down(void *data, int type, void *event)
}
static int
_evry_cb_mouse_up(void *data, int type, void *event)
_evry_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Button *ev;
@ -747,7 +741,7 @@ _evry_cb_mouse_up(void *data, int type, void *event)
}
static int
_evry_cb_mouse_move(void *data, int type, void *event)
_evry_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Move *ev;
Evry_State *s =cur_state;
@ -777,7 +771,7 @@ _evry_cb_mouse_move(void *data, int type, void *event)
}
static int
_evry_cb_mouse_wheel(void *data, int type, void *event)
_evry_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Wheel *ev;
@ -802,8 +796,7 @@ _evry_cb_mouse_wheel(void *data, int type, void *event)
}
static void
_evry_cb_item_mouse_in(void *data, Evas *evas, Evas_Object *obj,
void *event_info)
_evry_cb_item_mouse_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evry_State *s =cur_state;
@ -817,8 +810,7 @@ _evry_cb_item_mouse_in(void *data, Evas *evas, Evas_Object *obj,
}
static void
_evry_cb_item_mouse_out(void *data, Evas *evas, Evas_Object *obj,
void *event_info)
_evry_cb_item_mouse_out(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
item_mouseover = NULL;
}
@ -844,9 +836,6 @@ _evry_backspace(void)
static void
_evry_update(void)
{
Efreet_Desktop *desktop;
Evas_Object *o;
edje_object_part_text_set(o_main, "e.text.label", cur_state->input);
if (update_timer) ecore_timer_del(update_timer);
@ -854,7 +843,7 @@ _evry_update(void)
}
static int
_evry_update_timer(void *data)
_evry_update_timer(void *data __UNUSED__)
{
_evry_matches_update(cur_state->cur_plugin);
update_timer = NULL;
@ -1302,7 +1291,6 @@ static void
_evry_plugin_prev(void)
{
Eina_List *l;
Evry_Plugin *plugin;
Evry_State *s = cur_state;
if (!s->cur_plugin) return;
@ -1329,7 +1317,7 @@ _evry_plugin_prev(void)
}
static int
_evry_scroll_timer(void *data)
_evry_scroll_timer(void *data __UNUSED__)
{
if (scroll_animator)
{
@ -1343,7 +1331,7 @@ _evry_scroll_timer(void *data)
}
static int
_evry_animator(void *data)
_evry_animator(void *data __UNUSED__)
{
double da;
Eina_Bool scroll_to = 1;
@ -1431,10 +1419,12 @@ _evry_plug_act_select_init(void)
evry_conf->plugins = eina_list_append(evry_conf->plugins, p);
action_selector = p;
return 1;
}
static int
_evry_plug_act_select_begin(Evry_Plugin *p, Evry_Item *it)
_evry_plug_act_select_begin(Evry_Plugin *p, Evry_Item *it __UNUSED__)
{
Evry_Action *act;
Eina_List *l;
@ -1462,7 +1452,7 @@ _evry_plug_act_select_begin(Evry_Plugin *p, Evry_Item *it)
}
static int
_evry_plug_act_select_fetch(Evry_Plugin *p, const char *input)
_evry_plug_act_select_fetch(Evry_Plugin *p, const char *input __UNUSED__)
{
Evry_Action *act;
Eina_List *l;
@ -1487,7 +1477,7 @@ _evry_plug_act_select_fetch(Evry_Plugin *p, const char *input)
}
static int
_evry_plug_act_select_action(Evry_Plugin *p, Evry_Item *it, const char *input)
_evry_plug_act_select_action(Evry_Plugin *p __UNUSED__, Evry_Item *it, const char *input __UNUSED__)
{
Evry_Action *act = it->data[0];
cur_state->cur_action = act;
@ -1526,9 +1516,9 @@ _evry_plug_act_select_cleanup(Evry_Plugin *p)
}
static void
_evry_plug_act_select_item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e)
_evry_plug_act_select_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it __UNUSED__, Evas *e __UNUSED__)
{
Evry_Action *act = it->data[0];
/* Evry_Action *act = it->data[0]; */
/* if (act->icon_get)
* it->o_icon = act->icon_get(act, e); */

15
src/modules/everything/evry_config.c
View File

@ -51,7 +51,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;
@ -61,13 +61,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_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
evry_conf->width = cfdata->width;
evry_conf->height = cfdata->height;
@ -78,7 +78,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
}
static void
_fill_list(Evas_Object *obj, int enabled)
_fill_list(Evas_Object *obj, int enabled __UNUSED__)
{
Evas *evas;
Evas_Coord w;
@ -114,7 +114,6 @@ _plugin_move(Evas_Object *list, int dir)
if (sel >= 0)
{
Evry_Plugin *p;
Evas *evas;
int prio = 0;
l1 = eina_list_nth_list(evry_conf->plugins, sel);
@ -134,7 +133,7 @@ _plugin_move(Evas_Object *list, int dir)
}
static void
_plugin_move_up_cb(void *data, void *data2)
_plugin_move_up_cb(void *data, void *data2 __UNUSED__)
{
E_Config_Dialog_Data *cfdata;
@ -144,7 +143,7 @@ _plugin_move_up_cb(void *data, void *data2)
}
static void
_plugin_move_down_cb(void *data, void *data2)
_plugin_move_down_cb(void *data, void *data2 __UNUSED__)
{
E_Config_Dialog_Data *cfdata;
@ -154,7 +153,7 @@ _plugin_move_down_cb(void *data, void *data2)
}
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)
{
Evas_Object *o, *of, *ob, *otb;

14
src/modules/everything/evry_plug_apps.c
View File

@ -104,7 +104,7 @@ evry_plug_apps_shutdown(void)
}
static int
_begin(Evry_Plugin *p, Evry_Item *it)
_begin(Evry_Plugin *p __UNUSED__, Evry_Item *it)
{
const char *mime;
@ -143,7 +143,7 @@ _begin(Evry_Plugin *p, Evry_Item *it)
}
static int
_action(Evry_Plugin *p, Evry_Item *it, const char *input)
_action(Evry_Plugin *p __UNUSED__, Evry_Item *it, const char *input)
{
E_Zone *zone;
Evry_App *app = NULL;
@ -262,7 +262,7 @@ _fetch(Evry_Plugin *p, const char *input)
_item_add(p, desktop, NULL, 2);
else if (e_util_glob_case_match(desktop->name, match1))
_item_add(p, desktop, NULL, 1);
else if (p, e_util_glob_case_match(desktop->name, match2))
else if (e_util_glob_case_match(desktop->name, match2))
_item_add(p, desktop, NULL, 2);
else if (desktop->comment)
{
@ -423,7 +423,7 @@ _item_add(Evry_Plugin *p, Efreet_Desktop *desktop, char *file, int prio)
}
static void
_item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e)
_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
{
Evry_App *app = it->data[0];
@ -477,7 +477,7 @@ _cb_sort(const void *data1, const void *data2)
}
static int
_exec_app_check_item(Evry_Action *act, Evry_Item *it)
_exec_app_check_item(Evry_Action *act __UNUSED__, Evry_Item *it)
{
Evry_App *app = it->data[0];
if (app->desktop)
@ -544,7 +544,7 @@ _exec_app_action(Evry_Action *act)
}
static int
_edit_app_check_item(Evry_Action *act, Evry_Item *it)
_edit_app_check_item(Evry_Action *act __UNUSED__, Evry_Item *it)
{
Evry_App *app = it->data[0];
if (app->desktop)
@ -586,7 +586,7 @@ _edit_app_action(Evry_Action *act)
static int
_new_app_check_item(Evry_Action *act, Evry_Item *it)
_new_app_check_item(Evry_Action *act __UNUSED__, Evry_Item *it)
{
Evry_App *app = it->data[0];
if (app->desktop)

5
src/modules/everything/evry_plug_border.c
View File

@ -38,7 +38,7 @@ evry_plug_border_shutdown(void)
}
static int
_action(Evry_Plugin *p, Evry_Item *it, const char *input)
_action(Evry_Plugin *p __UNUSED__, Evry_Item *it, const char *input __UNUSED__)
{
E_Border *bd;
E_Zone *zone;
@ -86,7 +86,6 @@ _fetch(Evry_Plugin *p, const char *input)
char match1[4096];
char match2[4096];
Eina_List *list;
E_Border *bd;
E_Border_List *bl;
@ -132,7 +131,7 @@ _fetch(Evry_Plugin *p, const char *input)
}
static void
_item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e)
_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
{
it->o_icon = e_border_icon_add(((E_Border *)it->data[0]), e);
}

8
src/modules/everything/evry_plug_border_act.c
View File

@ -72,7 +72,7 @@ _act_cb_border_minimize(E_Border *bd)
}
static int
_begin(Evry_Plugin *p, Evry_Item *item)
_begin(Evry_Plugin *p __UNUSED__, Evry_Item *item)
{
E_Border *bd;
@ -84,7 +84,7 @@ _begin(Evry_Plugin *p, Evry_Item *item)
}
static int
_fetch(Evry_Plugin *p, const char *input)
_fetch(Evry_Plugin *p, const char *input __UNUSED__)
{
_cleanup(p);
@ -104,7 +104,7 @@ _fetch(Evry_Plugin *p, const char *input)
}
static int
_action(Evry_Plugin *p, Evry_Item *item, const char *input)
_action(Evry_Plugin *p __UNUSED__, Evry_Item *item, const char *input __UNUSED__)
{
void (*border_action) (E_Border *bd);
border_action = item->data[0];
@ -139,7 +139,7 @@ _item_add(Evry_Plugin *p, const char *label, void (*action_cb) (E_Border *bd), c
}
static void
_item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e)
_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
{
it->o_icon = edje_object_add(e);
e_theme_edje_object_set(it->o_icon, "base/theme/borders", (const char *)it->data[1]);

18
src/modules/everything/evry_plug_calc.c
View File

@ -10,7 +10,6 @@ static int _fetch(Evry_Plugin *p, const char *input);
static int _action(Evry_Plugin *p, Evry_Item *item, const char *input);
static void _cleanup(Evry_Plugin *p);
static void _item_add(Evry_Plugin *p, char *output, int prio);
static int _cb_sort(const void *data1, const void *data2);
static void _item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e);
static int _cb_data(void *data, int type, void *event);
static int _cb_error(void *data, int type, void *event);
@ -59,12 +58,13 @@ evry_plug_calc_shutdown(void)
E_FREE(p);
ecore_x_window_free(clipboard_win);
clipboard_win = 0;
return 1;
}
static int
_begin(Evry_Plugin *p, Evry_Item *it)
_begin(Evry_Plugin *p, Evry_Item *it __UNUSED__)
{
data_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _cb_data, p);
@ -76,14 +76,14 @@ _begin(Evry_Plugin *p, Evry_Item *it)
ECORE_EXE_PIPE_ERROR |
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
NULL);
return !!exe;
}
static void
_cleanup(Evry_Plugin *p)
{
Evry_Item *it, *it2;
Evry_Item *it;
int i = 0;
Eina_List *l, *ll;
EINA_LIST_FREE(p->items, it)
{
@ -107,7 +107,7 @@ _cleanup(Evry_Plugin *p)
}
static int
_action(Evry_Plugin *p, Evry_Item *it, const char *input)
_action(Evry_Plugin *p, Evry_Item *it, const char *input __UNUSED__)
{
if (!it) return EVRY_ACTION_CONTINUE;
@ -184,7 +184,7 @@ _fetch(Evry_Plugin *p, const char *input)
}
static void
_item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e)
_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e __UNUSED__)
{
it->o_icon = NULL;
}
@ -203,7 +203,7 @@ _item_add(Evry_Plugin *p, char *output, int prio)
}
static int
_cb_data(void *data, int type, void *event)
_cb_data(void *data, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Data *ev = event;
Ecore_Exe_Event_Data_Line *l;
@ -233,7 +233,7 @@ _cb_data(void *data, int type, void *event)
}
static int
_cb_error(void *data, int type, void *event)
_cb_error(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
error = 1;

7
src/modules/everything/evry_plug_config.c
View File

@ -37,7 +37,7 @@ evry_plug_config_shutdown(void)
}
static int
_action(Evry_Plugin *p, Evry_Item *it, const char *input)
_action(Evry_Plugin *p __UNUSED__, Evry_Item *it, const char *input __UNUSED__)
{
E_Configure_It *eci, *eci2;
E_Container *con;
@ -88,9 +88,6 @@ _cleanup(Evry_Plugin *p)
static int
_fetch(Evry_Plugin *p, const char *input)
{
E_Manager *man;
E_Zone *zone;
char match1[4096];
char match2[4096];
Eina_List *l, *ll;
@ -135,7 +132,7 @@ _fetch(Evry_Plugin *p, const char *input)
}
static void
_item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e)
_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
{
E_Configure_It *eci = it->data[0];
Evas_Object *o = NULL;

4
src/modules/everything/evry_plug_dir_browse.c
View File

@ -86,7 +86,7 @@ _begin(Evry_Plugin *p, Evry_Item *it)
}
static int
_action(Evry_Plugin *p, Evry_Item *it, const char *input)
_action(Evry_Plugin *p __UNUSED__, Evry_Item *it __UNUSED__, const char *input __UNUSED__)
{
return EVRY_ACTION_OTHER;
}
@ -334,7 +334,7 @@ _item_fill(Evry_Item *it, Evas *e)
}
static void
_item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e)
_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
{
char *item_path;

12
src/modules/everything/evry_plug_tracker.c
View File

@ -63,7 +63,7 @@ evry_plug_tracker_shutdown(void)
}
static int
_action(Evry_Plugin *p, Evry_Item *it, const char *input)
_action(Evry_Plugin *p __UNUSED__, Evry_Item *it __UNUSED__, const char *input __UNUSED__)
{
return EVRY_ACTION_OTHER;
}
@ -85,7 +85,6 @@ _cleanup(Evry_Plugin *p)
static int
_fetch(Evry_Plugin *p, const char *input)
{
Eina_List *list;
DBusMessage *msg;
DBusMessageIter iter;
int live_query_id = 0;
@ -119,7 +118,7 @@ _fetch(Evry_Plugin *p, const char *input)
}
static void
_item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e)
_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
{
char *item_path;
@ -145,7 +144,7 @@ _item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e)
}
static void
_item_add(Evry_Plugin *p, char *file, char *service, char *mime, int prio)
_item_add(Evry_Plugin *p, char *file, char *service __UNUSED__, char *mime, int prio)
{
Evry_Item *it;
@ -160,11 +159,10 @@ _item_add(Evry_Plugin *p, char *file, char *service, char *mime, int prio)
}
static void
_dbus_cb_reply(void *data, DBusMessage *msg, DBusError *error)
_dbus_cb_reply(void *data __UNUSED__, DBusMessage *msg, DBusError *error)
{
DBusMessageIter array, iter, item;
char *val;
if (dbus_error_is_set(error))
{
printf("Error: %s - %s\n", error->name, error->message);