From 3c12d4daba483fbdfae88bcd7f0c07e0d0efe566 Mon Sep 17 00:00:00 2001
From: Sebastian Dransfeld <sd@tango.flipp.net>
Date: Fri, 5 Nov 2010 18:40:31 +0000
Subject: [PATCH] __UNUSED__ last

SVN revision: 54193
---
 src/bin/e_border.c    |  4 ++--
 src/bin/e_canvas.c    |  2 +-
 src/bin/e_configure.c |  2 +-
 src/bin/e_container.c | 14 +++++++-------
 src/bin/e_desk.c      | 10 +++++-----
 src/bin/e_entry.c     | 16 ++++++++--------
 src/bin/e_exec.c      |  2 +-
 src/bin/e_fm.c        |  6 +++---
 src/bin/e_intl.c      |  2 +-
 src/bin/e_layout.c    |  2 +-
 src/bin/e_manager.c   |  2 +-
 src/bin/e_menu.c      | 22 +++++++++++-----------
 src/bin/e_module.c    |  4 ++--
 src/bin/e_msg.c       |  4 ++--
 src/bin/e_order.c     |  2 +-
 src/bin/e_pointer.c   | 10 +++++-----
 src/bin/e_popup.c     |  2 +-
 src/bin/e_remember.c  |  4 ++--
 src/bin/e_startup.c   |  2 +-
 src/bin/e_sys.c       |  2 +-
 src/bin/e_thumb.c     |  4 ++--
 src/bin/e_utils.c     |  2 +-
 src/bin/e_zone.c      | 24 ++++++++++++------------
 23 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index c221f76c9..a62e18d1c 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -5101,7 +5101,7 @@ _e_border_cb_sync_alarm(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 }
 
 static Eina_Bool
-_e_border_cb_efreet_cache_update(void *data __UNUSED__, int ev_type __UNUSED__, __UNUSED__ void *ev)
+_e_border_cb_efreet_cache_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
 {
    Eina_List *l;
    E_Border *bd;
@@ -5125,7 +5125,7 @@ _e_border_cb_efreet_cache_update(void *data __UNUSED__, int ev_type __UNUSED__,
 }
 
 static Eina_Bool
-_e_border_cb_config_icon_theme(void *data __UNUSED__, int ev_type __UNUSED__, __UNUSED__ void *ev)
+_e_border_cb_config_icon_theme(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
 {
    Eina_List *l;
    E_Border *bd;
diff --git a/src/bin/e_canvas.c b/src/bin/e_canvas.c
index 78e2d8c40..c6b4fe924 100644
--- a/src/bin/e_canvas.c
+++ b/src/bin/e_canvas.c
@@ -233,7 +233,7 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
 
 /* local subsystem functions */
 static Eina_Bool
-_e_canvas_cb_flush(__UNUSED__ void *data)
+_e_canvas_cb_flush(void *data __UNUSED__)
 {
    e_canvas_cache_flush();
    return ECORE_CALLBACK_RENEW;
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index 83c5f8724..cb8c4ea10 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -381,7 +381,7 @@ _e_configure_efreet_desktop_update(void)
 }
 
 static Eina_Bool
-_e_configure_cb_efreet_desktop_cache_update(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
+_e_configure_cb_efreet_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    _e_configure_efreet_desktop_cleanup();
    if (update_job) ecore_job_del(update_job);
diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index 5239bb0f4..e6b8a42cf 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -966,7 +966,7 @@ _e_container_find_by_event_window(Ecore_X_Window win)
 }
 
 static Eina_Bool
-_e_container_cb_mouse_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_container_cb_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Mouse_In *ev;
    E_Border *bd;
@@ -985,7 +985,7 @@ _e_container_cb_mouse_in(__UNUSED__ void *data, __UNUSED__ int type, void *event
 }
 
 static Eina_Bool
-_e_container_cb_mouse_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_container_cb_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Mouse_Out *ev;
    E_Container *con;
@@ -1003,7 +1003,7 @@ _e_container_cb_mouse_out(__UNUSED__ void *data, __UNUSED__ int type, void *even
 }
 
 static Eina_Bool
-_e_container_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_container_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Container *con;
@@ -1025,7 +1025,7 @@ _e_container_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *eve
 }
 
 static Eina_Bool
-_e_container_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_container_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Container *con;
@@ -1043,7 +1043,7 @@ _e_container_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event
 }
 
 static Eina_Bool
-_e_container_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_container_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
    E_Container *con;
@@ -1059,7 +1059,7 @@ _e_container_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *eve
 }
 
 static Eina_Bool
