From 52f381fcbadf5ab6f44f0d138890683f22d160db Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 19 Aug 2010 20:31:01 +0000 Subject: [PATCH] Add UNUSED Remove unused variables. SVN revision: 51447 --- src/modules/illume-keyboard/e_kbd_buf.c | 13 +++++----- src/modules/illume-keyboard/e_kbd_dict.c | 4 ++-- src/modules/illume-keyboard/e_kbd_int.c | 28 ++++++++++------------ src/modules/illume-keyboard/e_mod_config.c | 12 +++++----- src/modules/illume-keyboard/e_mod_main.c | 6 ++--- 5 files changed, 29 insertions(+), 34 deletions(-) diff --git a/src/modules/illume-keyboard/e_kbd_buf.c b/src/modules/illume-keyboard/e_kbd_buf.c index 3da2206ab..b297ec966 100644 --- a/src/modules/illume-keyboard/e_kbd_buf.c +++ b/src/modules/illume-keyboard/e_kbd_buf.c @@ -56,7 +56,7 @@ _e_kbd_buf_actual_string_clear(E_Kbd_Buf *kb) } static E_Kbd_Buf_Key * -_e_kbd_buf_at_coord_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y) +_e_kbd_buf_at_coord_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x, int y) { Eina_List *l; @@ -76,7 +76,7 @@ _e_kbd_buf_at_coord_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y) } static E_Kbd_Buf_Key * -_e_kbd_buf_closest_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y) +_e_kbd_buf_closest_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x, int y) { Eina_List *l; E_Kbd_Buf_Key *ky_closest = NULL; @@ -104,7 +104,7 @@ _e_kbd_buf_closest_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y) } static const char * -_e_kbd_buf_keystroke_key_string_get(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks, E_Kbd_Buf_Key *ky) +_e_kbd_buf_keystroke_key_string_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Keystroke *ks, E_Kbd_Buf_Key *ky) { const char *str = NULL; @@ -191,7 +191,6 @@ _e_kbd_buf_matches_find(Eina_List *matches, const char *s) static void _e_kbd_buf_matches_update(E_Kbd_Buf *kb) { - Eina_List *matches = NULL; const char *word; int pri, i; E_Kbd_Dict *dicts[3]; @@ -233,7 +232,7 @@ _e_kbd_buf_cb_data_dict_reload(void *data) } static void -_e_kbd_buf_cb_data_dict_change(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path) +_e_kbd_buf_cb_data_dict_change(void *data, Ecore_File_Monitor *em __UNUSED__, Ecore_File_Event event __UNUSED__, const char *path __UNUSED__) { E_Kbd_Buf *kb; @@ -441,8 +440,8 @@ _e_kbd_buf_keystroke_point_add(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks) { E_Kbd_Buf_Key *ky; const char *str; - int px, py, dx, dy, d, fuzz; - + int px, py, dx, dy, d; + ky = l->data; px = ky->x + (ky->w / 2); py = ky->y + (ky->h / 2); diff --git a/src/modules/illume-keyboard/e_kbd_dict.c b/src/modules/illume-keyboard/e_kbd_dict.c index 79b068e16..40e5e59aa 100644 --- a/src/modules/illume-keyboard/e_kbd_dict.c +++ b/src/modules/illume-keyboard/e_kbd_dict.c @@ -168,7 +168,7 @@ _e_kbd_dict_line_next(E_Kbd_Dict *kd, const char *p) } static char * -_e_kbd_dict_line_parse(E_Kbd_Dict *kd, const char *p, int *usage) +_e_kbd_dict_line_parse(E_Kbd_Dict *kd __UNUSED__, const char *p, int *usage) { const char *ps; char *wd = NULL; @@ -188,7 +188,7 @@ _e_kbd_dict_line_parse(E_Kbd_Dict *kd, const char *p, int *usage) } static void -_e_kbd_dict_lookup_build_line(E_Kbd_Dict *kd, const char *p, const char *eol, int *glyphs) +_e_kbd_dict_lookup_build_line(E_Kbd_Dict *kd __UNUSED__, const char *p, const char *eol, int *glyphs) { char *s; int p2; diff --git a/src/modules/illume-keyboard/e_kbd_int.c b/src/modules/illume-keyboard/e_kbd_int.c index 6154e1468..3ed28522a 100644 --- a/src/modules/illume-keyboard/e_kbd_int.c +++ b/src/modules/illume-keyboard/e_kbd_int.c @@ -226,7 +226,7 @@ _e_kbd_int_buf_send(E_Kbd_Int *ki) } static void -_e_kbd_int_cb_match_select(void *data, Evas_Object *obj, const char *emission, const char *source) +_e_kbd_int_cb_match_select(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { E_Kbd_Int_Match *km; @@ -502,7 +502,7 @@ _e_kbd_int_zoomkey_up(E_Kbd_Int *ki) { const Eina_List *l; Evas_Object *o, *o2; - Evas_Coord w, h, mw, mh, vw, vh; + Evas_Coord mw, mh, vw, vh; int sx, sy, sw, sh; if (ki->zoomkey.popup) return; @@ -665,7 +665,7 @@ _e_kbd_int_cb_hold_timeout(void *data) } static void -_e_kbd_int_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) +_e_kbd_int_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Down *ev; E_Kbd_Int *ki; @@ -709,7 +709,7 @@ _e_kbd_int_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_i } static void -_e_kbd_int_cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info) +_e_kbd_int_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Move *ev; E_Kbd_Int *ki; @@ -752,11 +752,10 @@ _e_kbd_int_cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_i } static void -_e_kbd_int_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info) +_e_kbd_int_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Up *ev; E_Kbd_Int *ki; - Evas_Coord x, y; E_Kbd_Int_Key *ky; int dir = 0; @@ -1268,7 +1267,6 @@ static void _e_kbd_int_layout_next(E_Kbd_Int *ki) { Eina_List *l, *ln = NULL; - const char *nextlay = NULL; E_Kbd_Int_Layout *kil; EINA_LIST_FOREACH(ki->layouts, l, kil) @@ -1294,7 +1292,7 @@ _e_kbd_int_cb_client_message(void *data, __UNUSED__ int type, void *event) if ((ev->win == ki->win->evas_win) && (ev->message_type == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE)) { - E_Kbd_Int_Layout *kil; + E_Kbd_Int_Layout *kil = NULL; if (ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF) { @@ -1378,7 +1376,7 @@ static void _e_kbd_int_dictlist_up(E_Kbd_Int *ki) { Evas_Object *o; - Evas_Coord w, h, mw, mh; + Evas_Coord mw, mh; int sx, sy, sw, sh, used; Eina_List *files; Eina_List *l; @@ -1530,7 +1528,7 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki) { const Eina_List *l; Evas_Object *o; - Evas_Coord w, h, mw, mh, vw, vh; + Evas_Coord mw, mh; int sx, sy, sw, sh; if (!e_kbd_buf_string_matches_get(ki->kbuf)) return; @@ -1598,7 +1596,7 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki) } static void -_e_kbd_int_cb_matches(void *data, Evas_Object *obj, const char *emission, const char *source) +_e_kbd_int_cb_matches(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { E_Kbd_Int *ki; @@ -1615,7 +1613,7 @@ _e_kbd_int_cb_matches(void *data, Evas_Object *obj, const char *emission, const } static void -_e_kbd_int_cb_dicts(void *data, Evas_Object *obj, const char *emission, const char *source) +_e_kbd_int_cb_dicts(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { E_Kbd_Int *ki; @@ -1625,7 +1623,7 @@ _e_kbd_int_cb_dicts(void *data, Evas_Object *obj, const char *emission, const ch } static void -_e_kbd_int_cb_layouts(void *data, Evas_Object *obj, const char *emission, const char *source) +_e_kbd_int_cb_layouts(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { E_Kbd_Int *ki; @@ -1637,10 +1635,8 @@ EAPI E_Kbd_Int * e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts) { E_Kbd_Int *ki; - unsigned int one = 1; Evas_Object *o; Evas_Coord mw, mh; - const char *deflay; E_Zone *zone; E_Kbd_Int_Layout *kil; Ecore_X_Window_State states[2]; @@ -1769,7 +1765,7 @@ _theme_obj_new(Evas *e, const char *custom_dir, const char *group) } static Eina_Bool -_e_kbd_int_cb_border_move(void *data, int type, void *event) +_e_kbd_int_cb_border_move(void *data, int type __UNUSED__, void *event) { E_Event_Border_Move *ev; E_Kbd_Int *ki; diff --git a/src/modules/illume-keyboard/e_mod_config.c b/src/modules/illume-keyboard/e_mod_config.c index 2c5ffb580..e3e69ee45 100644 --- a/src/modules/illume-keyboard/e_mod_config.c +++ b/src/modules/illume-keyboard/e_mod_config.c @@ -90,7 +90,7 @@ il_kbd_config_save(void) } EAPI void -il_kbd_config_show(E_Container *con, const char *params) +il_kbd_config_show(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -114,19 +114,19 @@ il_kbd_config_show(E_Container *con, const char *params) /* local function prototypes */ static void * -_il_kbd_config_create(E_Config_Dialog *cfd) +_il_kbd_config_create(E_Config_Dialog *cfd __UNUSED__) { return NULL; } static void -_il_kbd_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_il_kbd_config_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) { il_kbd_cfg->cfd = NULL; } static Evas_Object * -_il_kbd_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_il_kbd_config_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) { Evas_Object *list, *of, *ow; E_Radio_Group *rg; @@ -198,7 +198,7 @@ _il_kbd_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata } static void -_il_kbd_config_changed(void *data, Evas_Object *obj, void *event) +_il_kbd_config_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) { if (_il_kbd_config_change_timer) ecore_timer_del(_il_kbd_config_change_timer); @@ -207,7 +207,7 @@ _il_kbd_config_changed(void *data, Evas_Object *obj, void *event) } static Eina_Bool -_il_kbd_config_change_timeout(__UNUSED__ void *data) +_il_kbd_config_change_timeout(void *data __UNUSED__) { Eina_List *l; diff --git a/src/modules/illume-keyboard/e_mod_main.c b/src/modules/illume-keyboard/e_mod_main.c index 69b200337..3056c5113 100644 --- a/src/modules/illume-keyboard/e_mod_main.c +++ b/src/modules/illume-keyboard/e_mod_main.c @@ -24,7 +24,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown(E_Module *m __UNUSED__) { _il_kbd_stop(); il_kbd_config_shutdown(); @@ -32,7 +32,7 @@ e_modapi_shutdown(E_Module *m) } EAPI int -e_modapi_save(E_Module *m) +e_modapi_save(E_Module *m __UNUSED__) { return il_kbd_config_save(); } @@ -115,7 +115,7 @@ _il_kbd_start(void) } static Eina_Bool -_il_kbd_cb_exit(void *data, int type, void *event) +_il_kbd_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event) { Ecore_Exe_Event_Del *ev;