kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edbus: (de)yodafy free cb functions 

edbus_connection_cb_free_add     -> edbus_connection_free_cb_add
edbus_connection_cb_free_del     -> edbus_connection_free_cb_del
edbus_object_cb_free_add         -> edbus_object_free_cb_add
edbus_object_cb_free_del         -> edbus_object_free_cb_del
edbus_pending_cb_free_add        -> edbus_pending_free_cb_add
edbus_pending_cb_free_del        -> edbus_pending_free_cb_del
edbus_proxy_cb_free_add          -> edbus_proxy_free_cb_add
edbus_proxy_cb_free_del          -> edbus_proxy_free_cb_del
edbus_signal_handler_cb_free_add -> edbus_signal_handler_free_cb_add
edbus_signal_handler_cb_free_del -> edbus_signal_handler_free_cb_del



SVN revision: 81389
This commit is contained in:
Lucas De Marchi 2012-12-19 17:30:11 +00:00
parent dcda0e6610
commit bb50f86bc5
11 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/edbus/src/lib/edbus_connection.h
View File

@ -64,12 +64,12 @@ EAPI void edbus_connection_unref(EDBus_Connection *conn) EINA_ARG_N
* @param cb callback to be called
* @param data data passed to callback
*/
EAPI void edbus_connection_cb_free_add(EDBus_Connection *conn, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_connection_free_cb_add(EDBus_Connection *conn, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in edbus_connection_cb_free_add().
* @brief Remove callback registered in edbus_connection_free_cb_add().
*/
EAPI void edbus_connection_cb_free_del(EDBus_Connection *conn, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_connection_free_cb_del(EDBus_Connection *conn, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Set an attached data pointer to an object with a given string key.

4
legacy/edbus/src/lib/edbus_core.c
View File

@ -1095,7 +1095,7 @@ edbus_connection_unref(EDBus_Connection *conn)
}
EAPI void
edbus_connection_cb_free_add(EDBus_Connection *conn, EDBus_Free_Cb cb, const void *data)
edbus_connection_free_cb_add(EDBus_Connection *conn, EDBus_Free_Cb cb, const void *data)
{
EDBUS_CONNECTION_CHECK(conn);
EINA_SAFETY_ON_NULL_RETURN(cb);
@ -1103,7 +1103,7 @@ edbus_connection_cb_free_add(EDBus_Connection *conn, EDBus_Free_Cb cb, const voi
}
EAPI void
edbus_connection_cb_free_del(EDBus_Connection *conn, EDBus_Free_Cb cb, const void *data)
edbus_connection_free_cb_del(EDBus_Connection *conn, EDBus_Free_Cb cb, const void *data)
{
EDBUS_CONNECTION_CHECK(conn);
EINA_SAFETY_ON_NULL_RETURN(cb);

14
legacy/edbus/src/lib/edbus_object.c
View File

@ -139,7 +139,7 @@ _edbus_object_free(EDBus_Object *obj)
EINA_LIST_FREE(obj->signal_handlers, h)
{
if (h->dangling)
edbus_signal_handler_cb_free_del(h, _on_signal_handler_free, obj);
edbus_signal_handler_free_cb_del(h, _on_signal_handler_free, obj);
else
ERR("obj=%p alive handler=%p %s", obj, h,
edbus_signal_handler_match_get(h));
@ -209,7 +209,7 @@ edbus_object_get(EDBus_Connection *conn, const char *bus, const char *path)
EINA_MAGIC_SET(obj, EDBUS_OBJECT_MAGIC);
edbus_connection_name_object_set(conn, obj);
edbus_connection_cb_free_add(obj->conn, _on_connection_free, obj);
edbus_connection_free_cb_add(obj->conn, _on_connection_free, obj);
obj->properties = edbus_proxy_get(obj, EDBUS_FDO_INTERFACE_PROPERTIES);
@ -231,7 +231,7 @@ _edbus_object_unref(EDBus_Object *obj)
obj->refcount--;
if (obj->refcount > 0) return;
edbus_connection_cb_free_del(obj->conn, _on_connection_free, obj);
edbus_connection_free_cb_del(obj->conn, _on_connection_free, obj);
_edbus_object_clear(obj);
_edbus_object_free(obj);
}
@ -256,7 +256,7 @@ edbus_object_unref(EDBus_Object *obj)
}
EAPI void
edbus_object_cb_free_add(EDBus_Object *obj, EDBus_Free_Cb cb, const void *data)
edbus_object_free_cb_add(EDBus_Object *obj, EDBus_Free_Cb cb, const void *data)
{
EDBUS_OBJECT_CHECK(obj);
EINA_SAFETY_ON_NULL_RETURN(cb);
@ -264,7 +264,7 @@ edbus_object_cb_free_add(EDBus_Object *obj, EDBus_Free_Cb cb, const void *data)
}
EAPI void
edbus_object_cb_free_del(EDBus_Object *obj, EDBus_Free_Cb cb, const void *data)
edbus_object_free_cb_del(EDBus_Object *obj, EDBus_Free_Cb cb, const void *data)
{
EDBUS_OBJECT_CHECK(obj);
EINA_SAFETY_ON_NULL_RETURN(cb);
@ -579,7 +579,7 @@ edbus_object_send(EDBus_Object *obj, EDBus_Message *msg, EDBus_Message_Cb cb, co
if (!cb) return NULL;
EINA_SAFETY_ON_NULL_RETURN_VAL(pending, NULL);
edbus_pending_cb_free_add(pending, _on_pending_free, obj);
edbus_pending_free_cb_add(pending, _on_pending_free, obj);
obj->pendings = eina_inlist_append(obj->pendings, EINA_INLIST_GET(pending));
return pending;
@ -605,7 +605,7 @@ edbus_object_signal_handler_add(EDBus_Object *obj, const char *interface, const
interface, member, cb, cb_data);
EINA_SAFETY_ON_NULL_RETURN_VAL(handler, NULL);
edbus_signal_handler_cb_free_add(handler, _on_signal_handler_free, obj);
edbus_signal_handler_free_cb_add(handler, _on_signal_handler_free, obj);
obj->signal_handlers = eina_list_append(obj->signal_handlers, handler);
return handler;

6
legacy/edbus/src/lib/edbus_object.h
View File

@ -34,12 +34,12 @@ EAPI void edbus_object_unref(EDBus_Object *obj) EINA_ARG_NONNULL(1);
* @param cb callback that will be executed
* @param data passed to callback
*/
EAPI void edbus_object_cb_free_add(EDBus_Object *obj, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_object_free_cb_add(EDBus_Object *obj, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in edbus_object_cb_free_add().
* @brief Remove callback registered in edbus_object_free_cb_add().
*/
EAPI void edbus_object_cb_free_del(EDBus_Object *obj, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_object_free_cb_del(EDBus_Object *obj, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
typedef enum
{

6
legacy/edbus/src/lib/edbus_pending.c
View File

@ -99,7 +99,7 @@ edbus_connection_send(EDBus_Connection *conn, EDBus_Message *msg, EDBus_Message_
EINA_SAFETY_ON_NULL_RETURN_VAL(pending, NULL);
edbus_connection_pending_add(conn, pending);
edbus_pending_cb_free_add(pending, _on_pending_free, conn);
edbus_pending_free_cb_add(pending, _on_pending_free, conn);
return pending;
}
@ -216,7 +216,7 @@ edbus_pending_cancel(EDBus_Pending *pending)
}
EAPI void
edbus_pending_cb_free_add(EDBus_Pending *pending, EDBus_Free_Cb cb, const void *data)
edbus_pending_free_cb_add(EDBus_Pending *pending, EDBus_Free_Cb cb, const void *data)
{
EDBUS_PENDING_CHECK(pending);
EINA_SAFETY_ON_NULL_RETURN(cb);
@ -224,7 +224,7 @@ edbus_pending_cb_free_add(EDBus_Pending *pending, EDBus_Free_Cb cb, const void *
}
EAPI void
edbus_pending_cb_free_del(EDBus_Pending *pending, EDBus_Free_Cb cb, const void *data)
edbus_pending_free_cb_del(EDBus_Pending *pending, EDBus_Free_Cb cb, const void *data)
{
EDBUS_PENDING_CHECK(pending);
EINA_SAFETY_ON_NULL_RETURN(cb);

6
legacy/edbus/src/lib/edbus_pending.h
View File

@ -20,12 +20,12 @@ EAPI const char *edbus_pending_method_get(const EDBus_Pending *pending
/**
* @brief Add a callback function to be called when pending will be freed.
*/
EAPI void edbus_pending_cb_free_add(EDBus_Pending *pending, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_pending_free_cb_add(EDBus_Pending *pending, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in edbus_pending_cb_free_add().
* @brief Remove callback registered in edbus_pending_free_cb_add().
*/
EAPI void edbus_pending_cb_free_del(EDBus_Pending *pending, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_pending_free_cb_del(EDBus_Pending *pending, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @}

14
legacy/edbus/src/lib/edbus_proxy.c
View File

@ -156,7 +156,7 @@ _edbus_proxy_free(EDBus_Proxy *proxy)
EINA_LIST_FREE(proxy->handlers, h)
{
if (h->dangling)
edbus_signal_handler_cb_free_del(h, _on_signal_handler_free, proxy);
edbus_signal_handler_free_cb_del(h, _on_signal_handler_free, proxy);
else
ERR("proxy=%p alive handler=%p %s", proxy, h,
edbus_signal_handler_match_get(h));
@ -215,7 +215,7 @@ edbus_proxy_get(EDBus_Object *obj, const char *interface)
EINA_MAGIC_SET(proxy, EDBUS_PROXY_MAGIC);
if (!edbus_object_proxy_add(obj, proxy))
goto cleanup;
edbus_object_cb_free_add(obj, _on_object_free, proxy);
edbus_object_free_cb_add(obj, _on_object_free, proxy);
return proxy;
@ -233,7 +233,7 @@ _edbus_proxy_unref(EDBus_Proxy *proxy)
proxy->refcount--;
if (proxy->refcount > 0) return;
edbus_object_cb_free_del(proxy->obj, _on_object_free, proxy);
edbus_object_free_cb_del(proxy->obj, _on_object_free, proxy);
_edbus_proxy_clear(proxy);
_edbus_proxy_free(proxy);
}
@ -258,7 +258,7 @@ edbus_proxy_unref(EDBus_Proxy *proxy)
}
EAPI void
edbus_proxy_cb_free_add(EDBus_Proxy *proxy, EDBus_Free_Cb cb, const void *data)
edbus_proxy_free_cb_add(EDBus_Proxy *proxy, EDBus_Free_Cb cb, const void *data)
{
EDBUS_PROXY_CHECK(proxy);
EINA_SAFETY_ON_NULL_RETURN(cb);
@ -266,7 +266,7 @@ edbus_proxy_cb_free_add(EDBus_Proxy *proxy, EDBus_Free_Cb cb, const void *data)
}
EAPI void
edbus_proxy_cb_free_del(EDBus_Proxy *proxy, EDBus_Free_Cb cb, const void *data)
edbus_proxy_free_cb_del(EDBus_Proxy *proxy, EDBus_Free_Cb cb, const void *data)
{
EDBUS_PROXY_CHECK(proxy);
EINA_SAFETY_ON_NULL_RETURN(cb);
@ -507,7 +507,7 @@ _edbus_proxy_send(EDBus_Proxy *proxy, EDBus_Message *msg, EDBus_Message_Cb cb, c
if (!cb) return NULL;
EINA_SAFETY_ON_NULL_RETURN_VAL(pending, NULL);
edbus_pending_cb_free_add(pending, _on_pending_free, proxy);
edbus_pending_free_cb_add(pending, _on_pending_free, proxy);
proxy->pendings = eina_inlist_append(proxy->pendings,
EINA_INLIST_GET(pending));
@ -608,7 +608,7 @@ edbus_proxy_signal_handler_add(EDBus_Proxy *proxy, const char *member, EDBus_Sig
proxy->interface, member, cb, cb_data);
EINA_SAFETY_ON_NULL_RETURN_VAL(handler, NULL);
edbus_signal_handler_cb_free_add(handler, _on_signal_handler_free, proxy);
edbus_signal_handler_free_cb_add(handler, _on_signal_handler_free, proxy);
proxy->handlers = eina_list_append(proxy->handlers, handler);
return handler;

6
legacy/edbus/src/lib/edbus_proxy.h
View File

@ -34,12 +34,12 @@ EAPI void *edbus_proxy_data_del(EDBus_Proxy *proxy, const char *
* @brief Add a callback function to be called when occurs a event of the
* type passed.
*/
EAPI void edbus_proxy_cb_free_add(EDBus_Proxy *proxy, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_proxy_free_cb_add(EDBus_Proxy *proxy, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in edbus_proxy_cb_free_add().
* @brief Remove callback registered in edbus_proxy_free_cb_add().
*/
EAPI void edbus_proxy_cb_free_del(EDBus_Proxy *proxy, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_proxy_free_cb_del(EDBus_Proxy *proxy, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Constructs a new message to invoke a method on a remote interface.

4
legacy/edbus/src/lib/edbus_service.c
View File

@ -656,7 +656,7 @@ _edbus_service_object_add(EDBus_Connection *conn, const char *path)
obj->conn = conn;
obj->path = eina_stringshare_add(path);
obj->interfaces = eina_hash_string_superfast_new(NULL);
edbus_connection_cb_free_add(conn, _on_connection_free, obj);
edbus_connection_free_cb_add(conn, _on_connection_free, obj);
eina_hash_add(obj->interfaces, introspectable->name, introspectable);
eina_hash_add(obj->interfaces, properties_iface->name, properties_iface);
@ -1114,7 +1114,7 @@ edbus_service_object_unregister(EDBus_Service_Interface *iface)
* It will be freed when _object_unregister() is called
* by libdbus.
*/
edbus_connection_cb_free_del(iface->obj->conn, _on_connection_free, iface->obj);
edbus_connection_free_cb_del(iface->obj->conn, _on_connection_free, iface->obj);
dbus_connection_unregister_object_path(iface->obj->conn->dbus_conn, iface->obj->path);
}

12
legacy/edbus/src/lib/edbus_signal_handler.c
View File

@ -147,7 +147,7 @@ static void
_on_connection_free(void *data, const void *dead_pointer)
{
EDBus_Signal_Handler *sh = data;
edbus_signal_handler_cb_free_del(sh, _on_handler_of_conn_free, sh->conn);
edbus_signal_handler_free_cb_del(sh, _on_handler_of_conn_free, sh->conn);
edbus_signal_handler_del(sh);
}
@ -155,7 +155,7 @@ static void
_on_handler_of_conn_free(void *data, const void *dead_pointer)
{
EDBus_Connection *conn = data;
edbus_connection_cb_free_del(conn, _on_connection_free, dead_pointer);
edbus_connection_free_cb_del(conn, _on_connection_free, dead_pointer);
}
EAPI EDBus_Signal_Handler *
@ -164,8 +164,8 @@ edbus_signal_handler_add(EDBus_Connection *conn, const char *sender, const char
EDBus_Signal_Handler *sh;
sh = _edbus_signal_handler_add(conn, sender, path, interface, member, cb, cb_data);
EINA_SAFETY_ON_NULL_RETURN_VAL(sh, NULL);
edbus_connection_cb_free_add(conn, _on_connection_free, sh);
edbus_signal_handler_cb_free_add(sh, _on_handler_of_conn_free, conn);
edbus_connection_free_cb_add(conn, _on_connection_free, sh);
edbus_signal_handler_free_cb_add(sh, _on_handler_of_conn_free, conn);
return sh;
}
@ -302,7 +302,7 @@ edbus_signal_handler_del(EDBus_Signal_Handler *handler)
}
EAPI void
edbus_signal_handler_cb_free_add(EDBus_Signal_Handler *handler, EDBus_Free_Cb cb, const void *data)
edbus_signal_handler_free_cb_add(EDBus_Signal_Handler *handler, EDBus_Free_Cb cb, const void *data)
{
EDBUS_SIGNAL_HANDLER_CHECK(handler);
EINA_SAFETY_ON_NULL_RETURN(cb);
@ -310,7 +310,7 @@ edbus_signal_handler_cb_free_add(EDBus_Signal_Handler *handler, EDBus_Free_Cb cb
}
EAPI void
edbus_signal_handler_cb_free_del(EDBus_Signal_Handler *handler, EDBus_Free_Cb cb, const void *data)
edbus_signal_handler_free_cb_del(EDBus_Signal_Handler *handler, EDBus_Free_Cb cb, const void *data)
{
EDBUS_SIGNAL_HANDLER_CHECK(handler);
EINA_SAFETY_ON_NULL_RETURN(cb);

6
legacy/edbus/src/lib/edbus_signal_handler.h
View File

@ -77,12 +77,12 @@ EAPI Eina_Bool edbus_signal_handler_match_extra_vset(EDBus_Signal_Ha
/**
* @brief Add a callback function to be called when signal handler will be freed.
*/
EAPI void edbus_signal_handler_cb_free_add(EDBus_Signal_Handler *handler, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_signal_handler_free_cb_add(EDBus_Signal_Handler *handler, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in edbus_signal_handler_cb_free_add().
* @brief Remove callback registered in edbus_signal_handler_free_cb_add().
*/
EAPI void edbus_signal_handler_cb_free_del(EDBus_Signal_Handler *handler, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI void edbus_signal_handler_free_cb_del(EDBus_Signal_Handler *handler, EDBus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI const char *edbus_signal_handler_sender_get(const EDBus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
EAPI const char *edbus_signal_handler_path_get(const EDBus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;