-_e_container_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_container_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Wheel *ev;
    E_Container *con;
@@ -1225,7 +1225,7 @@ _e_container_resize_handle(E_Container *con)
 }
 
 static void
-_e_container_event_container_resize_free(__UNUSED__ void *data, void *ev)
+_e_container_event_container_resize_free(void *data __UNUSED__, void *ev)
 {
    E_Event_Container_Resize *e;
 
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 077d20995..ead4a0dd3 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -518,7 +518,7 @@ _e_desk_free(E_Desk *desk)
 }
 
 static void
-_e_desk_event_desk_show_free(__UNUSED__ void *data, void *event)
+_e_desk_event_desk_show_free(void *data __UNUSED__, void *event)
 {
    E_Event_Desk_Show *ev;
 
@@ -528,7 +528,7 @@ _e_desk_event_desk_show_free(__UNUSED__ void *data, void *event)
 }
 
 static void
-_e_desk_event_desk_before_show_free(__UNUSED__ void *data, void *event)
+_e_desk_event_desk_before_show_free(void *data __UNUSED__, void *event)
 {
    E_Event_Desk_Before_Show *ev;
 
@@ -538,7 +538,7 @@ _e_desk_event_desk_before_show_free(__UNUSED__ void *data, void *event)
 }
 
 static void
-_e_desk_event_desk_after_show_free(__UNUSED__ void *data, void *event)
+_e_desk_event_desk_after_show_free(void *data __UNUSED__, void *event)
 {
    E_Event_Desk_After_Show *ev;
 
@@ -548,7 +548,7 @@ _e_desk_event_desk_after_show_free(__UNUSED__ void *data, void *event)
 }
 
 static void
-_e_desk_event_desk_deskshow_free(__UNUSED__ void *data, void *event)
+_e_desk_event_desk_deskshow_free(void *data __UNUSED__, void *event)
 {
    E_Event_Desk_Show *ev;
 
@@ -558,7 +558,7 @@ _e_desk_event_desk_deskshow_free(__UNUSED__ void *data, void *event)
 }
 
 static void
