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

bluez4: add missing EINA_UNUSED

This commit is contained in:
Jérémy Zurcher 2014-05-07 11:23:09 +02:00
parent dfbb42b81d
commit a161537006
3 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/bluez4/agent.c
View File

@ -80,7 +80,7 @@ _reply_and_del_dialog(Eldbus_Message *reply, E_Dialog *dialog)
}
static void
_reject(void *data, E_Dialog *dialog)
_reject(void *data EINA_UNUSED, E_Dialog *dialog)
{
const Eldbus_Message *msg = dialog->data;
Eldbus_Message *reply = eldbus_message_error_new(msg, BLUEZ_ERROR_REJECTED,
@ -89,7 +89,7 @@ _reject(void *data, E_Dialog *dialog)
}
static void
_ok(void *data, E_Dialog *dialog)
_ok(void *data EINA_UNUSED, E_Dialog *dialog)
{
const Eldbus_Message *msg = dialog->data;
Eldbus_Message *reply = eldbus_message_method_return_new(msg);
@ -117,14 +117,16 @@ _ask(const char *title, const char *ask_msg, const char *ok_label,
/* Implementation of agent API */
static Eldbus_Message *
_agent_release(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
_agent_release(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *message)
{
DBG("Agent Released.");
return eldbus_message_method_return_new(message);
}
static Eldbus_Message *
_agent_request_pin_code(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
_agent_request_pin_code(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *message)
{
Eldbus_Message *msg = (Eldbus_Message *)message;
eldbus_message_ref(msg);
@ -136,7 +138,8 @@ _agent_request_pin_code(const Eldbus_Service_Interface *iface, const Eldbus_Mess
}
static Eldbus_Message *
_agent_request_passkey(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
_agent_request_passkey(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *message)
{
Eldbus_Message *msg = (Eldbus_Message *)message;
eldbus_message_ref(msg);
@ -148,7 +151,8 @@ _agent_request_passkey(const Eldbus_Service_Interface *iface, const Eldbus_Messa
}
static Eldbus_Message *
_agent_display_passkey(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
_agent_display_passkey(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *message)
{
const char *device;
uint32_t passkey;
@ -165,7 +169,8 @@ _agent_display_passkey(const Eldbus_Service_Interface *iface, const Eldbus_Messa
}
static Eldbus_Message *
_agent_display_pin_code(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
_agent_display_pin_code(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *message)
{
const char *device, *pincode;
Device *dev;
@ -179,7 +184,8 @@ _agent_display_pin_code(const Eldbus_Service_Interface *iface, const Eldbus_Mess
}
static Eldbus_Message *
_agent_request_confirmation(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
_agent_request_confirmation(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *message)
{
const char *device;
uint32_t passkey;
@ -196,7 +202,8 @@ _agent_request_confirmation(const Eldbus_Service_Interface *iface, const Eldbus_
}
static Eldbus_Message *
_agent_authorize(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
_agent_authorize(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *message)
{
const char *device, *uuid;
Device *dev;
@ -212,7 +219,8 @@ _agent_authorize(const Eldbus_Service_Interface *iface, const Eldbus_Message *me
}
static Eldbus_Message *
_agent_cancel(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
_agent_cancel(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *message)
{
DBG("Request canceled.");
return eldbus_message_method_return_new(message);

31
src/modules/bluez4/e_mod_main.c
View File

@ -103,7 +103,7 @@ _ebluez4_cb_pair(void *data)
}
static void
_ebluez4_cb_search(void *data, E_Menu *m, E_Menu_Item *mi)
_ebluez4_cb_search(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
{
Instance *inst = data;
E_Dialog *dialog;
@ -242,7 +242,7 @@ _ebluez4_cb_adap_list_dialog_del(E_Win *win)
}
static void
_ebluez4_cb_adap_list(void *data, E_Menu *m, E_Menu_Item *mi)
_ebluez4_cb_adap_list(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
{
Instance *inst = data;
E_Dialog *dialog;
@ -270,19 +270,19 @@ _ebluez4_cb_adap_list(void *data, E_Menu *m, E_Menu_Item *mi)
}
static void
_ebluez4_cb_connect(void *data, E_Menu *m, E_Menu_Item *mi)
_ebluez4_cb_connect(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
{
ebluez4_connect_to_device(data);
}
static void
_ebluez4_cb_disconnect(void *data, E_Menu *m, E_Menu_Item *mi)
_ebluez4_cb_disconnect(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
{
ebluez4_disconnect_device(data);
}
static void
_ebluez4_cb_forget(void *data, E_Menu *m, E_Menu_Item *mi)
_ebluez4_cb_forget(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
{
Device *dev = data;
ebluez4_remove_device(dev->obj);
@ -458,7 +458,8 @@ _ebluez4_menu_new(Instance *inst)
}
static void
_ebluez4_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
_ebluez4_cb_mouse_down(void *data, Evas *evas EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *event)
{
Instance *inst = NULL;
Evas_Event_Mouse_Down *ev = event;
@ -533,27 +534,27 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static const char *
_gc_id_new(const E_Gadcon_Client_Class *client_class)
_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
{
snprintf(tmpbuf, sizeof(tmpbuf), "bluez4.%d", eina_list_count(instances));
return tmpbuf;
}
static void
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED)
{
e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16);
}
static const char *
_gc_label(const E_Gadcon_Client_Class *client_class)
_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
{
return _("Bluez4");
}
static Evas_Object *
_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas)
_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas)
{
Evas_Object *o = NULL;
char buf[4096];
@ -635,14 +636,16 @@ _ebluez_exe_die(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *event_inf
}
static Eina_Bool
_ebluez_exe_out(void *data, int ev_type, void *ev)
_ebluez_exe_out(void *data EINA_UNUSED, int ev_type EINA_UNUSED,
void *ev EINA_UNUSED)
{
/* FIXME: Need experiment, but we should be able to use latency to somehow estimate distance, right ? */
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_ebluez_desklock(void *data, int ev_type, void *ev)
_ebluez_desklock(void *data EINA_UNUSED, int ev_type EINA_UNUSED,
void *ev EINA_UNUSED)
{
if (autolock_exe)
ecore_exe_kill(autolock_exe);
@ -694,7 +697,7 @@ e_modapi_init(E_Module *m)
}
EAPI int
e_modapi_shutdown(E_Module *m)
e_modapi_shutdown(E_Module *m EINA_UNUSED)
{
E_CONFIG_DD_FREE(conf_edd);
@ -717,7 +720,7 @@ e_modapi_shutdown(E_Module *m)
}
EAPI int
e_modapi_save(E_Module *m)
e_modapi_save(E_Module *m EINA_UNUSED)
{
e_config_domain_save("module.ebluez4",
conf_edd, ebluez4_config);

39
src/modules/bluez4/ebluez4.c
View File

@ -273,7 +273,8 @@ _on_dev_property_changed(void *context, const Eldbus_Message *msg)
}
static void
_on_connected(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
_on_connected(void *data EINA_UNUSED, const Eldbus_Message *msg,
Eldbus_Pending *pending EINA_UNUSED)
{
const char *err_name, *err_msg;
@ -293,7 +294,8 @@ _try_to_connect(Eldbus_Proxy *proxy)
}
static void
_on_disconnected(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
_on_disconnected(void *data EINA_UNUSED, const Eldbus_Message *msg,
Eldbus_Pending *pending EINA_UNUSED)
{
const char *err_name, *err_msg;
@ -313,7 +315,8 @@ _try_to_disconnect(Eldbus_Proxy *proxy)
}
static void
_on_paired(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
_on_paired(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending EINA_UNUSED)
{
const char *err_name, *err_msg;
Pair_Cb *d = data;
@ -329,7 +332,8 @@ _on_paired(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
}
static void
_on_dev_properties(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
_on_dev_properties(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending EINA_UNUSED)
{
Eldbus_Message_Iter *dict, *uuids;
const char *addr, *name, *icon;
@ -374,7 +378,7 @@ _set_dev(const char *path)
}
static void
_on_removed(void *context, const Eldbus_Message *msg)
_on_removed(void *context EINA_UNUSED, const Eldbus_Message *msg)
{
const char *path;
Device *dev, *fdev;
@ -391,7 +395,7 @@ _on_removed(void *context, const Eldbus_Message *msg)
}
static void
_on_created(void *context, const Eldbus_Message *msg)
_on_created(void *context EINA_UNUSED, const Eldbus_Message *msg)
{
const char *path;
@ -402,7 +406,7 @@ _on_created(void *context, const Eldbus_Message *msg)
}
static void
_on_device_found(void *context, const Eldbus_Message *msg)
_on_device_found(void *context EINA_UNUSED, const Eldbus_Message *msg)
{
Eldbus_Message_Iter *dict, *uuids;
const char *addr, *name, *icon;
@ -428,7 +432,8 @@ _on_device_found(void *context, const Eldbus_Message *msg)
}
static void
_on_list_devices(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
_on_list_devices(void *data EINA_UNUSED, const Eldbus_Message *msg,
Eldbus_Pending *pending EINA_UNUSED)
{
Eldbus_Message_Iter *array;
const char *path;
@ -499,7 +504,8 @@ _on_adap_property_changed(void *context, const Eldbus_Message *msg)
}
static void
_on_adap_properties(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
_on_adap_properties(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending EINA_UNUSED)
{
Eldbus_Message_Iter *dict, *entry, *variant;
const char *name, *key;
@ -591,7 +597,8 @@ _set_adapter(const char *path)
}
static void
_on_list_adapters(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
_on_list_adapters(void *data EINA_UNUSED, const Eldbus_Message *msg,
Eldbus_Pending *pending EINA_UNUSED)
{
Eldbus_Message_Iter *array;
const char *path;
@ -648,7 +655,8 @@ _set_default_adapter(const Eldbus_Message *msg)
}
static void
_default_adapter_get(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
_default_adapter_get(void *data EINA_UNUSED, const Eldbus_Message *msg,
Eldbus_Pending *pending EINA_UNUSED)
{
const char *err_name, *err_msg;
@ -664,13 +672,13 @@ _default_adapter_get(void *data, const Eldbus_Message *msg, Eldbus_Pending *pend
}
static void
_on_default_adapter_changed(void *context, const Eldbus_Message *msg)
_on_default_adapter_changed(void *context EINA_UNUSED, const Eldbus_Message *msg)
{
_set_default_adapter(msg);
}
static void
_on_adapter_removed(void *context, const Eldbus_Message *msg)
_on_adapter_removed(void *context EINA_UNUSED, const Eldbus_Message *msg)
{
const char *adap_path;
const char *err_msg = _("Error reading path of Removed Adapter");
@ -686,7 +694,7 @@ _on_adapter_removed(void *context, const Eldbus_Message *msg)
}
static void
_on_adapter_added(void *context, const Eldbus_Message *msg)
_on_adapter_added(void *context EINA_UNUSED, const Eldbus_Message *msg)
{
const char *adap_path;
const char *err_msg = _("Error reading path of Added Adapter");
@ -702,7 +710,8 @@ _on_adapter_added(void *context, const Eldbus_Message *msg)
}
static void
_bluez_monitor(void *data, const char *bus, const char *old_id, const char *new_id)
_bluez_monitor(void *data EINA_UNUSED, const char *bus EINA_UNUSED,
const char *old_id, const char *new_id)
{
if (!strcmp(old_id,"") && strcmp(new_id,""))
{