-_e_desk_event_desk_name_change_free(__UNUSED__ void *data, void *event)
+_e_desk_event_desk_name_change_free(void *data __UNUSED__, void *event)
 {
    E_Event_Desk_Name_Change *ev;
 
diff --git a/src/bin/e_entry.c b/src/bin/e_entry.c
index c04ab9efa..574968daf 100644
--- a/src/bin/e_entry.c
+++ b/src/bin/e_entry.c
@@ -342,7 +342,7 @@ e_entry_disable(Evas_Object *entry)
 
 /* Called when a key has been pressed by the user */
 static void
-_e_entry_key_down_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
 
@@ -370,7 +370,7 @@ _e_entry_key_down_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj
 
 /* Called when a key has been released by the user */
 static void
-_e_entry_key_up_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_key_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
 
@@ -393,7 +393,7 @@ _e_entry_key_up_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj,
 
 /* Called when the entry object is pressed by the mouse */
 static void
-_e_entry_mouse_down_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
    Evas_Event_Mouse_Down *event;
@@ -548,7 +548,7 @@ _e_entry_mouse_down_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *o
 
 /* Called when the entry object is released by the mouse */
 static void
-_e_entry_mouse_up_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
    
@@ -577,7 +577,7 @@ _e_entry_mouse_up_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj
 
 /* Called when the mouse moves over the entry object */
 static void
-_e_entry_mouse_move_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_mouse_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
    Evas_Event_Mouse_Move *event;
@@ -622,7 +622,7 @@ _e_entry_mouse_move_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *o
 
 /* Called when the the "selection_notify" event is emitted */
 static Eina_Bool
-_e_entry_x_selection_notify_handler(void *data, __UNUSED__ int type, void *event)
+_e_entry_x_selection_notify_handler(void *data, int type __UNUSED__, void *event)
 {
    Evas_Object *entry;
    E_Entry_Smart_Data *sd;
@@ -1382,7 +1382,7 @@ _e_entry_cb_imf_retrieve_surrounding(void *data, Ecore_IMF_Context *ctx __UNUSED
 }
 
 static Eina_Bool
-_e_entry_cb_imf_event_commit(void *data, __UNUSED__ int type, void *event)
+_e_entry_cb_imf_event_commit(void *data, int type __UNUSED__, void *event)
 {
    Evas_Object *entry;
    E_Entry_Smart_Data *sd;
@@ -1417,7 +1417,7 @@ _e_entry_cb_imf_event_commit(void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_entry_cb_imf_event_delete_surrounding(void *data, __UNUSED__ int type, void *event)
+_e_entry_cb_imf_event_delete_surrounding(void *data, int type __UNUSED__, void *event)
 {
    E_Entry_Smart_Data *sd;
    Ecore_IMF_Event_Delete_Surrounding *ev = event;
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index 6b9f9c48a..e20029c6f 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -321,7 +321,7 @@ _e_exec_cb_instance_finish(void *data)
 
 
 static Eina_Bool
-_e_exec_cb_exit(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_exec_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Del *ev;
    E_Exec_Instance *inst;
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 42c65af6b..646f90cc5 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -658,7 +658,7 @@ _e_fm2_op_registry_entry_print(const E_Fm2_Op_Registry_Entry *ere)
 }
 
 static Eina_Bool
-_e_fm2_op_registry_entry_add_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_fm2_op_registry_entry_add_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    const E_Fm2_Op_Registry_Entry *ere = event;
    printf("E FM OPERATION STARTED: id=%d, op=%d\n", ere->id, ere->op);
@@ -666,7 +666,7 @@ _e_fm2_op_registry_entry_add_cb(__UNUSED__ void *data, __UNUSED__ int type, void
 }
 
 static Eina_Bool
-_e_fm2_op_registry_entry_del_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_fm2_op_registry_entry_del_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    const E_Fm2_Op_Registry_Entry *ere = event;
    puts("E FM OPERATION FINISHED:");
@@ -676,7 +676,7 @@ _e_fm2_op_registry_entry_del_cb(__UNUSED__ void *data, __UNUSED__ int type, void
 }
 
 static Eina_Bool
-_e_fm2_op_registry_entry_changed_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_fm2_op_registry_entry_changed_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    const E_Fm2_Op_Registry_Entry *ere = event;
    puts("E FM OPERATION CHANGED:");
diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c
index a2878435e..29ce1ecd3 100644
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@@ -414,7 +414,7 @@ e_intl_imc_system_path_get(void)
 }
 
 static Eina_Bool
-_e_intl_cb_exit(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_intl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Del *ev;
 
diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c
index 296ef8c6b..687a5eb8c 100644
--- a/src/bin/e_layout.c
+++ b/src/bin/e_layout.c
@@ -302,7 +302,7 @@ _e_layout_smart_disown(Evas_Object *obj)
 }
 
 static void
-_e_layout_smart_item_del_hook(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, __UNUSED__ void *event_info)
+_e_layout_smart_item_del_hook(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    e_layout_unpack(obj);
 }
diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index db899e1d3..8c8e032bd 100644
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -924,7 +924,7 @@ _e_manager_cb_screensaver_notify(void *data __UNUSED__, int ev_type __UNUSED__,
 }
 
 static Eina_Bool
-_e_manager_cb_client_message(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
+_e_manager_cb_client_message(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_X_Event_Client_Message *e;
    E_Border *bd;
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 5bf8d31cc..4beacb7e0 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -2551,7 +2551,7 @@ _e_menu_cb_ecore_evas_resize(Ecore_Evas *ee)
 }
 
 static void
-_e_menu_cb_item_in(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
+_e_menu_cb_item_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Menu_Item *mi;
    
@@ -2560,7 +2560,7 @@ _e_menu_cb_item_in(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *ob
 }
 
 static void
-_e_menu_cb_item_out(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, void *event_info)
+_e_menu_cb_item_out(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
    E_Menu_Item *mi;
    Evas_Event_Mouse_In *ev;
@@ -2584,7 +2584,7 @@ _e_menu_cb_item_out(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *o
 }
 
 static Eina_Bool
-_e_menu_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_menu_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev;
    
@@ -2637,7 +2637,7 @@ _e_menu_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_menu_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_menu_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev;
    
@@ -2652,7 +2652,7 @@ _e_menu_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
  */
 
 static Eina_Bool
-_e_menu_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_menu_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    
@@ -2671,7 +2671,7 @@ _e_menu_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_menu_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_menu_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    Ecore_X_Time t;
@@ -2712,7 +2712,7 @@ _e_menu_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_menu_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_menu_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
    Eina_List *l, *tmp;
@@ -2770,7 +2770,7 @@ _e_menu_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_menu_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_menu_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Wheel *ev;
    
@@ -2794,7 +2794,7 @@ _e_menu_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_menu_cb_scroll_animator(__UNUSED__ void *data)
+_e_menu_cb_scroll_animator(void *data __UNUSED__)
 {
    double t, dt;
    double dx, dy;
@@ -2844,7 +2844,7 @@ _e_menu_cb_scroll_animator(__UNUSED__ void *data)
 }
 
 static Eina_Bool
-_e_menu_cb_window_shape(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
+_e_menu_cb_window_shape(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Eina_List *l;
    Ecore_X_Event_Window_Shape *e;
@@ -2873,7 +2873,7 @@ _e_menu_cb_item_submenu_post_default(void *data __UNUSED__, E_Menu *m __UNUSED__
 
 
 static Eina_Bool
-_e_menu_categories_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, __UNUSED__ void *fdata)
+_e_menu_categories_free_cb(const Eina_Hash __UNUSED__ *hash, const void __UNUSED__ *key, void *data, void *fdata __UNUSED__)
 {
    E_Menu_Category_Callback *cb;
    E_Menu_Category *cat;
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index c2f704ae2..3f468227b 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -529,7 +529,7 @@ _e_module_cb_dialog_disable(void *data, E_Dialog *dia)
 }
 
 static Eina_Bool
-_e_module_cb_idler(__UNUSED__ void *data)
+_e_module_cb_idler(void *data __UNUSED__)
 {
    if (_e_modules_delayed)
      {
@@ -568,7 +568,7 @@ _e_module_sort_priority(const void *d1, const void *d2)
 
 
 static void 
-_e_module_event_update_free(__UNUSED__ void *data, void *event) 
+_e_module_event_update_free(void *data __UNUSED__, void *event) 
 {
    E_Event_Module_Update *ev;
 
diff --git a/src/bin/e_msg.c b/src/bin/e_msg.c
index eb0436eb0..c833cfdfb 100644
--- a/src/bin/e_msg.c
+++ b/src/bin/e_msg.c
@@ -114,7 +114,7 @@ e_msg_handler_del(E_Msg_Handler *emsgh)
 /* local subsystem functions */
 
 static Eina_Bool
-_e_msg_event_cb(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
+_e_msg_event_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    E_Msg_Event *e;
    Eina_List *l;
@@ -137,7 +137,7 @@ _e_msg_event_cb(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 }
 
 static void
-_e_msg_event_free(__UNUSED__ void *data, void *ev)
+_e_msg_event_free(void *data __UNUSED__, void *ev)
 {
    E_Msg_Event *e;
 
diff --git a/src/bin/e_order.c b/src/bin/e_order.c
index 590574693..4be516f6c 100644
--- a/src/bin/e_order.c
+++ b/src/bin/e_order.c
@@ -252,7 +252,7 @@ _e_order_save(E_Order *eo)
 }
 
 static Eina_Bool
-_e_order_cb_efreet_cache_update(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *ev)
+_e_order_cb_efreet_cache_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
 {
    Eina_List *l;
    E_Order *eo;
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 4e308b614..e69e0097b 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -294,7 +294,7 @@ _e_pointer_canvas_del(E_Pointer *p)
 }
 
 static void
-_e_pointer_cb_move(void *data, Evas *e __UNUSED__, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
+_e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Pointer *p;
    Evas_Coord x, y;
@@ -454,7 +454,7 @@ _e_pointer_active_handle(E_Pointer *p)
 }
 
 static Eina_Bool
-_e_pointer_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
+_e_pointer_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    Eina_List *l;
    E_Pointer *p;
@@ -473,7 +473,7 @@ _e_pointer_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__
 }
 
 static Eina_Bool
-_e_pointer_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
+_e_pointer_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    Eina_List *l;
    E_Pointer *p;
@@ -492,7 +492,7 @@ _e_pointer_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ vo
 }
 
 static Eina_Bool
-_e_pointer_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
+_e_pointer_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    Eina_List *l;
    E_Pointer *p;
@@ -511,7 +511,7 @@ _e_pointer_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__
 }
 
 static Eina_Bool
-_e_pointer_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
+_e_pointer_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    Eina_List *l;
    E_Pointer *p;
diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c
index 506fade19..3c028eccb 100644
--- a/src/bin/e_popup.c
+++ b/src/bin/e_popup.c
@@ -333,7 +333,7 @@ _e_popup_idle_enterer(void *data)
 }
 
 static Eina_Bool
-_e_popup_cb_window_shape(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
+_e_popup_cb_window_shape(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    E_Popup *pop;
    Ecore_X_Event_Window_Shape *e;
diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index 355a4fc34..10a320069 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -124,7 +124,7 @@ e_remember_internal_save(void)
 }
 
 static Eina_Bool
-_e_remember_restore_cb(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
+_e_remember_restore_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Remember *rem;
    Eina_List *l;
@@ -597,7 +597,7 @@ _e_remember_cb_hook_eval_post_new_border(void *data __UNUSED__, void *border)
 }
 
 static void
-_e_remember_cb_hook_pre_post_fetch(__UNUSED__ void *data, void *border)
+_e_remember_cb_hook_pre_post_fetch(void *data __UNUSED__, void *border)
 {
    E_Border *bd = border;
    E_Remember *rem = NULL;
diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c
index 2edb2ded7..283d8e17f 100644
--- a/src/bin/e_startup.c
+++ b/src/bin/e_startup.c
@@ -66,7 +66,7 @@ _e_startup(void)
 }
 
 static void
-_e_startup_next_cb(__UNUSED__ void *data)
+_e_startup_next_cb(void *data __UNUSED__)
 {
    _e_startup();
 }
diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
index 1f9cc2928..b16c69acd 100644
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@@ -161,7 +161,7 @@ e_sys_con_extra_action_list_get(void)
 
 /* local subsystem functions */
 static Eina_Bool
-_e_sys_cb_timer(__UNUSED__ void *data)
+_e_sys_cb_timer(void *data __UNUSED__)
 {
    /* exec out sys helper and ask it to test if we are allowed to do these
     * things
diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c
index 772f3411b..cad23b0a1 100644
--- a/src/bin/e_thumb.c
+++ b/src/bin/e_thumb.c
@@ -392,7 +392,7 @@ _e_thumb_thumbnailers_kill_cancel(void)
 }
 
 static Eina_Bool
-_e_thumb_cb_kill(__UNUSED__ void *data)
+_e_thumb_cb_kill(void *data __UNUSED__)
 {
    Eina_List *l;
    Ecore_Exe *exe;
@@ -404,7 +404,7 @@ _e_thumb_cb_kill(__UNUSED__ void *data)
 }
 
 static Eina_Bool
-_e_thumb_cb_exe_event_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_e_thumb_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Del *ev;
    Ecore_Exe *exe;
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index 3256d4c45..ec94c12d8 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -1440,7 +1440,7 @@ _e_util_cb_delayed_del(void *data)
 }
 
 static Eina_Bool
-_e_util_wakeup_cb(__UNUSED__ void *data)
+_e_util_wakeup_cb(void *data __UNUSED__)
 {
    _e_util_dummy_timer = NULL;
    return ECORE_CALLBACK_CANCEL;
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 41ab162be..3fe8be6e4 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -1092,7 +1092,7 @@ _e_zone_free(E_Zone *zone)
 }
 
 static void
-_e_zone_cb_bg_mouse_down(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
+_e_zone_cb_bg_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Zone *zone;
 
@@ -1122,7 +1122,7 @@ _e_zone_cb_bg_mouse_down(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Obje
 }
 
 static void
-_e_zone_cb_bg_mouse_up(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
+_e_zone_cb_bg_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Zone *zone;
 
@@ -1156,7 +1156,7 @@ _e_zone_cb_bg_mouse_up(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object
 }
 
 static void
-_e_zone_event_zone_desk_count_set_free(__UNUSED__ void *data, void *ev)
+_e_zone_event_zone_desk_count_set_free(void *data __UNUSED__, void *ev)
 {
    E_Event_Zone_Desk_Count_Set *e;
 
@@ -1166,7 +1166,7 @@ _e_zone_event_zone_desk_count_set_free(__UNUSED__ void *data, void *ev)
 }
 
 static Eina_Bool
-_e_zone_cb_mouse_in(void *data, __UNUSED__ int type, void *event)
+_e_zone_cb_mouse_in(void *data, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Mouse_In *ev;
    E_Event_Zone_Edge *zev;
@@ -1192,7 +1192,7 @@ _e_zone_cb_mouse_in(void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_zone_cb_mouse_out(void *data, __UNUSED__ int type, void *event)
+_e_zone_cb_mouse_out(void *data, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Mouse_Out *ev;
    E_Event_Zone_Edge *zev;
@@ -1217,7 +1217,7 @@ _e_zone_cb_mouse_out(void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_zone_cb_mouse_down(void *data, __UNUSED__ int type, void *event)
+_e_zone_cb_mouse_down(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Event_Zone_Edge *zev;
@@ -1242,7 +1242,7 @@ _e_zone_cb_mouse_down(void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_zone_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
+_e_zone_cb_mouse_up(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Event_Zone_Edge *zev;
@@ -1267,7 +1267,7 @@ _e_zone_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_zone_cb_mouse_move(void *data, __UNUSED__ int type, void *event)
+_e_zone_cb_mouse_move(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
    E_Event_Zone_Edge *zev;
@@ -1291,7 +1291,7 @@ _e_zone_cb_mouse_move(void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_e_zone_cb_desk_after_show(void *data, __UNUSED__ int type, void *event)
+_e_zone_cb_desk_after_show(void *data, int type __UNUSED__, void *event)
 {
    E_Event_Desk_Show *ev;
    E_Zone *zone;
@@ -1330,7 +1330,7 @@ _e_zone_cb_edge_timer(void *data)
 }
 
 static void
-_e_zone_event_move_resize_free(__UNUSED__ void *data, void *ev)
+_e_zone_event_move_resize_free(void *data __UNUSED__, void *ev)
 {
    E_Event_Zone_Move_Resize *e;
 
@@ -1340,7 +1340,7 @@ _e_zone_event_move_resize_free(__UNUSED__ void *data, void *ev)
 }
 
 static void
-_e_zone_event_add_free(__UNUSED__ void *data, void *ev)
+_e_zone_event_add_free(void *data __UNUSED__, void *ev)
 {
    E_Event_Zone_Add *e;
 
@@ -1350,7 +1350,7 @@ _e_zone_event_add_free(__UNUSED__ void *data, void *ev)
 }
 
 static void
-_e_zone_event_del_free(__UNUSED__ void *data, void *ev)
+_e_zone_event_del_free(void *data __UNUSED__, void *ev)
 {
    E_Event_Zone_Del *e;