eldbus: Rename EAPI macro to ELDBUS_API in Eldbus library

Summary:
=  The Rationale =

EAPI was designed to be able to pass
`__attribute__ ((visibility ("default")))` for symbols with
GCC, which would mean that even if -fvisibility=hidden was used
when compiling the library, the needed symbols would get exported.

MSVC __almost__ works like GCC (or mingw) in which you can
declare everything as export and it will just work (slower, but
it will work). But there's a caveat: global variables will not
work the same way for MSVC, but works for mingw and GCC.

For global variables (as opposed to functions), MSVC requires
correct DSO visibility for MSVC: instead of declaring a symbol as
export for everything, you need to declare it as import when
importing from another DSO and export when defining it locally.

With current EAPI definitions, we get the following example
working in mingw and MSVC (observe it doesn't define any global
variables as exported symbols).

Example 1:
dll1:
```
EAPI void foo(void);

EAPI void bar()
{
  foo();
}
```
dll2:
```
EAPI void foo()
{
  printf ("foo\n");
}
```

This works fine with API defined as __declspec(dllexport) in both
cases and for gcc defining as
`__atttribute__((visibility("default")))`.

However, the following:
Example 2:

dll1:

```
EAPI extern int foo;
EAPI void foobar(void);

EAPI void bar()
{
  foo = 5;
  foobar();
}
```

dll2:

```
EAPI int foo = 0;
EAPI void foobar()
{
  printf ("foo %d\n", foo);
}
```

This will work on mingw but will not work for MSVC. And that's why
EAPI is the only solution that worked for MSVC.

Co-authored-by: João Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com>
Co-authored-by: Ricardo Campos <ricardo.campos@expertise.dev>
Co-authored-by: Lucas Cavalcante de Sousa <lucks.sousa@gmail.com>

Reviewers: vtorri, raster

Subscribers: raster, cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D12270
This commit is contained in:
Felipe Magno de Almeida 2021-05-23 20:07:51 +01:00 committed by Carsten Haitzler (Rasterman)
parent 7c85be9674
commit 1304d95717
26 changed files with 350 additions and 340 deletions

View File

@ -83,31 +83,7 @@
#ifdef EFL_BETA_API_SUPPORT
#include <Efl.h>
#endif
#ifdef EAPI
# undef EAPI
#endif
#ifdef _WIN32
# ifdef EFL_BUILD
# ifdef DLL_EXPORT
# define EAPI __declspec(dllexport)
# else
# define EAPI
# endif
# else
# define EAPI __declspec(dllimport)
# endif
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
# define EAPI __attribute__ ((visibility("default")))
# else
# define EAPI
# endif
# else
# define EAPI
# endif
#endif
#include <eldbus_api.h>
#ifdef __cplusplus
extern "C" {
@ -144,20 +120,20 @@ typedef struct _Eldbus_Version
int revision; /**< git revision (0 if a proper release or the git revision number Eldbus is built from) */
} Eldbus_Version;
EAPI extern const Eldbus_Version * eldbus_version; /**< Global Eldbus_Version object */
ELDBUS_API extern const Eldbus_Version * eldbus_version; /**< Global Eldbus_Version object */
/**
* @brief Initialize eldbus.
*
* @return 1 or greater on success, 0 otherwise
*/
EAPI int eldbus_init(void);
ELDBUS_API int eldbus_init(void);
/**
* @brief Shutdown eldbus.
*
* @return 0 if e_dbus shuts down, greater than 0 otherwise.
*/
EAPI int eldbus_shutdown(void);
ELDBUS_API int eldbus_shutdown(void);
/**
* @typedef Eldbus_Free_Cb
@ -258,7 +234,4 @@ typedef struct _Eldbus_Object Eldbus_Object;
}
#endif
#undef EAPI
#define EAPI
#endif

View File

@ -0,0 +1,32 @@
#ifndef _EFL_ELDBUS_API_H
#define _EFL_ELDBUS_API_H
#ifdef ELDBUS_API
#error ELDBUS_API should not be already defined
#endif
#ifdef _WIN32
# ifndef ELDBUS_STATIC
# ifdef ELDBUS_BUILD
# define ELDBUS_API __declspec(dllexport)
# else
# define ELDBUS_API __declspec(dllimport)
# endif
# else
# define ELDBUS_API
# endif
# define ELDBUS_API_WEAK
#elif defined(__GNUC__)
# if __GNUC__ >= 4
# define ELDBUS_API __attribute__ ((visibility("default")))
# define ELDBUS_API_WEAK __attribute__ ((weak))
# else
# define ELDBUS_API
# define ELDBUS_API_WEAK
# endif
#else
# define ELDBUS_API
# define ELDBUS_API_WEAK
#endif
#endif

View File

@ -34,7 +34,7 @@ typedef enum
*
* @return connection with bus
*/
EAPI Eldbus_Connection *eldbus_connection_get(Eldbus_Connection_Type type);
ELDBUS_API Eldbus_Connection *eldbus_connection_get(Eldbus_Connection_Type type);
/**
* Always create and establish a new connection to bus and integrate it with
@ -47,7 +47,7 @@ EAPI Eldbus_Connection *eldbus_connection_get(Eldbus_Connection_Type type);
*
* @return connection with bus
*/
EAPI Eldbus_Connection *eldbus_private_connection_get(Eldbus_Connection_Type type);
ELDBUS_API Eldbus_Connection *eldbus_private_connection_get(Eldbus_Connection_Type type);
/**
* Establish a connection to bus and integrate it with the ecore main
@ -58,7 +58,7 @@ EAPI Eldbus_Connection *eldbus_private_connection_get(Eldbus_Connection_Type typ
*
* @return connection with bus
*/
EAPI Eldbus_Connection *eldbus_address_connection_get(const char *address) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Connection *eldbus_address_connection_get(const char *address) EINA_ARG_NONNULL(1);
/**
* Always create and establish a new connection to bus and integrate it with
@ -70,7 +70,7 @@ EAPI Eldbus_Connection *eldbus_address_connection_get(const char *address) EINA_
*
* @return connection with bus
*/
EAPI Eldbus_Connection *eldbus_private_address_connection_get(const char *address) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Connection *eldbus_private_address_connection_get(const char *address) EINA_ARG_NONNULL(1);
/**
* @brief Increment connection reference count.
@ -78,7 +78,7 @@ EAPI Eldbus_Connection *eldbus_private_address_connection_get(const char *addres
* @param conn The given Eldbus_Connection object to reference.
* @return The Eldbus_Connection object given as parameter.
*/
EAPI Eldbus_Connection *eldbus_connection_ref(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Connection *eldbus_connection_ref(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
/**
* @brief Decrement connection reference count.
@ -88,7 +88,7 @@ EAPI Eldbus_Connection *eldbus_connection_ref(Eldbus_Connection *conn) EINA_ARG_
*
* @param conn The given Eldbus_Connection object to unreference.
*/
EAPI void eldbus_connection_unref(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
ELDBUS_API void eldbus_connection_unref(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
/**
* @brief Add a callback function to be called when connection is freed
@ -97,7 +97,7 @@ EAPI void eldbus_connection_unref(Eldbus_Connection *conn) EINA_ARG
* @param cb The callback to be called when the connection is free.
* @param data The data passed to the callback.
*/
EAPI void eldbus_connection_free_cb_add(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_connection_free_cb_add(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in eldbus_connection_free_cb_add().
@ -106,7 +106,7 @@ EAPI void eldbus_connection_free_cb_add(Eldbus_Connection *conn, El
* @param cb The callback that was called when the connection was free.
* @param data The data that was passed to the callback.
*/
EAPI void eldbus_connection_free_cb_del(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_connection_free_cb_del(Eldbus_Connection *conn, Eldbus_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.
@ -115,7 +115,7 @@ EAPI void eldbus_connection_free_cb_del(Eldbus_Connection *conn, El
* @param key to identify data
* @param data data that will be stored
*/
EAPI void eldbus_connection_data_set(Eldbus_Connection *conn, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API void eldbus_connection_data_set(Eldbus_Connection *conn, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
/**
* @brief Get data stored in connection.
@ -125,7 +125,7 @@ EAPI void eldbus_connection_data_set(Eldbus_Connection *conn, const
*
* @return pointer to data if found otherwise NULL
*/
EAPI void *eldbus_connection_data_get(const Eldbus_Connection *conn, const char *key) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void *eldbus_connection_data_get(const Eldbus_Connection *conn, const char *key) EINA_ARG_NONNULL(1, 2);
/**
* @brief Del data stored in connection.
@ -135,7 +135,7 @@ EAPI void *eldbus_connection_data_get(const Eldbus_Connection *conn,
*
* @return pointer to data if found otherwise NULL
*/
EAPI void *eldbus_connection_data_del(Eldbus_Connection *conn, const char *key) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void *eldbus_connection_data_del(Eldbus_Connection *conn, const char *key) EINA_ARG_NONNULL(1, 2);
/**
* @typedef Eldbus_Connection_Event_Type
@ -164,7 +164,7 @@ typedef void (*Eldbus_Connection_Event_Cb)(void *data, Eldbus_Connection *conn,
* @param cb The callback to be called when the event is triggered.
* @param cb_data The data passed to the callback.
*/
EAPI void eldbus_connection_event_callback_add(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
ELDBUS_API void eldbus_connection_event_callback_add(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
/**
* @brief Remove callback registered in eldbus_connection_event_callback_add().
@ -174,7 +174,7 @@ EAPI void eldbus_connection_event_callback_add(Eldbus_Connectio
* @param cb The callback that was called when the event was triggered.
* @param cb_data The data that was passed to the callback.
*/
EAPI void eldbus_connection_event_callback_del(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
ELDBUS_API void eldbus_connection_event_callback_del(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
/**
* @brief Send a message.
@ -188,7 +188,7 @@ EAPI void eldbus_connection_event_callback_del(Eldbus_Connectio
* ELDBUS_TIMEOUT_INFINITE for no timeout
* @return A Eldbus_Pending struct.
*/
EAPI Eldbus_Pending *eldbus_connection_send(Eldbus_Connection *conn, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_connection_send(Eldbus_Connection *conn, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
/**
* @brief Gets unique name assigned by the message bus.
@ -198,7 +198,7 @@ EAPI Eldbus_Pending *eldbus_connection_send(Eldbus_Connection *conn, Eldbus_Mess
* @return pointer to unique name string or NULL or error. Returned value
* remains valid until connection is free.
*/
EAPI const char *eldbus_connection_unique_name_get(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
ELDBUS_API const char *eldbus_connection_unique_name_get(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
/**
* @}
*/

View File

@ -69,7 +69,7 @@ typedef struct _Eldbus_Timeout_Data
} Eldbus_Timeout_Data;
static const Eldbus_Version _version = {VMAJ, VMIN, VMIC, VREV};
EAPI const Eldbus_Version * eldbus_version = &_version;
ELDBUS_API const Eldbus_Version * eldbus_version = &_version;
static int _eldbus_init_count = 0;
int _eldbus_log_dom = -1;
@ -124,7 +124,7 @@ _eldbus_fork_reset()
address_connections = NULL;
}
EAPI int
ELDBUS_API int
eldbus_init(void)
{
if (_eldbus_init_count++ > 0)
@ -242,7 +242,7 @@ print_live_connection(Eldbus_Connection *conn)
}
}
EAPI int
ELDBUS_API int
eldbus_shutdown(void)
{
if (_eldbus_init_count <= 0)
@ -1091,14 +1091,14 @@ _connection_get(Eldbus_Connection_Type type, const char *address, Eina_Bool shar
return conn;
}
EAPI Eldbus_Connection *
ELDBUS_API Eldbus_Connection *
eldbus_private_connection_get(Eldbus_Connection_Type type)
{
DBG("Getting private connection with type %d", type);
return _connection_get(type, NULL, EINA_FALSE);
}
EAPI Eldbus_Connection *
ELDBUS_API Eldbus_Connection *
eldbus_connection_get(Eldbus_Connection_Type type)
{
Eldbus_Connection *conn;
@ -1129,7 +1129,7 @@ eldbus_connection_get(Eldbus_Connection_Type type)
return conn;
}
EAPI Eldbus_Connection *
ELDBUS_API Eldbus_Connection *
eldbus_address_connection_get(const char *address)
{
Eldbus_Connection *conn = NULL;
@ -1160,14 +1160,14 @@ eldbus_address_connection_get(const char *address)
return conn;
}
EAPI Eldbus_Connection *
ELDBUS_API Eldbus_Connection *
eldbus_private_address_connection_get(const char *address)
{
DBG("Getting private connection with address %s", address);
return _connection_get(ELDBUS_CONNECTION_TYPE_ADDRESS, address, EINA_FALSE);
}
EAPI Eldbus_Connection *
ELDBUS_API Eldbus_Connection *
eldbus_connection_ref(Eldbus_Connection *conn)
{
ELDBUS_CONNECTION_CHECK_RETVAL(conn, NULL);
@ -1302,7 +1302,7 @@ _eldbus_connection_free(Eldbus_Connection *conn)
free(conn);
}
EAPI void
ELDBUS_API void
eldbus_connection_unref(Eldbus_Connection *conn)
{
ELDBUS_CONNECTION_CHECK(conn);
@ -1312,7 +1312,7 @@ eldbus_connection_unref(Eldbus_Connection *conn)
_eldbus_connection_free(conn);
}
EAPI void
ELDBUS_API void
eldbus_connection_free_cb_add(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_CONNECTION_CHECK(conn);
@ -1320,7 +1320,7 @@ eldbus_connection_free_cb_add(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const
conn->cbs_free = eldbus_cbs_free_add(conn->cbs_free, cb, data);
}
EAPI void
ELDBUS_API void
eldbus_connection_free_cb_del(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_CONNECTION_CHECK(conn);
@ -1328,7 +1328,7 @@ eldbus_connection_free_cb_del(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const
conn->cbs_free = eldbus_cbs_free_del(conn->cbs_free, cb, data);
}
EAPI void
ELDBUS_API void
eldbus_connection_data_set(Eldbus_Connection *conn, const char *key, const void *data)
{
ELDBUS_CONNECTION_CHECK(conn);
@ -1337,7 +1337,7 @@ eldbus_connection_data_set(Eldbus_Connection *conn, const char *key, const void
eldbus_data_set(&(conn->data), key, data);
}
EAPI void *
ELDBUS_API void *
eldbus_connection_data_get(const Eldbus_Connection *conn, const char *key)
{
ELDBUS_CONNECTION_CHECK_RETVAL(conn, NULL);
@ -1345,7 +1345,7 @@ eldbus_connection_data_get(const Eldbus_Connection *conn, const char *key)
return eldbus_data_get(&(((Eldbus_Connection *)conn)->data), key);
}
EAPI void *
ELDBUS_API void *
eldbus_connection_data_del(Eldbus_Connection *conn, const char *key)
{
ELDBUS_CONNECTION_CHECK_RETVAL(conn, NULL);
@ -1393,7 +1393,7 @@ dispach_name_owner_cb(void *context)
return ECORE_CALLBACK_CANCEL;
}
EAPI void
ELDBUS_API void
eldbus_name_owner_changed_callback_add(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data, Eina_Bool allow_initial_call)
{
Eldbus_Connection_Name *cn;
@ -1428,7 +1428,7 @@ cleanup:
eldbus_connection_name_gc(conn, cn);
}
EAPI void
ELDBUS_API void
eldbus_name_owner_changed_callback_del(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data)
{
Eldbus_Connection_Name *cn;
@ -1473,7 +1473,7 @@ eldbus_name_owner_changed_callback_del(Eldbus_Connection *conn, const char *bus,
eldbus_connection_name_gc(conn, cn);
}
EAPI void
ELDBUS_API void
eldbus_connection_event_callback_add(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data)
{
Eldbus_Connection_Context_Event *ce;
@ -1500,7 +1500,7 @@ _eldbus_connection_context_event_cb_del(Eldbus_Connection_Context_Event *ce, Eld
free(ctx);
}
EAPI void
ELDBUS_API void
eldbus_connection_event_callback_del(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data)
{
Eldbus_Connection_Context_Event *ce;

View File

@ -2,7 +2,7 @@
#include "eldbus_private_types.h"
#include <dbus/dbus.h>
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_name_request(Eldbus_Connection *conn, const char *name, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
@ -12,7 +12,7 @@ eldbus_name_request(Eldbus_Connection *conn, const char *name, unsigned int flag
cb_data, -1, "su", name, flags);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_name_release(Eldbus_Connection *conn, const char *name, Eldbus_Message_Cb cb, const void *cb_data)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
@ -22,7 +22,7 @@ eldbus_name_release(Eldbus_Connection *conn, const char *name, Eldbus_Message_Cb
cb_data, -1, "s", name);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_name_owner_get(Eldbus_Connection *conn, const char *name, Eldbus_Message_Cb cb, const void *cb_data)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
@ -32,7 +32,7 @@ eldbus_name_owner_get(Eldbus_Connection *conn, const char *name, Eldbus_Message_
cb_data, -1, "s", name);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_name_owner_has(Eldbus_Connection *conn, const char *name, Eldbus_Message_Cb cb, const void *cb_data)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
@ -42,7 +42,7 @@ eldbus_name_owner_has(Eldbus_Connection *conn, const char *name, Eldbus_Message_
cb_data, -1, "s", name);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_names_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
@ -51,7 +51,7 @@ eldbus_names_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_
cb_data, -1, "");
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_names_activatable_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
@ -60,7 +60,7 @@ eldbus_names_activatable_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, con
cb_data, -1, "");
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_name_start(Eldbus_Connection *conn, const char *name, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
@ -70,7 +70,7 @@ eldbus_name_start(Eldbus_Connection *conn, const char *name, unsigned int flags,
cb_data, -1, "su", name, flags);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_object_managed_objects_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data)
{
Eldbus_Message *msg;
@ -81,21 +81,21 @@ eldbus_object_managed_objects_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, cons
return p;
}
EAPI Eldbus_Signal_Handler *
ELDBUS_API Eldbus_Signal_Handler *
eldbus_object_manager_interfaces_added(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data)
{
return eldbus_object_signal_handler_add(obj, ELDBUS_FDO_INTERFACE_OBJECT_MANAGER,
"InterfacesAdded", cb, cb_data);
}
EAPI Eldbus_Signal_Handler *
ELDBUS_API Eldbus_Signal_Handler *
eldbus_object_manager_interfaces_removed(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data)
{
return eldbus_object_signal_handler_add(obj, ELDBUS_FDO_INTERFACE_OBJECT_MANAGER,
"InterfacesRemoved", cb, cb_data);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_hello(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);

View File

@ -27,7 +27,7 @@
* @param cb_data Data passed to callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_name_request(Eldbus_Connection *conn, const char *bus, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_name_request(Eldbus_Connection *conn, const char *bus, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
/* Replies to releasing a name */
#define ELDBUS_NAME_RELEASE_REPLY_RELEASED 1 /**< Service was released from the given name */
@ -43,7 +43,7 @@ EAPI Eldbus_Pending *eldbus_name_request(Eldbus_Connection *conn, const char *bu
* @param cb_data Data passed to callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_name_release(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_name_release(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
/**
* Send a "GetNameOwner" method call in proxy.
@ -54,7 +54,7 @@ EAPI Eldbus_Pending *eldbus_name_release(Eldbus_Connection *conn, const char *bu
* @param cb_data Data passed to callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_name_owner_get(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_name_owner_get(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
/**
* Send a "NameHasOwner" method call in proxy.
@ -65,7 +65,7 @@ EAPI Eldbus_Pending *eldbus_name_owner_get(Eldbus_Connection *conn, const char *
* @param cb_data Data passed to callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_name_owner_has(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data);
ELDBUS_API Eldbus_Pending *eldbus_name_owner_has(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data);
/**
* Send a "ListNames" method call in proxy.
@ -75,7 +75,7 @@ EAPI Eldbus_Pending *eldbus_name_owner_has(Eldbus_Connection *conn, const char *
* @param cb_data Data passed to callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_names_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Pending *eldbus_names_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
/**
* Send a "ListActivatableNames" method call in proxy.
@ -85,7 +85,7 @@ EAPI Eldbus_Pending *eldbus_names_list(Eldbus_Connection *conn, Eldbus_Message_C
* @param cb_data Data passed to callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_names_activatable_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Pending *eldbus_names_activatable_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
/**
* Send a "Hello" method call in proxy.
@ -95,7 +95,7 @@ EAPI Eldbus_Pending *eldbus_names_activatable_list(Eldbus_Connection *conn, Eldb
* @param cb_data Data passed to callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_hello(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Pending *eldbus_hello(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
/* Replies to service starts */
#define ELDBUS_NAME_START_REPLY_SUCCESS 1 /**< Service was auto started */
@ -111,7 +111,7 @@ EAPI Eldbus_Pending *eldbus_hello(Eldbus_Connection *conn, Eldbus_Message_Cb cb,
* @param cb_data Data passed to callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_name_start(Eldbus_Connection *conn, const char *bus, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_name_start(Eldbus_Connection *conn, const char *bus, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
/**
* @typedef Eldbus_Name_Owner_Changed_Cb
@ -135,7 +135,7 @@ typedef void (*Eldbus_Name_Owner_Changed_Cb)(void *data, const char *bus, const
* @param cb_data context data
* @param allow_initial_call allow call callback with actual id of the bus
*/
EAPI void eldbus_name_owner_changed_callback_add(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data, Eina_Bool allow_initial_call) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API void eldbus_name_owner_changed_callback_add(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data, Eina_Bool allow_initial_call) EINA_ARG_NONNULL(1, 2, 3);
/**
* Remove callback added with eldbus_name_owner_changed_callback_add().
*
@ -144,7 +144,7 @@ EAPI void eldbus_name_owner_changed_callback_add(Eldbus_Connect
* @param cb callback
* @param cb_data context data
*/
EAPI void eldbus_name_owner_changed_callback_del(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API void eldbus_name_owner_changed_callback_del(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2, 3);
/**
* @defgroup Eldbus_FDO_Peer org.freedesktop.DBus.Peer
@ -160,7 +160,7 @@ EAPI void eldbus_name_owner_changed_callback_del(Eldbus_Connect
* @param data Data passed to the callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_object_peer_ping(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_object_peer_ping(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* Call the method "GetMachineId" on the eldbus object.
@ -170,7 +170,7 @@ EAPI Eldbus_Pending *eldbus_object_peer_ping(Eldbus_Object *obj, Eldbus_M
* @param data Data passed to the callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_object_peer_machine_id_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_object_peer_machine_id_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @}
@ -190,7 +190,7 @@ EAPI Eldbus_Pending *eldbus_object_peer_machine_id_get(Eldbus_Object *obj
* @param data Data passed to the callback.
* @return The Eldbus_Pending corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_object_introspect(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_object_introspect(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @}
*/
@ -213,7 +213,7 @@ EAPI Eldbus_Pending *eldbus_object_introspect(Eldbus_Object *obj, Eldbus_
* You should listen for a ELDBUS_PROXY_EVENT_PROPERTY_LOADED
* to know when properties finish to load.
*/
EAPI Eina_Bool eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_Bool enable) EINA_ARG_NONNULL(1);
ELDBUS_API Eina_Bool eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_Bool enable) EINA_ARG_NONNULL(1);
/**
* Get a property.
@ -224,7 +224,7 @@ EAPI Eina_Bool eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_Bool en
* @param data Data to be passed to the callback.
* @return Eldbus_Pending object corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_proxy_property_get(Eldbus_Proxy *proxy, const char *name, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API Eldbus_Pending *eldbus_proxy_property_get(Eldbus_Proxy *proxy, const char *name, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3);
/**
* Set a property.
@ -237,7 +237,7 @@ EAPI Eldbus_Pending *eldbus_proxy_property_get(Eldbus_Proxy *proxy, const
* @param data Data to be passed to the callback.
* @return Eldbus_Pending object corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_proxy_property_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const void *value, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3, 4);
ELDBUS_API Eldbus_Pending *eldbus_proxy_property_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const void *value, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3, 4);
/**
* Set a property with a Eina_Value.
@ -252,7 +252,7 @@ EAPI Eldbus_Pending *eldbus_proxy_property_set(Eldbus_Proxy *proxy, const
*
* @since 1.17
*/
EAPI Eldbus_Pending *eldbus_proxy_property_value_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const Eina_Value *value, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3, 4);
ELDBUS_API Eldbus_Pending *eldbus_proxy_property_value_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const Eina_Value *value, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3, 4);
/**
* Get all properties.
@ -262,7 +262,7 @@ EAPI Eldbus_Pending *eldbus_proxy_property_value_set(Eldbus_Proxy *proxy,
* @param data Data to be passed to the callback.
* @return Eldbus_Pending object corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_proxy_property_get_all(Eldbus_Proxy *proxy, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_proxy_property_get_all(Eldbus_Proxy *proxy, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* Register a callback on "PropertiesChanged" signal.
@ -272,7 +272,7 @@ EAPI Eldbus_Pending *eldbus_proxy_property_get_all(Eldbus_Proxy *proxy, E
* @param data Data to be passed to the callback.
* @return Eldbus_Signal_Handler object representing a listener for "PropertiesChanged" signal.
*/
EAPI Eldbus_Signal_Handler *eldbus_proxy_properties_changed_callback_add(Eldbus_Proxy *proxy, Eldbus_Signal_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Signal_Handler *eldbus_proxy_properties_changed_callback_add(Eldbus_Proxy *proxy, Eldbus_Signal_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* Return the cached value of property.
@ -285,7 +285,7 @@ EAPI Eldbus_Signal_Handler *eldbus_proxy_properties_changed_callback_add(Eldbus_
* @param name The property name to get.
* @return Cached value of property.
*/
EAPI Eina_Value *eldbus_proxy_property_local_get(Eldbus_Proxy *proxy, const char *name) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Value *eldbus_proxy_property_local_get(Eldbus_Proxy *proxy, const char *name) EINA_ARG_NONNULL(1, 2);
/**
* Get all cached properties.
@ -297,7 +297,7 @@ EAPI Eina_Value *eldbus_proxy_property_local_get(Eldbus_Proxy *proxy,
* @param proxy The proxy object on which to do the query.
* @return A Eina_Hash with all cached properties
*/
EAPI const Eina_Hash *eldbus_proxy_property_local_get_all(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
ELDBUS_API const Eina_Hash *eldbus_proxy_property_local_get_all(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
/**
* @}
@ -317,7 +317,7 @@ EAPI const Eina_Hash *eldbus_proxy_property_local_get_all(Eldbus_Proxy *pro
*
* @return A Eldbus_Pending object corresponding to the message sent.
*/
EAPI Eldbus_Pending *eldbus_object_managed_objects_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_object_managed_objects_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* Register a callback on "InterfacesAdded" signal.
@ -327,7 +327,7 @@ EAPI Eldbus_Pending *eldbus_object_managed_objects_get(Eldbus_Object *obj
* @param cb_data Data to be passed to the callback.
* @return Eldbus_Signal_Handler object representing a listener for "InterfacesAdded" signal.
*/
EAPI Eldbus_Signal_Handler *eldbus_object_manager_interfaces_added(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Signal_Handler *eldbus_object_manager_interfaces_added(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
/**
* Register a callback on "InterfacesRemoved" signal.
@ -337,7 +337,7 @@ EAPI Eldbus_Signal_Handler *eldbus_object_manager_interfaces_added(Eldbus_Object
* @param cb_data Data to be passed to the callback.
* @return Eldbus_Signal_Handler object representing a listener for "InterfacesRemoved" signal.
*/
EAPI Eldbus_Signal_Handler *eldbus_object_manager_interfaces_removed(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Signal_Handler *eldbus_object_manager_interfaces_removed(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
/**
* @}

View File

@ -26,7 +26,7 @@ static void _eldbus_introspection_argument_free(Eldbus_Introspection_Argument *)
static void _eldbus_introspection_property_free(Eldbus_Introspection_Property *);
static void _eldbus_introspection_annotation_free(Eldbus_Introspection_Annotation *);
EAPI Eldbus_Introspection_Node *
ELDBUS_API Eldbus_Introspection_Node *
eldbus_introspection_parse(const char *xml)
{
Eldbus_Introspection_Node *node;
@ -75,7 +75,7 @@ _eldbus_introspection_parse_node(Eina_Simple_XML_Node_Tag *tag)
return node;
}
EAPI void
ELDBUS_API void
eldbus_introspection_node_free(Eldbus_Introspection_Node *node)
{
Eldbus_Introspection_Node *child_node;
@ -427,7 +427,7 @@ _eldbus_introspection_parse_children(Eina_Inlist *children, const Eldbus_Introsp
}
}
EAPI Eldbus_Introspection_Interface *
ELDBUS_API Eldbus_Introspection_Interface *
eldbus_introspection_interface_find(Eina_List *interfaces, const char *name)
{
Eina_List *it;
@ -442,7 +442,7 @@ eldbus_introspection_interface_find(Eina_List *interfaces, const char *name)
return NULL;
}
EAPI Eldbus_Introspection_Property *
ELDBUS_API Eldbus_Introspection_Property *
eldbus_introspection_property_find(Eina_List *properties, const char *name)
{
Eina_List *it;
@ -457,7 +457,7 @@ eldbus_introspection_property_find(Eina_List *properties, const char *name)
return NULL;
}
EAPI Eldbus_Introspection_Argument *
ELDBUS_API Eldbus_Introspection_Argument *
eldbus_introspection_argument_find(Eina_List *arguments, const char *name)
{
Eina_List *it;

View File

@ -4,6 +4,8 @@
#include <Eina.h>
#include <Eo.h>
#include <eldbus_api.h>
/* FIXME: these are duplicated as @extern in eldbus_types.eot */
/** Argument direction
@ -116,7 +118,7 @@ typedef struct _Eldbus_Introspection_Signal
*
* @since 1.17
*/
EAPI Eldbus_Introspection_Node *eldbus_introspection_parse(const char *xml);
ELDBUS_API Eldbus_Introspection_Node *eldbus_introspection_parse(const char *xml);
/**
* @brief Frees the introspection object tree
@ -125,7 +127,7 @@ EAPI Eldbus_Introspection_Node *eldbus_introspection_parse(const char *xml);
*
* @since 1.17
*/
EAPI void eldbus_introspection_node_free(Eldbus_Introspection_Node *node);
ELDBUS_API void eldbus_introspection_node_free(Eldbus_Introspection_Node *node);
/**
* @brief Finds an interface by name
@ -136,7 +138,7 @@ EAPI void eldbus_introspection_node_free(Eldbus_Introspection_Node *node);
*
* @since 1.17
*/
EAPI Eldbus_Introspection_Interface *eldbus_introspection_interface_find(Eina_List *interfaces, const char *name);
ELDBUS_API Eldbus_Introspection_Interface *eldbus_introspection_interface_find(Eina_List *interfaces, const char *name);
/**
* @brief Finds a property by name
@ -147,7 +149,7 @@ EAPI Eldbus_Introspection_Interface *eldbus_introspection_interface_find(Eina_Li
*
* @since 1.17
*/
EAPI Eldbus_Introspection_Property *eldbus_introspection_property_find(Eina_List *properties, const char *name);
ELDBUS_API Eldbus_Introspection_Property *eldbus_introspection_property_find(Eina_List *properties, const char *name);
/**
* @brief Finds an argument by name
@ -158,6 +160,6 @@ EAPI Eldbus_Introspection_Property *eldbus_introspection_property_find(Eina_List
*
* @since 1.17
*/
EAPI Eldbus_Introspection_Argument *eldbus_introspection_argument_find(Eina_List *arguments, const char *name);
ELDBUS_API Eldbus_Introspection_Argument *eldbus_introspection_argument_find(Eina_List *arguments, const char *name);
#endif

View File

@ -98,7 +98,7 @@ fail:
return NULL;
}
EAPI Eldbus_Message *
ELDBUS_API Eldbus_Message *
eldbus_message_method_call_new(const char *dest, const char *path, const char *iface, const char *method)
{
Eldbus_Message *msg;
@ -141,7 +141,7 @@ fail:
return NULL;
}
EAPI Eldbus_Message *
ELDBUS_API Eldbus_Message *
eldbus_message_ref(Eldbus_Message *msg)
{
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
@ -168,7 +168,7 @@ _message_iterator_free(Eldbus_Message_Iter *iter)
free(iter);
}
EAPI void
ELDBUS_API void
eldbus_message_unref(Eldbus_Message *msg)
{
ELDBUS_MESSAGE_CHECK(msg);
@ -187,49 +187,49 @@ eldbus_message_unref(Eldbus_Message *msg)
free(msg);
}
EAPI const char *
ELDBUS_API const char *
eldbus_message_path_get(const Eldbus_Message *msg)
{
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
return dbus_message_get_path(msg->dbus_msg);
}
EAPI const char *
ELDBUS_API const char *
eldbus_message_interface_get(const Eldbus_Message *msg)
{
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
return dbus_message_get_interface(msg->dbus_msg);
}
EAPI const char *
ELDBUS_API const char *
eldbus_message_member_get(const Eldbus_Message *msg)
{
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
return dbus_message_get_member(msg->dbus_msg);
}
EAPI const char *
ELDBUS_API const char *
eldbus_message_destination_get(const Eldbus_Message *msg)
{
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
return dbus_message_get_destination(msg->dbus_msg);
}
EAPI const char *
ELDBUS_API const char *
eldbus_message_sender_get(const Eldbus_Message *msg)
{
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
return dbus_message_get_sender(msg->dbus_msg);
}
EAPI const char *
ELDBUS_API const char *
eldbus_message_signature_get(const Eldbus_Message *msg)
{
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
return dbus_message_get_signature(msg->dbus_msg);
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_error_get(const Eldbus_Message *msg, const char **name, const char **text)
{
if (name) *name = NULL;
@ -260,7 +260,7 @@ _eldbus_message_arguments_vget(Eldbus_Message *msg, const char *signature, va_li
return eldbus_message_iter_arguments_vget(iter, signature, ap);
}
EAPI Eldbus_Message_Iter *
ELDBUS_API Eldbus_Message_Iter *
eldbus_message_iter_get(const Eldbus_Message *msg)
{
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
@ -270,7 +270,7 @@ eldbus_message_iter_get(const Eldbus_Message *msg)
return msg->iterator;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_arguments_get(const Eldbus_Message *msg, const char *signature, ...)
{
Eina_Bool ret;
@ -285,7 +285,7 @@ eldbus_message_arguments_get(const Eldbus_Message *msg, const char *signature, .
return ret;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_arguments_vget(const Eldbus_Message *msg, const char *signature, va_list ap)
{
ELDBUS_MESSAGE_CHECK_RETVAL(msg, EINA_FALSE);
@ -362,7 +362,7 @@ next:
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_arguments_vappend(Eldbus_Message_Iter *iter, const char *signature, va_list ap)
{
va_list aq;
@ -375,7 +375,7 @@ eldbus_message_iter_arguments_vappend(Eldbus_Message_Iter *iter, const char *sig
return ret;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_arguments_append(Eldbus_Message_Iter *iter, const char *signature, ...)
{
Eina_Bool r;
@ -491,7 +491,7 @@ _eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va
return r;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_arguments_append(Eldbus_Message *msg, const char *signature, ...)
{
Eina_Bool ret;
@ -506,7 +506,7 @@ eldbus_message_arguments_append(Eldbus_Message *msg, const char *signature, ...)
return ret;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va_list ap)
{
va_list aq;
@ -522,7 +522,7 @@ eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va_
return ret;
}
EAPI Eldbus_Message_Iter *
ELDBUS_API Eldbus_Message_Iter *
eldbus_message_iter_container_new(Eldbus_Message_Iter *iter, int type, const char* contained_signature)
{
Eldbus_Message_Iter *sub;
@ -544,7 +544,7 @@ cleanup:
return NULL;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_container_close(Eldbus_Message_Iter *iter, Eldbus_Message_Iter *sub)
{
ELDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, EINA_FALSE);
@ -554,7 +554,7 @@ eldbus_message_iter_container_close(Eldbus_Message_Iter *iter, Eldbus_Message_It
&sub->dbus_iterator);
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_basic_append(Eldbus_Message_Iter *iter, int type, ...)
{
Eina_Bool r;
@ -569,7 +569,7 @@ eldbus_message_iter_basic_append(Eldbus_Message_Iter *iter, int type, ...)
return r;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_fixed_array_append(Eldbus_Message_Iter *iter, int type, const void *array, unsigned int size)
{
ELDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, EINA_FALSE);
@ -579,7 +579,7 @@ eldbus_message_iter_fixed_array_append(Eldbus_Message_Iter *iter, int type, cons
return dbus_message_iter_append_fixed_array(&iter->dbus_iterator, type, &array, (int)size);
}
EAPI void
ELDBUS_API void
eldbus_message_iter_basic_get(Eldbus_Message_Iter *iter, void *value)
{
ELDBUS_MESSAGE_ITERATOR_CHECK(iter);
@ -601,14 +601,14 @@ eldbus_message_iter_sub_iter_get(Eldbus_Message_Iter *iter)
return sub;
}
EAPI char *
ELDBUS_API char *
eldbus_message_iter_signature_get(Eldbus_Message_Iter *iter)
{
ELDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, NULL);
return dbus_message_iter_get_signature(&iter->dbus_iterator);
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_next(Eldbus_Message_Iter *iter)
{
ELDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, EINA_FALSE);
@ -705,7 +705,7 @@ get_basic(char type, DBusMessageIter *iter, va_list *vl)
}
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, int signature, void *value, int *n_elements)
{
int iter_type;
@ -732,7 +732,7 @@ eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, int signature, vo
/**
* Useful when iterating over arrays
*/
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_get_and_next(Eldbus_Message_Iter *iter, char signature, ...)
{
char type;
@ -838,7 +838,7 @@ _eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signa
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_arguments_get(Eldbus_Message_Iter *iter, const char *signature, ...)
{
va_list ap;
@ -851,7 +851,7 @@ eldbus_message_iter_arguments_get(Eldbus_Message_Iter *iter, const char *signatu
return ret;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signature, va_list ap)
{
va_list aq;
@ -864,14 +864,14 @@ eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signat
return ret;
}
EAPI void
ELDBUS_API void
eldbus_message_iter_del(Eldbus_Message_Iter *iter)
{
ELDBUS_MESSAGE_ITERATOR_CHECK(iter);
_message_iterator_free(iter);
}
EAPI Eldbus_Message *
ELDBUS_API Eldbus_Message *
eldbus_message_error_new(const Eldbus_Message *msg, const char *error_name, const char *error_msg)
{
Eldbus_Message *reply;
@ -891,7 +891,7 @@ eldbus_message_error_new(const Eldbus_Message *msg, const char *error_name, cons
return reply;
}
EAPI Eldbus_Message *
ELDBUS_API Eldbus_Message *
eldbus_message_method_return_new(const Eldbus_Message *msg)
{
Eldbus_Message *reply;
@ -908,7 +908,7 @@ eldbus_message_method_return_new(const Eldbus_Message *msg)
return reply;
}
EAPI Eldbus_Message *
ELDBUS_API Eldbus_Message *
eldbus_message_signal_new(const char *path, const char *interface, const char *name)
{
Eldbus_Message *msg;

View File

@ -14,7 +14,7 @@
* @param msg The Eldbus_Message object.
* @return The previous Eldbus_Message with incremented refcount.
*/
EAPI Eldbus_Message *eldbus_message_ref(Eldbus_Message *msg) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Message *eldbus_message_ref(Eldbus_Message *msg) EINA_ARG_NONNULL(1);
/**
* @brief Decrease message reference.
@ -24,7 +24,7 @@ EAPI Eldbus_Message *eldbus_message_ref(Eldbus_Message *msg) EINA_ARG_NON
*
* @param msg The Eldbus_Message object.
*/
EAPI void eldbus_message_unref(Eldbus_Message *msg) EINA_ARG_NONNULL(1);
ELDBUS_API void eldbus_message_unref(Eldbus_Message *msg) EINA_ARG_NONNULL(1);
/**
* Get the Eldbus message path.
@ -32,7 +32,7 @@ EAPI void eldbus_message_unref(Eldbus_Message *msg) EINA_ARG_NO
* @param msg The Eldbus_Message object.
* @return A string containing the dbus message path.
*/
EAPI const char *eldbus_message_path_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_message_path_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* Get the Eldbus message interface.
@ -40,7 +40,7 @@ EAPI const char *eldbus_message_path_get(const Eldbus_Message *msg) EI
* @param msg The Eldbus_Message object.
* @return A string containing the dbus message interface.
*/
EAPI const char *eldbus_message_interface_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_message_interface_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* Get the Eldbus message member.
@ -48,7 +48,7 @@ EAPI const char *eldbus_message_interface_get(const Eldbus_Message *ms
* @param msg The Eldbus_Message object.
* @return A string containing the dbus message member.
*/
EAPI const char *eldbus_message_member_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_message_member_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* Get the Eldbus message destination.
@ -56,7 +56,7 @@ EAPI const char *eldbus_message_member_get(const Eldbus_Message *msg)
* @param msg The Eldbus_Message object.
* @return A string containing the dbus message destination.
*/
EAPI const char *eldbus_message_destination_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_message_destination_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* Get the Eldbus message sender.
@ -64,7 +64,7 @@ EAPI const char *eldbus_message_destination_get(const Eldbus_Message *
* @param msg The Eldbus_Message object.
* @return A string containing the dbus message sender.
*/
EAPI const char *eldbus_message_sender_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_message_sender_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* Get the Eldbus message signature.
@ -72,7 +72,7 @@ EAPI const char *eldbus_message_sender_get(const Eldbus_Message *msg)
* @param msg The Eldbus_Message object.
* @return A string containing the dbus message signature.
*/
EAPI const char *eldbus_message_signature_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_message_signature_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Create a new message to invoke a method on a remote object.
@ -84,7 +84,7 @@ EAPI const char *eldbus_message_signature_get(const Eldbus_Message *ms
*
* @return a new Eldbus_Message, free with eldbus_message_unref()
*/
EAPI Eldbus_Message *eldbus_message_method_call_new(const char *dest, const char *path, const char *iface, const char *method) EINA_ARG_NONNULL(1, 2, 3, 4) EINA_WARN_UNUSED_RESULT EINA_MALLOC;
ELDBUS_API Eldbus_Message *eldbus_message_method_call_new(const char *dest, const char *path, const char *iface, const char *method) EINA_ARG_NONNULL(1, 2, 3, 4) EINA_WARN_UNUSED_RESULT EINA_MALLOC;
/**
* @brief Create a new signal message.
@ -97,7 +97,7 @@ EAPI Eldbus_Message *eldbus_message_method_call_new(const char *dest, con
*
* @since 1.16
*/
EAPI Eldbus_Message *eldbus_message_signal_new(const char *path, const char *interface, const char *name) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Message *eldbus_message_signal_new(const char *path, const char *interface, const char *name) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
/**
* @brief Create a new message that is an error reply to another message.
@ -108,7 +108,7 @@ EAPI Eldbus_Message *eldbus_message_signal_new(const char *path, const char *int
*
* @return a new Eldbus_Message, free with eldbus_message_unref()
*/
EAPI Eldbus_Message *eldbus_message_error_new(const Eldbus_Message *msg, const char *error_name, const char *error_msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Message *eldbus_message_error_new(const Eldbus_Message *msg, const char *error_name, const char *error_msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Create a message that is a reply to a method call.
@ -117,7 +117,7 @@ EAPI Eldbus_Message *eldbus_message_error_new(const Eldbus_Message *msg,
*
* @return new Eldbus_Message, free with eldbus_message_unref()
*/
EAPI Eldbus_Message *eldbus_message_method_return_new(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Message *eldbus_message_method_return_new(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
@ -133,7 +133,7 @@ EAPI Eldbus_Message *eldbus_message_method_return_new(const Eldbus_Messag
* desired.
* @return EINA_TRUE on success, else EINA_FALSE.
*/
EAPI Eina_Bool eldbus_message_error_get(const Eldbus_Message *msg, const char **name, const char **text) EINA_ARG_NONNULL(1);
ELDBUS_API Eina_Bool eldbus_message_error_get(const Eldbus_Message *msg, const char **name, const char **text) EINA_ARG_NONNULL(1);
/**
* @brief Get the arguments from an Eldbus_Message
@ -152,7 +152,7 @@ EAPI Eina_Bool eldbus_message_error_get(const Eldbus_Message *msg, c
* @return EINA_TRUE if the arguments were read successfully and stored in the
* respective pointer arguments.
*/
EAPI Eina_Bool eldbus_message_arguments_get(const Eldbus_Message *msg, const char *signature, ...) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eina_Bool eldbus_message_arguments_get(const Eldbus_Message *msg, const char *signature, ...) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
/**
* @brief Get the arguments from an Eldbus_Message using a va_list.
@ -166,7 +166,7 @@ EAPI Eina_Bool eldbus_message_arguments_get(const Eldbus_Message *ms
* @return EINA_TRUE if the arguments were read successfully and stored in the
* respective pointer arguments.
*/
EAPI Eina_Bool eldbus_message_arguments_vget(const Eldbus_Message *msg, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eina_Bool eldbus_message_arguments_vget(const Eldbus_Message *msg, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
/**
* @brief Append arguments into an Eldbus_Message
@ -184,7 +184,7 @@ EAPI Eina_Bool eldbus_message_arguments_vget(const Eldbus_Message *m
*
* @return EINA_TRUE on success, EINA_FALSE otherwise.
*/
EAPI Eina_Bool eldbus_message_arguments_append(Eldbus_Message *msg, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Bool eldbus_message_arguments_append(Eldbus_Message *msg, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
/**
* @brief Append arguments into an Eldbus_Message using a va_list.
@ -197,7 +197,7 @@ EAPI Eina_Bool eldbus_message_arguments_append(Eldbus_Message *msg,
*
* @return EINA_TRUE on success, EINA_FALSE otherwise.
*/
EAPI Eina_Bool eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Bool eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2);
/**
* @defgroup Eldbus_Message_Iter Iterator
@ -222,7 +222,7 @@ EAPI Eina_Bool eldbus_message_arguments_vappend(Eldbus_Message *msg,
*
* @return the new iterator
*/
EAPI Eldbus_Message_Iter *eldbus_message_iter_container_new(Eldbus_Message_Iter *iter, int type, const char* contained_signature) EINA_ARG_NONNULL(1, 3) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Message_Iter *eldbus_message_iter_container_new(Eldbus_Message_Iter *iter, int type, const char* contained_signature) EINA_ARG_NONNULL(1, 3) EINA_WARN_UNUSED_RESULT;
/**
* @brief Append a basic type into an Eldbus_Iterator.
@ -233,7 +233,7 @@ EAPI Eldbus_Message_Iter *eldbus_message_iter_container_new(Eldbus_Message_Iter
*
* @return EINA_TRUE on success, else EINA_FALSE.
*/
EAPI Eina_Bool eldbus_message_iter_basic_append(Eldbus_Message_Iter *iter, int type, ...) EINA_ARG_NONNULL(1, 3);
ELDBUS_API Eina_Bool eldbus_message_iter_basic_append(Eldbus_Message_Iter *iter, int type, ...) EINA_ARG_NONNULL(1, 3);
/**
* @brief Append an argument into an Eldbus_Message_Iter. For each complete type
@ -258,7 +258,7 @@ EAPI Eina_Bool eldbus_message_iter_basic_append(Eldbus_Message_Ite
* eldbus_message_iter_container_new() instead to create the variant, fill
* with data and close it.
*/
EAPI Eina_Bool eldbus_message_iter_arguments_append(Eldbus_Message_Iter *iter, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Bool eldbus_message_iter_arguments_append(Eldbus_Message_Iter *iter, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
/**
* @brief Set data to Eldbus_Message_Iter. For each complete in signature
@ -279,7 +279,7 @@ EAPI Eina_Bool eldbus_message_iter_arguments_append(Eldbus_Message
* eldbus_message_iter_container_new() to create the variant fill
* data and close it.
*/
EAPI Eina_Bool eldbus_message_iter_arguments_vappend(Eldbus_Message_Iter *iter, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API Eina_Bool eldbus_message_iter_arguments_vappend(Eldbus_Message_Iter *iter, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2, 3);
/**
@ -291,7 +291,7 @@ EAPI Eina_Bool eldbus_message_iter_arguments_vappend(Eldbus_Messag
* @param size of array
* @return EINA_TRUE on success, else EINA_FALSE
*/
EAPI Eina_Bool eldbus_message_iter_fixed_array_append(Eldbus_Message_Iter *iter, int type, const void *array, unsigned int size) EINA_ARG_NONNULL(1, 3);
ELDBUS_API Eina_Bool eldbus_message_iter_fixed_array_append(Eldbus_Message_Iter *iter, int type, const void *array, unsigned int size) EINA_ARG_NONNULL(1, 3);
/**
* @brief Closes a container-typed value appended to the message.
@ -301,7 +301,7 @@ EAPI Eina_Bool eldbus_message_iter_fixed_array_append(Eldbus_Messa
*
* @return EINA_FALSE if iterator was already close or if not enough memory
*/
EAPI Eina_Bool eldbus_message_iter_container_close(Eldbus_Message_Iter *iter, Eldbus_Message_Iter *sub) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Bool eldbus_message_iter_container_close(Eldbus_Message_Iter *iter, Eldbus_Message_Iter *sub) EINA_ARG_NONNULL(1, 2);
/**
* @brief Get the main Eldbus_Message_Iter from the Eldbus_Message.
@ -310,7 +310,7 @@ EAPI Eina_Bool eldbus_message_iter_container_close(Eldbus_Message_
*
* @return The iterator of the message.
*/
EAPI Eldbus_Message_Iter *eldbus_message_iter_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Message_Iter *eldbus_message_iter_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Get a basic type from Eldbus_Iterator.
@ -318,7 +318,7 @@ EAPI Eldbus_Message_Iter *eldbus_message_iter_get(const Eldbus_Message *msg) EIN
* @param iter The iterator to get the basic type from.
* @param value The basic type of the iterator.
*/
EAPI void eldbus_message_iter_basic_get(Eldbus_Message_Iter *iter, void *value) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_message_iter_basic_get(Eldbus_Message_Iter *iter, void *value) EINA_ARG_NONNULL(1, 2);
/**
* @brief Returns the current signature of a message iterator.
@ -328,7 +328,7 @@ EAPI void eldbus_message_iter_basic_get(Eldbus_Message_Iter *
*
* @note The returned string must be freed.
*/
EAPI char *eldbus_message_iter_signature_get(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API char *eldbus_message_iter_signature_get(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Moves the iterator to the next field, if any.
@ -336,7 +336,7 @@ EAPI char *eldbus_message_iter_signature_get(Eldbus_Message_It
*
* @return if iterator was reach to end return EINA_FALSE
*/
EAPI Eina_Bool eldbus_message_iter_next(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1);
ELDBUS_API Eina_Bool eldbus_message_iter_next(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1);
/**
* @brief Get a complete type from Eldbus_Message_Iter if is not at the end
@ -351,7 +351,7 @@ EAPI Eina_Bool eldbus_message_iter_next(Eldbus_Message_Iter *iter)
* iterator points return EINA_FALSE
*
*/
EAPI Eina_Bool eldbus_message_iter_get_and_next(Eldbus_Message_Iter *iter, char signature, ...) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API Eina_Bool eldbus_message_iter_get_and_next(Eldbus_Message_Iter *iter, char signature, ...) EINA_ARG_NONNULL(1, 2, 3);
/**
* @brief Reads a block of fixed-length values from the message iterator.
@ -376,7 +376,7 @@ EAPI Eina_Bool eldbus_message_iter_get_and_next(Eldbus_Message_Ite
* @param n_elements
* @return EINA_TRUE on success, else EINA_FALSE.
*/
EAPI Eina_Bool eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, int signature, void *value, int *n_elements) EINA_ARG_NONNULL(1, 3, 4);
ELDBUS_API Eina_Bool eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, int signature, void *value, int *n_elements) EINA_ARG_NONNULL(1, 3, 4);
/**
* @brief Get data from Eldbus_Message_Iter, for each complete type must have
@ -389,7 +389,7 @@ EAPI Eina_Bool eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, in
*
* @return EINA_FALSE if signature different from signature in iterator
*/
EAPI Eina_Bool eldbus_message_iter_arguments_get(Eldbus_Message_Iter *iter, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Bool eldbus_message_iter_arguments_get(Eldbus_Message_Iter *iter, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
/**
* @brief Get data from Eldbus_Message_Iter, for each complete type must have
@ -402,7 +402,7 @@ EAPI Eina_Bool eldbus_message_iter_arguments_get(Eldbus_Message_It
*
* @return EINA_FALSE if signature different from signature in iterator
*/
EAPI Eina_Bool eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Bool eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2);
/**
* @brief Manually delete the iterator.
@ -418,7 +418,7 @@ EAPI Eina_Bool eldbus_message_iter_arguments_vget(Eldbus_Message_I
*
* @param iter the iterator to be deleted.
*/
EAPI void eldbus_message_iter_del(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1);
ELDBUS_API void eldbus_message_iter_del(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1);
/**
* @}

View File

@ -10,7 +10,7 @@
* @param msg Message
* @return Eina_Value of type Eina_Value_Type_Struct
*/
EAPI Eina_Value *eldbus_message_to_eina_value(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eina_Value *eldbus_message_to_eina_value(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* Convert Eldbus_Message_Iter of type variant, struct or dict entry to
@ -19,7 +19,7 @@ EAPI Eina_Value *eldbus_message_to_eina_value(const Eldbus_Message *msg) EINA_AR
* @param iter Message iterator
* @return Eina_Value of type Eina_Value_Type_Struct
*/
EAPI Eina_Value *eldbus_message_iter_struct_like_to_eina_value(const Eldbus_Message_Iter *iter);
ELDBUS_API Eina_Value *eldbus_message_iter_struct_like_to_eina_value(const Eldbus_Message_Iter *iter);
/**
* Convert Eina_Value to Eldbus_Message
@ -29,7 +29,7 @@ EAPI Eina_Value *eldbus_message_iter_struct_like_to_eina_value(const Eldbus_Mess
* @param value source of data, must be of type Eina_Value_Type_Struct
* @return success or not
*/
EAPI Eina_Bool eldbus_message_from_eina_value(const char *signature, Eldbus_Message *msg, const Eina_Value *value) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API Eina_Bool eldbus_message_from_eina_value(const char *signature, Eldbus_Message *msg, const Eina_Value *value) EINA_ARG_NONNULL(1, 2, 3);
/**
* @}

View File

@ -371,7 +371,7 @@ _message_iter_from_eina_value_struct(const char *signature, Eldbus_Message_Iter
return r;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_message_from_eina_value(const char *signature, Eldbus_Message *msg, const Eina_Value *value)
{
Eldbus_Message_Iter *iter;

View File

@ -1,7 +1,7 @@
#include "eldbus_private.h"
#include "eldbus_private_types.h"
EAPI void
ELDBUS_API void
eldbus_message_iter_dict_iterate(Eldbus_Message_Iter *array, const char *signature, Eldbus_Dict_Cb_Get cb, const void *data)
{
Eldbus_Message_Iter *entry;

View File

@ -24,7 +24,7 @@ typedef void (*Eldbus_Dict_Cb_Get)(void *data, const void *key, Eldbus_Message_I
* @param cb callback that will be called in each entry
* @param data context data
*/
EAPI void eldbus_message_iter_dict_iterate(Eldbus_Message_Iter *dict, const char *signature, Eldbus_Dict_Cb_Get cb, const void *data) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API void eldbus_message_iter_dict_iterate(Eldbus_Message_Iter *dict, const char *signature, Eldbus_Dict_Cb_Get cb, const void *data) EINA_ARG_NONNULL(1, 2, 3);
/**
* @}

View File

@ -449,7 +449,7 @@ end:
return value_st;
}
EAPI Eina_Value *
ELDBUS_API Eina_Value *
eldbus_message_to_eina_value(const Eldbus_Message *msg)
{
Eldbus_Message_Iter *iter;
@ -459,7 +459,7 @@ eldbus_message_to_eina_value(const Eldbus_Message *msg)
return _message_iter_struct_to_eina_value(iter);
}
EAPI Eina_Value *
ELDBUS_API Eina_Value *
eldbus_message_iter_struct_like_to_eina_value(const Eldbus_Message_Iter *iter)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);

View File

@ -184,7 +184,7 @@ _on_connection_free(void *data, const void *dead_pointer EINA_UNUSED)
_eldbus_object_free(obj);
}
EAPI Eldbus_Object *
ELDBUS_API Eldbus_Object *
eldbus_object_get(Eldbus_Connection *conn, const char *bus, const char *path)
{
Eldbus_Object *obj;
@ -236,7 +236,7 @@ _eldbus_object_unref(Eldbus_Object *obj)
_eldbus_object_free(obj);
}
EAPI Eldbus_Object *
ELDBUS_API Eldbus_Object *
eldbus_object_ref(Eldbus_Object *obj)
{
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
@ -246,7 +246,7 @@ eldbus_object_ref(Eldbus_Object *obj)
return obj;
}
EAPI void
ELDBUS_API void
eldbus_object_unref(Eldbus_Object *obj)
{
ELDBUS_OBJECT_CHECK(obj);
@ -255,7 +255,7 @@ eldbus_object_unref(Eldbus_Object *obj)
_eldbus_object_unref(obj);
}
EAPI void
ELDBUS_API void
eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_OBJECT_CHECK(obj);
@ -263,7 +263,7 @@ eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *dat
obj->cbs_free = eldbus_cbs_free_add(obj->cbs_free, cb, data);
}
EAPI void
ELDBUS_API void
eldbus_object_free_cb_del(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_OBJECT_CHECK(obj);
@ -376,7 +376,7 @@ end:
eldbus_proxy_unref(proxy);
}
EAPI void
ELDBUS_API void
eldbus_object_event_callback_add(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data)
{
Eldbus_Object_Context_Event *ce;
@ -451,7 +451,7 @@ _eldbus_object_context_event_cb_del(Eldbus_Object_Context_Event *ce, Eldbus_Obje
free(ctx);
}
EAPI void
ELDBUS_API void
eldbus_object_event_callback_del(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data)
{
Eldbus_Object_Context_Event *ce;
@ -538,21 +538,21 @@ _eldbus_object_event_callback_call(Eldbus_Object *obj, Eldbus_Object_Event_Type
_eldbus_object_context_event_cb_del(ce, iter);
}
EAPI Eldbus_Connection *
ELDBUS_API Eldbus_Connection *
eldbus_object_connection_get(const Eldbus_Object *obj)
{
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
return obj->conn;
}
EAPI const char *
ELDBUS_API const char *
eldbus_object_bus_name_get(const Eldbus_Object *obj)
{
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
return obj->name;
}
EAPI const char *
ELDBUS_API const char *
eldbus_object_path_get(const Eldbus_Object *obj)
{
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
@ -571,7 +571,7 @@ _on_object_message_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pen
cb(data, msg, pending);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_object_send(Eldbus_Object *obj, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout)
{
Eldbus_Pending *pending;
@ -603,7 +603,7 @@ _on_signal_handler_free(void *data, const void *dead_pointer)
obj->signal_handlers = eina_list_remove(obj->signal_handlers, dead_pointer);
}
EAPI Eldbus_Signal_Handler *
ELDBUS_API Eldbus_Signal_Handler *
eldbus_object_signal_handler_add(Eldbus_Object *obj, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data)
{
Eldbus_Signal_Handler *handler;
@ -621,7 +621,7 @@ eldbus_object_signal_handler_add(Eldbus_Object *obj, const char *interface, cons
return handler;
}
EAPI Eldbus_Message *
ELDBUS_API Eldbus_Message *
eldbus_object_method_call_new(Eldbus_Object *obj, const char *interface, const char *member)
{
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
@ -649,7 +649,7 @@ eldbus_object_proxy_del(Eldbus_Object *obj, Eldbus_Proxy *proxy, const char *int
return eina_hash_del(obj->proxies, interface, proxy);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_object_peer_ping(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data)
{
Eldbus_Message *msg;
@ -660,7 +660,7 @@ eldbus_object_peer_ping(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *da
return p;
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_object_peer_machine_id_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data)
{
Eldbus_Message *msg;
@ -672,7 +672,7 @@ eldbus_object_peer_machine_id_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, cons
return p;
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_object_introspect(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data)
{
Eldbus_Message *msg;

View File

@ -16,7 +16,7 @@
* @param path object path of this object
* @return The corresponding Eldbus_Object.
*/
EAPI Eldbus_Object *eldbus_object_get(Eldbus_Connection *conn, const char *bus, const char *path) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Object *eldbus_object_get(Eldbus_Connection *conn, const char *bus, const char *path) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
/**
* @brief Increase object reference.
@ -24,7 +24,7 @@ EAPI Eldbus_Object *eldbus_object_get(Eldbus_Connection *conn, const char *bus,
* @param obj An Eldbus_Object.
* @return The same Eldbus_Object with an increased refcount.
*/
EAPI Eldbus_Object *eldbus_object_ref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Object *eldbus_object_ref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
/**
* @brief Decrease object reference.
@ -32,7 +32,7 @@ EAPI Eldbus_Object *eldbus_object_ref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
*
* @param obj An Eldbus_Object.
*/
EAPI void eldbus_object_unref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
ELDBUS_API void eldbus_object_unref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
/**
* @brief Add a callback function to be called when object will be freed.
@ -41,7 +41,7 @@ EAPI void eldbus_object_unref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
* @param cb callback that will be executed
* @param data passed to callback
*/
EAPI void eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in eldbus_object_free_cb_add().
@ -50,7 +50,7 @@ EAPI void eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Free_Cb
* @param cb Callback that was registered.
* @param data Data that was passed to callback.
*/
EAPI void eldbus_object_free_cb_del(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_object_free_cb_del(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @typedef Eldbus_Object_Event_Type
@ -133,7 +133,7 @@ typedef void (*Eldbus_Object_Event_Cb)(void *data, Eldbus_Object *obj, void *eve
* @param cb The callback to call.
* @param cb_data The data to pass to the callback.
*/
EAPI void eldbus_object_event_callback_add(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
ELDBUS_API void eldbus_object_event_callback_add(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
/**
* @brief Remove callback registered in eldbus_object_event_callback_add().
@ -143,7 +143,7 @@ EAPI void eldbus_object_event_callback_add(Eldbus_Object *obj,
* @param cb The callback to call.
* @param cb_data The data to pass to the callback.
*/
EAPI void eldbus_object_event_callback_del(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
ELDBUS_API void eldbus_object_event_callback_del(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
/**
* Get the Eldbus_Connection object associated with a Eldbus_Object.
@ -151,7 +151,7 @@ EAPI void eldbus_object_event_callback_del(Eldbus_Object *obj,
* @param obj The Eldbus_Object.
* @return The corresponding Eldbus_Connection object.
*/
EAPI Eldbus_Connection *eldbus_object_connection_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Connection *eldbus_object_connection_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* Get the name associated with a Eldbus_Object.
@ -159,7 +159,7 @@ EAPI Eldbus_Connection *eldbus_object_connection_get(const Eldbus_Object *ob
* @param obj The Eldbus_Object.
* @return A string corresponding to the Eldbus_Object name.
*/
EAPI const char *eldbus_object_bus_name_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_object_bus_name_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* Get the path associated with a Eldbus_Object.
@ -167,7 +167,7 @@ EAPI const char *eldbus_object_bus_name_get(const Eldbus_Object *obj)
* @param obj The Eldbus_Object.
* @return A string corresponding to the Eldbus_Object path.
*/
EAPI const char *eldbus_object_path_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_object_path_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Send a message.
@ -181,7 +181,7 @@ EAPI const char *eldbus_object_path_get(const Eldbus_Object *obj) EINA
* ELDBUS_TIMEOUT_INFINITE for no timeout
* @return A Eldbus_Pending object.
*/
EAPI Eldbus_Pending *eldbus_object_send(Eldbus_Object *obj, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_object_send(Eldbus_Object *obj, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
/**
* @brief Add a signal handler.
@ -193,7 +193,7 @@ EAPI Eldbus_Pending *eldbus_object_send(Eldbus_Object *obj, Eldbus_Messag
* @param cb_data data that will be passed to callback
* @return A listener to the desired signal.
*/
EAPI Eldbus_Signal_Handler *eldbus_object_signal_handler_add(Eldbus_Object *obj, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 4);
ELDBUS_API Eldbus_Signal_Handler *eldbus_object_signal_handler_add(Eldbus_Object *obj, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 4);
/**
* @brief Call a dbus method on the Eldbus_Object.
@ -204,7 +204,7 @@ EAPI Eldbus_Signal_Handler *eldbus_object_signal_handler_add(Eldbus_Object *obj,
*
* @return a new Eldbus_Message, free with eldbus_message_unref()
*/
EAPI Eldbus_Message *eldbus_object_method_call_new(Eldbus_Object *obj, const char *interface, const char *member) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Message *eldbus_object_method_call_new(Eldbus_Object *obj, const char *interface, const char *member) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
/**
* @}

View File

@ -90,7 +90,7 @@ _on_conn_message_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pendi
cb(data, msg, pending);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_connection_send(Eldbus_Connection *conn, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout)
{
Eldbus_Pending *pending;
@ -222,7 +222,7 @@ fail:
return reply;
}
EAPI void
ELDBUS_API void
eldbus_pending_data_set(Eldbus_Pending *pending, const char *key, const void *data)
{
ELDBUS_PENDING_CHECK(pending);
@ -231,7 +231,7 @@ eldbus_pending_data_set(Eldbus_Pending *pending, const char *key, const void *da
eldbus_data_set(&(pending->data), key, data);
}
EAPI void *
ELDBUS_API void *
eldbus_pending_data_get(const Eldbus_Pending *pending, const char *key)
{
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
@ -239,7 +239,7 @@ eldbus_pending_data_get(const Eldbus_Pending *pending, const char *key)
return eldbus_data_get(&(((Eldbus_Pending *)pending)->data), key);
}
EAPI void *
ELDBUS_API void *
eldbus_pending_data_del(Eldbus_Pending *pending, const char *key)
{
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
@ -272,7 +272,7 @@ eldbus_pending_dispatch(Eldbus_Pending *pending, Eldbus_Message *msg)
free(pending);
}
EAPI void
ELDBUS_API void
eldbus_pending_cancel(Eldbus_Pending *pending)
{
Eldbus_Message *error_message;
@ -288,7 +288,7 @@ eldbus_pending_cancel(Eldbus_Pending *pending)
eldbus_pending_dispatch(pending, error_message);
}
EAPI void
ELDBUS_API void
eldbus_pending_free_cb_add(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_PENDING_CHECK(pending);
@ -296,7 +296,7 @@ eldbus_pending_free_cb_add(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const voi
pending->cbs_free = eldbus_cbs_free_add(pending->cbs_free, cb, data);
}
EAPI void
ELDBUS_API void
eldbus_pending_free_cb_del(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_PENDING_CHECK(pending);
@ -304,28 +304,28 @@ eldbus_pending_free_cb_del(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const voi
pending->cbs_free = eldbus_cbs_free_del(pending->cbs_free, cb, data);
}
EAPI const char *
ELDBUS_API const char *
eldbus_pending_destination_get(const Eldbus_Pending *pending)
{
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
return pending->dest;
}
EAPI const char *
ELDBUS_API const char *
eldbus_pending_path_get(const Eldbus_Pending *pending)
{
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
return pending->path;
}
EAPI const char *
ELDBUS_API const char *
eldbus_pending_interface_get(const Eldbus_Pending *pending)
{
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
return pending->interface;
}
EAPI const char *
ELDBUS_API const char *
eldbus_pending_method_get(const Eldbus_Pending *pending)
{
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);

View File

@ -15,7 +15,7 @@
* @param key A string corresponding to the key associated with the data.
* @param data The data to set to the Eldbus_Pending object.
*/
EAPI void eldbus_pending_data_set(Eldbus_Pending *pending, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API void eldbus_pending_data_set(Eldbus_Pending *pending, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
/**
* @brief Get the data set to a Eldbus_Pending object.
@ -24,7 +24,7 @@ EAPI void eldbus_pending_data_set(Eldbus_Pending *pending, cons
* @param key A string corresponding to the key associated with the data.
* @return The data set to the Eldbus_Pending object.
*/
EAPI void *eldbus_pending_data_get(const Eldbus_Pending *pending, const char *key) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void *eldbus_pending_data_get(const Eldbus_Pending *pending, const char *key) EINA_ARG_NONNULL(1, 2);
/**
* @brief Delete the data set to a Eldbus_Pending object.
@ -32,14 +32,14 @@ EAPI void *eldbus_pending_data_get(const Eldbus_Pending *pending
* @param pending The Eldbus_Pending object on which the data is set.
* @param key A string corresponding to the key associated with the data.
*/
EAPI void *eldbus_pending_data_del(Eldbus_Pending *pending, const char *key) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void *eldbus_pending_data_del(Eldbus_Pending *pending, const char *key) EINA_ARG_NONNULL(1, 2);
/**
* @brief Cancel the pending message.
*
* @param pending The Eldbus_Pending object corresponding to the pending message.
*/
EAPI void eldbus_pending_cancel(Eldbus_Pending *pending) EINA_ARG_NONNULL(1);
ELDBUS_API void eldbus_pending_cancel(Eldbus_Pending *pending) EINA_ARG_NONNULL(1);
/**
* @brief Get the destination of the pending message.
@ -47,7 +47,7 @@ EAPI void eldbus_pending_cancel(Eldbus_Pending *pending) EINA_A
* @param pending The Eldbus_Pending object.
* @return A string corresponding to the destination of the message.
*/
EAPI const char *eldbus_pending_destination_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_pending_destination_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Get the path of the pending message.
@ -55,7 +55,7 @@ EAPI const char *eldbus_pending_destination_get(const Eldbus_Pending *
* @param pending The Eldbus_Pending object.
* @return A string corresponding to the path of the message.
*/
EAPI const char *eldbus_pending_path_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_pending_path_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Get the interface of the pending message.
@ -63,7 +63,7 @@ EAPI const char *eldbus_pending_path_get(const Eldbus_Pending *pending
* @param pending The Eldbus_Pending object.
* @return A string corresponding to the interface of the message.
*/
EAPI const char *eldbus_pending_interface_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_pending_interface_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Get the method of the pending message.
@ -71,7 +71,7 @@ EAPI const char *eldbus_pending_interface_get(const Eldbus_Pending *pe
* @param pending The Eldbus_Pending object.
* @return A string corresponding to the method of the message.
*/
EAPI const char *eldbus_pending_method_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_pending_method_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Add a callback function to be called when pending will be freed.
@ -80,7 +80,7 @@ EAPI const char *eldbus_pending_method_get(const Eldbus_Pending *pendi
* @param cb The callback to register.
* @param data The data to pass to the callback.
*/
EAPI void eldbus_pending_free_cb_add(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_pending_free_cb_add(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in eldbus_pending_free_cb_add().
@ -89,7 +89,7 @@ EAPI void eldbus_pending_free_cb_add(Eldbus_Pending *pending, E
* @param cb The callback that was registered.
* @param data The data passed to the callback.
*/
EAPI void eldbus_pending_free_cb_del(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_pending_free_cb_del(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @}

View File

@ -204,7 +204,7 @@ _on_object_free(void *data, const void *dead_pointer EINA_UNUSED)
_eldbus_proxy_free(proxy);
}
EAPI Eldbus_Proxy *
ELDBUS_API Eldbus_Proxy *
eldbus_proxy_get(Eldbus_Object *obj, const char *interface)
{
Eldbus_Proxy *proxy;
@ -249,7 +249,7 @@ _eldbus_proxy_unref(Eldbus_Proxy *proxy)
_eldbus_proxy_free(proxy);
}
EAPI Eldbus_Proxy *
ELDBUS_API Eldbus_Proxy *
eldbus_proxy_ref(Eldbus_Proxy *proxy)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -259,7 +259,7 @@ eldbus_proxy_ref(Eldbus_Proxy *proxy)
return proxy;
}
EAPI void
ELDBUS_API void
eldbus_proxy_unref(Eldbus_Proxy *proxy)
{
ELDBUS_PROXY_CHECK(proxy);
@ -268,7 +268,7 @@ eldbus_proxy_unref(Eldbus_Proxy *proxy)
_eldbus_proxy_unref(proxy);
}
EAPI void
ELDBUS_API void
eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_PROXY_CHECK(proxy);
@ -276,7 +276,7 @@ eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *dat
proxy->cbs_free = eldbus_cbs_free_add(proxy->cbs_free, cb, data);
}
EAPI void
ELDBUS_API void
eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_PROXY_CHECK(proxy);
@ -284,7 +284,7 @@ eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *dat
proxy->cbs_free = eldbus_cbs_free_del(proxy->cbs_free, cb, data);
}
EAPI void
ELDBUS_API void
eldbus_proxy_data_set(Eldbus_Proxy *proxy, const char *key, const void *data)
{
ELDBUS_PROXY_CHECK(proxy);
@ -293,7 +293,7 @@ eldbus_proxy_data_set(Eldbus_Proxy *proxy, const char *key, const void *data)
eldbus_data_set(&(proxy->data), key, data);
}
EAPI void *
ELDBUS_API void *
eldbus_proxy_data_get(const Eldbus_Proxy *proxy, const char *key)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -301,7 +301,7 @@ eldbus_proxy_data_get(const Eldbus_Proxy *proxy, const char *key)
return eldbus_data_get(&(((Eldbus_Proxy *)proxy)->data), key);
}
EAPI void *
ELDBUS_API void *
eldbus_proxy_data_del(Eldbus_Proxy *proxy, const char *key)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -385,7 +385,7 @@ _props_cache_free(void *data)
eina_value_free(value);
}
EAPI void
ELDBUS_API void
eldbus_proxy_event_callback_add(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data)
{
Eldbus_Proxy_Context_Event *ce;
@ -431,7 +431,7 @@ _eldbus_proxy_context_event_cb_del(Eldbus_Proxy_Context_Event *ce, Eldbus_Proxy_
free(ctx);
}
EAPI void
ELDBUS_API void
eldbus_proxy_event_callback_del(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data)
{
Eldbus_Proxy_Context_Event *ce;
@ -516,14 +516,14 @@ _eldbus_proxy_event_callback_call(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type t
_eldbus_proxy_context_event_cb_del(ce, iter);
}
EAPI Eldbus_Object *
ELDBUS_API Eldbus_Object *
eldbus_proxy_object_get(const Eldbus_Proxy *proxy)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
return proxy->obj;
}
EAPI const char *
ELDBUS_API const char *
eldbus_proxy_interface_get(const Eldbus_Proxy *proxy)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -570,7 +570,7 @@ _eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double ti
return _eldbus_connection_send_and_block(proxy->obj->conn, msg, timeout);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -579,7 +579,7 @@ eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_Message *msg, Eldbus_Message_Cb cb
return _eldbus_proxy_send(proxy, msg, cb, cb_data, timeout);
}
EAPI Eldbus_Message *
ELDBUS_API Eldbus_Message *
eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double timeout)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -588,7 +588,7 @@ eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double tim
return _eldbus_proxy_send_and_block(proxy, msg, timeout);
}
EAPI Eldbus_Message *
ELDBUS_API Eldbus_Message *
eldbus_proxy_method_call_new(Eldbus_Proxy *proxy, const char *member)
{
Eldbus_Message *msg;
@ -617,7 +617,7 @@ _eldbus_proxy_vcall(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb c
return _eldbus_proxy_send(proxy, msg, cb, cb_data, timeout);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_proxy_call(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, ...)
{
Eldbus_Pending *pending;
@ -635,7 +635,7 @@ eldbus_proxy_call(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb,
return pending;
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_proxy_vcall(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, va_list ap)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -654,7 +654,7 @@ _on_signal_handler_free(void *data, const void *dead_pointer)
proxy->handlers = eina_list_remove(proxy->handlers, dead_pointer);
}
EAPI Eldbus_Signal_Handler *
ELDBUS_API Eldbus_Signal_Handler *
eldbus_proxy_signal_handler_add(Eldbus_Proxy *proxy, const char *member, Eldbus_Signal_Cb cb, const void *cb_data)
{
Eldbus_Signal_Handler *handler;
@ -677,7 +677,7 @@ eldbus_proxy_signal_handler_add(Eldbus_Proxy *proxy, const char *member, Eldbus_
return handler;
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_proxy_property_get(Eldbus_Proxy *proxy, const char *name, Eldbus_Message_Cb cb, const void *data)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -700,7 +700,7 @@ _type_is_number(char sig)
return EINA_FALSE;
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_proxy_property_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const void *value, Eldbus_Message_Cb cb, const void *data)
{
Eldbus_Message *msg;
@ -732,7 +732,7 @@ eldbus_proxy_property_set(Eldbus_Proxy *proxy, const char *name, const char *sig
return eldbus_proxy_send(proxy->obj->properties, msg, cb, data, -1);
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_proxy_property_value_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const Eina_Value *value, Eldbus_Message_Cb cb, const void *data)
{
Eldbus_Message *msg;
@ -768,7 +768,7 @@ error:
return NULL;
}
EAPI Eldbus_Pending *
ELDBUS_API Eldbus_Pending *
eldbus_proxy_property_get_all(Eldbus_Proxy *proxy, Eldbus_Message_Cb cb, const void *data)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -776,7 +776,7 @@ eldbus_proxy_property_get_all(Eldbus_Proxy *proxy, Eldbus_Message_Cb cb, const v
"s", proxy->interface);
}
EAPI Eldbus_Signal_Handler *
ELDBUS_API Eldbus_Signal_Handler *
eldbus_proxy_properties_changed_callback_add(Eldbus_Proxy *proxy, Eldbus_Signal_Cb cb, const void *data)
{
Eldbus_Signal_Handler *sh;
@ -839,7 +839,7 @@ _props_get_all(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
&event);
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_Bool enable)
{
Eldbus_Pending *pending;
@ -883,7 +883,7 @@ eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_Bool enable)
return !!eina_hash_population(proxy->props);
}
EAPI Eina_Value *
ELDBUS_API Eina_Value *
eldbus_proxy_property_local_get(Eldbus_Proxy *proxy, const char *name)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
@ -892,7 +892,7 @@ eldbus_proxy_property_local_get(Eldbus_Proxy *proxy, const char *name)
return eina_hash_find(proxy->props, name);
}
EAPI const Eina_Hash *
ELDBUS_API const Eina_Hash *
eldbus_proxy_property_local_get_all(Eldbus_Proxy *proxy)
{
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);

View File

@ -15,7 +15,7 @@
* @param interface The interface name of the proxy.
* @return The corresponding Eldbus_Proxy object.
*/
EAPI Eldbus_Proxy *eldbus_proxy_get(Eldbus_Object *obj, const char *interface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Proxy *eldbus_proxy_get(Eldbus_Object *obj, const char *interface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
/**
* @brief Increase proxy reference.
@ -23,7 +23,7 @@ EAPI Eldbus_Proxy *eldbus_proxy_get(Eldbus_Object *obj, const char *int
* @param proxy The Eldbus_Proxy on which to increase the refcount.
* @return The Eldbus_Proxy with an increased refcount.
*/
EAPI Eldbus_Proxy *eldbus_proxy_ref(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Proxy *eldbus_proxy_ref(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
/**
* @brief Decrease proxy reference.
@ -31,7 +31,7 @@ EAPI Eldbus_Proxy *eldbus_proxy_ref(Eldbus_Proxy *proxy) EINA_ARG_NONNU
*
* @param proxy The Eldbus_Proxy on which to decrease the refcount.
*/
EAPI void eldbus_proxy_unref(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
ELDBUS_API void eldbus_proxy_unref(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
/**
* @brief Get the Eldbus_Object associated with a proxy object.
@ -39,7 +39,7 @@ EAPI void eldbus_proxy_unref(Eldbus_Proxy *proxy) EINA_ARG_NONN
* @param proxy The Eldbus_Proxy on which to do the query.
* @return The corresponding Eldbus_Object.
*/
EAPI Eldbus_Object *eldbus_proxy_object_get(const Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Object *eldbus_proxy_object_get(const Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Get the interface name associated with a proxy object.
@ -47,7 +47,7 @@ EAPI Eldbus_Object *eldbus_proxy_object_get(const Eldbus_Proxy *proxy) E
* @param proxy The Eldbus_Proxy on which to do the query.
* @return The string corresponding to the interface name.
*/
EAPI const char *eldbus_proxy_interface_get(const Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_proxy_interface_get(const Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Set data to an Eldbus_Proxy object.
@ -56,7 +56,7 @@ EAPI const char *eldbus_proxy_interface_get(const Eldbus_Proxy *proxy)
* @param key A string to which the data will be associated.
* @param data The data to set to the proxy object.
*/
EAPI void eldbus_proxy_data_set(Eldbus_Proxy *proxy, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API void eldbus_proxy_data_set(Eldbus_Proxy *proxy, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
/**
* @brief Get data of an Eldbus_Proxy object.
@ -65,7 +65,7 @@ EAPI void eldbus_proxy_data_set(Eldbus_Proxy *proxy, const char
* @param key The string to which the data is associated.
* @return The data set to the proxy object associated with the provided key.
*/
EAPI void *eldbus_proxy_data_get(const Eldbus_Proxy *proxy, const char *key) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void *eldbus_proxy_data_get(const Eldbus_Proxy *proxy, const char *key) EINA_ARG_NONNULL(1, 2);
/**
* @brief Delete data of an Eldbus_Proxy object.
@ -73,7 +73,7 @@ EAPI void *eldbus_proxy_data_get(const Eldbus_Proxy *proxy, cons
* @param proxy The Eldbus_Proxy on which to delete the data.
* @param key The string to which the data is associated.
*/
EAPI void *eldbus_proxy_data_del(Eldbus_Proxy *proxy, const char *key) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void *eldbus_proxy_data_del(Eldbus_Proxy *proxy, const char *key) EINA_ARG_NONNULL(1, 2);
/**
* @brief Add a callback function to be called when an event of the
@ -83,7 +83,7 @@ EAPI void *eldbus_proxy_data_del(Eldbus_Proxy *proxy, const char
* @param cb The callback to add.
* @param data The data to pass to the callback.
*/
EAPI void eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in eldbus_proxy_free_cb_add().
@ -92,7 +92,7 @@ EAPI void eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, Eldbus_
* @param cb The callback to delete.
* @param data The data passed to the callback.
*/
EAPI void eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Constructs a new message to invoke a method on a remote interface.
@ -101,7 +101,7 @@ EAPI void eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, Eldbus_
* @param member The name of the method to invoke.
* @return An Eldbus_Message object.
*/
EAPI Eldbus_Message *eldbus_proxy_method_call_new(Eldbus_Proxy *proxy, const char *member) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Message *eldbus_proxy_method_call_new(Eldbus_Proxy *proxy, const char *member) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
/**
* @brief Send a message.
@ -114,7 +114,7 @@ EAPI Eldbus_Message *eldbus_proxy_method_call_new(Eldbus_Proxy *proxy, co
* ELDBUS_TIMEOUT_INFINITE for no timeout
* @return A Eldbus_Pending object on the sent message.
*/
EAPI Eldbus_Pending *eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Pending *eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
/**
* @brief Send a message and block while waiting for the reply.
@ -128,7 +128,7 @@ EAPI Eldbus_Pending *eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_Messag
* The returned Eldbus_Message need to be unref after read.
* @since 1.13
*/
EAPI Eldbus_Message *eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double timeout) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eldbus_Message *eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double timeout) EINA_ARG_NONNULL(1, 2);
/**
* @brief Call a method in proxy.
@ -148,7 +148,7 @@ EAPI Eldbus_Message *eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eld
* @note This function only support basic type to complex types use
* eldbus_message_iter_* functions.
*/
EAPI Eldbus_Pending *eldbus_proxy_call(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, ...) EINA_ARG_NONNULL(1, 2, 6);
ELDBUS_API Eldbus_Pending *eldbus_proxy_call(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, ...) EINA_ARG_NONNULL(1, 2, 6);
/**
* @brief Call a method in proxy.
@ -167,7 +167,7 @@ EAPI Eldbus_Pending *eldbus_proxy_call(Eldbus_Proxy *proxy, const char *m
* @note This function only support basic type to complex types use
* eldbus_message_iter_* functions.
*/
EAPI Eldbus_Pending *eldbus_proxy_vcall(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2, 6);
ELDBUS_API Eldbus_Pending *eldbus_proxy_vcall(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2, 6);
/**
* @brief Add a signal handler.
@ -178,7 +178,7 @@ EAPI Eldbus_Pending *eldbus_proxy_vcall(Eldbus_Proxy *proxy, const char *
* @param cb_data data that will be passed to callback
* @return A listener to the desired signal.
*/
EAPI Eldbus_Signal_Handler *eldbus_proxy_signal_handler_add(Eldbus_Proxy *proxy, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
ELDBUS_API Eldbus_Signal_Handler *eldbus_proxy_signal_handler_add(Eldbus_Proxy *proxy, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
/**
* @typedef Eldbus_Proxy_Event_Type
@ -247,7 +247,7 @@ typedef void (*Eldbus_Proxy_Event_Cb)(void *data, Eldbus_Proxy *proxy, void *eve
* @param cb The callback function to register.
* @param cb_data The data to pass to the callback.
*/
EAPI void eldbus_proxy_event_callback_add(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
ELDBUS_API void eldbus_proxy_event_callback_add(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
/**
* @brief Remove callback registered in eldbus_proxy_event_callback_add().
@ -257,7 +257,7 @@ EAPI void eldbus_proxy_event_callback_add(Eldbus_Proxy *proxy, Eldbus_Proxy_Even
* @param cb The callback function to delete.
* @param cb_data The data passed to the callback.
*/
EAPI void eldbus_proxy_event_callback_del(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
ELDBUS_API void eldbus_proxy_event_callback_del(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
/**
* @}

View File

@ -994,25 +994,25 @@ fail:
return NULL;
}
EAPI Eldbus_Service_Interface *
ELDBUS_API Eldbus_Service_Interface *
eldbus_service_interface_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc)
{
return _eldbus_service_interface_register(conn, path, desc, EINA_FALSE, 1u);
}
EAPI Eldbus_Service_Interface *
ELDBUS_API Eldbus_Service_Interface *
eldbus_service_interface_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc)
{
return _eldbus_service_interface_register(conn, path, &desc->description, EINA_FALSE, desc->version);
}
EAPI Eldbus_Service_Interface *
ELDBUS_API Eldbus_Service_Interface *
eldbus_service_interface_fallback_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc)
{
return _eldbus_service_interface_register(conn, path, desc, EINA_TRUE, 1u);
}
EAPI Eldbus_Service_Interface *
ELDBUS_API Eldbus_Service_Interface *
eldbus_service_interface_fallback_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc)
{
return _eldbus_service_interface_register(conn, path, &desc->description, EINA_TRUE, desc->version);
@ -1273,7 +1273,7 @@ _on_connection_free(void *data, const void *dead_pointer EINA_UNUSED)
dbus_connection_unregister_object_path(obj->conn->dbus_conn, obj->path);
}
EAPI void
ELDBUS_API void
eldbus_service_interface_unregister(Eldbus_Service_Interface *iface)
{
Eldbus_Service_Object *obj;
@ -1284,7 +1284,7 @@ eldbus_service_interface_unregister(Eldbus_Service_Interface *iface)
obj->introspection_dirty = EINA_TRUE;
}
EAPI void
ELDBUS_API void
eldbus_service_object_unregister(Eldbus_Service_Interface *iface)
{
ELDBUS_SERVICE_INTERFACE_CHECK(iface);
@ -1384,21 +1384,21 @@ _object_handler(DBusConnection *dbus_conn EINA_UNUSED, DBusMessage *msg, void *u
return DBUS_HANDLER_RESULT_HANDLED;
}
EAPI Eldbus_Connection *
ELDBUS_API Eldbus_Connection *
eldbus_service_connection_get(const Eldbus_Service_Interface *iface)
{
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, NULL);
return iface->obj->conn;
}
EAPI const char *
ELDBUS_API const char *
eldbus_service_object_path_get(const Eldbus_Service_Interface *iface)
{
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, NULL);
return iface->obj->path;
}
EAPI Eldbus_Message *
ELDBUS_API Eldbus_Message *
eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int signal_id)
{
unsigned size;
@ -1410,7 +1410,7 @@ eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int si
iface->signals[signal_id].name);
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, unsigned int signal_id, ...)
{
Eldbus_Message *sig;
@ -1440,7 +1440,7 @@ eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, unsigned int s
return EINA_TRUE;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_service_signal_send(const Eldbus_Service_Interface *iface, Eldbus_Message *signal_msg)
{
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, EINA_FALSE);
@ -1449,7 +1449,7 @@ eldbus_service_signal_send(const Eldbus_Service_Interface *iface, Eldbus_Message
return EINA_TRUE;
}
EAPI void
ELDBUS_API void
eldbus_service_object_data_set(Eldbus_Service_Interface *iface, const char *key, const void *data)
{
ELDBUS_SERVICE_INTERFACE_CHECK(iface);
@ -1458,7 +1458,7 @@ eldbus_service_object_data_set(Eldbus_Service_Interface *iface, const char *key,
eldbus_data_set(&(iface->obj->data), key, data);
}
EAPI void *
ELDBUS_API void *
eldbus_service_object_data_get(const Eldbus_Service_Interface *iface, const char *key)
{
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, NULL);
@ -1466,7 +1466,7 @@ eldbus_service_object_data_get(const Eldbus_Service_Interface *iface, const char
return eldbus_data_get(&(((Eldbus_Service_Object *)iface->obj)->data), key);
}
EAPI void *
ELDBUS_API void *
eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const char *key)
{
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, NULL);
@ -1474,7 +1474,7 @@ eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const char *key)
return eldbus_data_del(&(((Eldbus_Service_Object *)iface->obj)->data), key);
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_service_property_changed(const Eldbus_Service_Interface *interface, const char *name)
{
Property *prop;
@ -1493,7 +1493,7 @@ eldbus_service_property_changed(const Eldbus_Service_Interface *interface, const
return eina_array_push(iface->props_changed, prop);
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_service_property_invalidate_set(const Eldbus_Service_Interface *interface, const char *name, Eina_Bool is_invalidate)
{
Property *prop;
@ -1525,7 +1525,7 @@ eldbus_service_property_invalidate_set(const Eldbus_Service_Interface *interface
return eina_array_push(iface->prop_invalidated, prop);
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_service_object_manager_attach(Eldbus_Service_Interface *iface)
{
Eldbus_Service_Object *obj;
@ -1558,7 +1558,7 @@ eldbus_service_object_manager_attach(Eldbus_Service_Interface *iface)
return EINA_TRUE;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_service_object_manager_detach(Eldbus_Service_Interface *iface)
{
Eldbus_Service_Object *obj, *children;

View File

@ -125,7 +125,7 @@ typedef struct _Eldbus_Service_Interface_Desc2
*
* @return Interface
*/
EAPI Eldbus_Service_Interface *eldbus_service_interface_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API Eldbus_Service_Interface *eldbus_service_interface_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc) EINA_ARG_NONNULL(1, 2, 3);
/**
* @brief Register a fallback interface handler for a given subsection of the object hierarchy.
@ -139,7 +139,7 @@ EAPI Eldbus_Service_Interface *eldbus_service_interface_register(Eldbus_Connecti
*
* @return Interface
*/
EAPI Eldbus_Service_Interface *
ELDBUS_API Eldbus_Service_Interface *
eldbus_service_interface_fallback_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc) EINA_ARG_NONNULL(1, 2, 3);
/**
@ -156,7 +156,7 @@ eldbus_service_interface_fallback_register(Eldbus_Connection *conn, const char *
*
* @return Interface
*/
EAPI Eldbus_Service_Interface *eldbus_service_interface_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API Eldbus_Service_Interface *eldbus_service_interface_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc) EINA_ARG_NONNULL(1, 2, 3);
/**
* @brief Register a fallback interface handler for a given subsection
@ -174,7 +174,7 @@ EAPI Eldbus_Service_Interface *eldbus_service_interface_register2(Eldbus_Connect
*
* @return Interface
*/
EAPI Eldbus_Service_Interface *
ELDBUS_API Eldbus_Service_Interface *
eldbus_service_interface_fallback_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc) EINA_ARG_NONNULL(1, 2, 3);
@ -185,7 +185,7 @@ eldbus_service_interface_fallback_register2(Eldbus_Connection *conn, const char
*
* @param iface interface to unregister
*/
EAPI void eldbus_service_interface_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
ELDBUS_API void eldbus_service_interface_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
/**
* @brief Unregister all interfaces of the object path that this interface belongs
@ -193,9 +193,9 @@ EAPI void eldbus_service_interface_unregister(Eldbus_Service_Interface *iface) E
*
* @param iface interface to unregister
*/
EAPI void eldbus_service_object_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
EAPI Eldbus_Connection *eldbus_service_connection_get(const Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
EAPI const char *eldbus_service_object_path_get(const Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API void eldbus_service_object_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Connection *eldbus_service_connection_get(const Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_service_object_path_get(const Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Emit a signal handler of the interface with non-complex types.
@ -208,7 +208,7 @@ EAPI const char *eldbus_service_object_path_get(const Eldbus_Service_Interface *
*
* @return EINA_TRUE if success
*/
EAPI Eina_Bool eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, unsigned int signal_id, ...) EINA_ARG_NONNULL(1);
ELDBUS_API Eina_Bool eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, unsigned int signal_id, ...) EINA_ARG_NONNULL(1);
/**
* @brief Create signal message.
@ -221,7 +221,7 @@ EAPI Eina_Bool eldbus_service_signal_emit(const Eldbus_Service_Interface *iface,
*
* @return EINA_TRUE if success
*/
EAPI Eldbus_Message *eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int signal_id) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Message *eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int signal_id) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @brief Send a signal message.
@ -235,7 +235,7 @@ EAPI Eldbus_Message *eldbus_service_signal_new(const Eldbus_Service_Interface *i
*
* @return EINA_TRUE if success
*/
EAPI Eina_Bool eldbus_service_signal_send(const Eldbus_Service_Interface *iface, Eldbus_Message *signal_msg) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Bool eldbus_service_signal_send(const Eldbus_Service_Interface *iface, Eldbus_Message *signal_msg) EINA_ARG_NONNULL(1, 2);
/**
* @brief Store data at object path, this data can be obtained from all interfaces
@ -246,7 +246,7 @@ EAPI Eina_Bool eldbus_service_signal_send(const Eldbus_Service_Interface *iface,
* @param key to identify data
* @param data
*/
EAPI void eldbus_service_object_data_set(Eldbus_Service_Interface *iface, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
ELDBUS_API void eldbus_service_object_data_set(Eldbus_Service_Interface *iface, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
/**
* @brief Get data stored in object path.
@ -256,7 +256,7 @@ EAPI void eldbus_service_object_data_set(Eldbus_Service_Interface *iface, const
*
* @return pointer to data if found otherwise NULL
*/
EAPI void *eldbus_service_object_data_get(const Eldbus_Service_Interface *iface, const char *key) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
ELDBUS_API void *eldbus_service_object_data_get(const Eldbus_Service_Interface *iface, const char *key) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
/**
* @brief Del data stored in object path.
@ -266,7 +266,7 @@ EAPI void *eldbus_service_object_data_get(const Eldbus_Service_Interface *iface,
*
* @return pointer to data if found otherwise NULL
*/
EAPI void *eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const char *key) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void *eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const char *key) EINA_ARG_NONNULL(1, 2);
/**
* @brief Add property to list of changed properties
@ -278,9 +278,9 @@ EAPI void *eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const
*
* @return EINA_TRUE if success
*/
EAPI Eina_Bool eldbus_service_property_changed(const Eldbus_Service_Interface *iface, const char *name) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Bool eldbus_service_property_changed(const Eldbus_Service_Interface *iface, const char *name) EINA_ARG_NONNULL(1, 2);
EAPI Eina_Bool eldbus_service_property_invalidate_set(const Eldbus_Service_Interface *iface, const char *name, Eina_Bool is_invalidate) EINA_ARG_NONNULL(1, 2);
ELDBUS_API Eina_Bool eldbus_service_property_invalidate_set(const Eldbus_Service_Interface *iface, const char *name, Eina_Bool is_invalidate) EINA_ARG_NONNULL(1, 2);
/**
* Attach ObjectManager interface.
@ -288,7 +288,7 @@ EAPI Eina_Bool eldbus_service_property_invalidate_set(const Eldbus_Service_Inter
* @param iface ObjectManager will be attach in object path of this interface.
* @return EINA_TRUE if success
*/
EAPI Eina_Bool eldbus_service_object_manager_attach(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
ELDBUS_API Eina_Bool eldbus_service_object_manager_attach(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
/**
* Detach ObjectManager interface.
@ -296,7 +296,7 @@ EAPI Eina_Bool eldbus_service_object_manager_attach(Eldbus_Service_Interface *if
* @param iface ObjectManager of object path of this interface will be detach.
* @return EINA_TRUE if success
*/
EAPI Eina_Bool eldbus_service_object_manager_detach(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
ELDBUS_API Eina_Bool eldbus_service_object_manager_detach(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
/**
* @}

View File

@ -68,7 +68,7 @@ _sort_arg(const void *d1, const void *d2)
}
#define ARGX "arg"
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_signal_handler_match_extra_vset(Eldbus_Signal_Handler *sh, va_list ap)
{
const char *key = NULL, *read;
@ -120,7 +120,7 @@ error:
return EINA_FALSE;
}
EAPI Eina_Bool
ELDBUS_API Eina_Bool
eldbus_signal_handler_match_extra_set(Eldbus_Signal_Handler *sh, ...)
{
Eina_Bool ret;
@ -149,7 +149,7 @@ _on_handler_of_conn_free(void *data, const void *dead_pointer)
eldbus_connection_free_cb_del(conn, _on_connection_free, dead_pointer);
}
EAPI Eldbus_Signal_Handler *
ELDBUS_API Eldbus_Signal_Handler *
eldbus_signal_handler_add(Eldbus_Connection *conn, const char *sender, const char *path, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data)
{
Eldbus_Signal_Handler *sh;
@ -258,7 +258,7 @@ _eldbus_signal_handler_del(Eldbus_Signal_Handler *handler)
free(handler);
}
EAPI Eldbus_Signal_Handler *
ELDBUS_API Eldbus_Signal_Handler *
eldbus_signal_handler_ref(Eldbus_Signal_Handler *handler)
{
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
@ -268,7 +268,7 @@ eldbus_signal_handler_ref(Eldbus_Signal_Handler *handler)
return handler;
}
EAPI void
ELDBUS_API void
eldbus_signal_handler_unref(Eldbus_Signal_Handler *handler)
{
ELDBUS_SIGNAL_HANDLER_CHECK(handler);
@ -281,7 +281,7 @@ eldbus_signal_handler_unref(Eldbus_Signal_Handler *handler)
_eldbus_signal_handler_del(handler);
}
EAPI void
ELDBUS_API void
eldbus_signal_handler_del(Eldbus_Signal_Handler *handler)
{
ELDBUS_SIGNAL_HANDLER_CHECK(handler);
@ -289,7 +289,7 @@ eldbus_signal_handler_del(Eldbus_Signal_Handler *handler)
eldbus_signal_handler_unref(handler);
}
EAPI void
ELDBUS_API void
eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_SIGNAL_HANDLER_CHECK(handler);
@ -297,7 +297,7 @@ eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb
handler->cbs_free = eldbus_cbs_free_add(handler->cbs_free, cb, data);
}
EAPI void
ELDBUS_API void
eldbus_signal_handler_free_cb_del(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data)
{
ELDBUS_SIGNAL_HANDLER_CHECK(handler);
@ -305,42 +305,42 @@ eldbus_signal_handler_free_cb_del(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb
handler->cbs_free = eldbus_cbs_free_del(handler->cbs_free, cb, data);
}
EAPI const char *
ELDBUS_API const char *
eldbus_signal_handler_sender_get(const Eldbus_Signal_Handler *handler)
{
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
return handler->sender;
}
EAPI const char *
ELDBUS_API const char *
eldbus_signal_handler_path_get(const Eldbus_Signal_Handler *handler)
{
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
return handler->path;
}
EAPI const char *
ELDBUS_API const char *
eldbus_signal_handler_interface_get(const Eldbus_Signal_Handler *handler)
{
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
return handler->interface;
}
EAPI const char *
ELDBUS_API const char *
eldbus_signal_handler_member_get(const Eldbus_Signal_Handler *handler)
{
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
return handler->member;
}
EAPI const char *
ELDBUS_API const char *
eldbus_signal_handler_match_get(const Eldbus_Signal_Handler *handler)
{
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
return eina_strbuf_string_get(handler->match);
}
EAPI Eldbus_Connection *
ELDBUS_API Eldbus_Connection *
eldbus_signal_handler_connection_get(const Eldbus_Signal_Handler *handler)
{
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);

View File

@ -21,7 +21,7 @@
*
* @return signal handler
*/
EAPI Eldbus_Signal_Handler *eldbus_signal_handler_add(Eldbus_Connection *conn, const char *sender, const char *path, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 6);
ELDBUS_API Eldbus_Signal_Handler *eldbus_signal_handler_add(Eldbus_Connection *conn, const char *sender, const char *path, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 6);
/**
* @brief Increase signal handler reference.
@ -30,7 +30,7 @@ EAPI Eldbus_Signal_Handler *eldbus_signal_handler_add(Eldbus_Connection *conn, c
*
* @return the same signal handler, @p handler
*/
EAPI Eldbus_Signal_Handler *eldbus_signal_handler_ref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
ELDBUS_API Eldbus_Signal_Handler *eldbus_signal_handler_ref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
/**
* @brief Decrease signal handler reference.
@ -38,7 +38,7 @@ EAPI Eldbus_Signal_Handler *eldbus_signal_handler_ref(Eldbus_Signal_Handler *han
*
* @param handler signal handler
*/
EAPI void eldbus_signal_handler_unref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
ELDBUS_API void eldbus_signal_handler_unref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
/**
* @brief Decrease signal handler reference like eldbus_signal_handler_unref()
@ -47,7 +47,7 @@ EAPI void eldbus_signal_handler_unref(Eldbus_Signal_Handler *ha
*
* @param handler signal handler to delete
*/
EAPI void eldbus_signal_handler_del(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
ELDBUS_API void eldbus_signal_handler_del(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
/**
* @brief Add extra argument in match of signal handler to obtain specifics signals.
@ -67,7 +67,7 @@ EAPI void eldbus_signal_handler_del(Eldbus_Signal_Handler *hand
* @note For more information:
* http://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing-match-rules
*/
EAPI Eina_Bool eldbus_signal_handler_match_extra_set(Eldbus_Signal_Handler *sh, ...) EINA_ARG_NONNULL(1) EINA_SENTINEL;
ELDBUS_API Eina_Bool eldbus_signal_handler_match_extra_set(Eldbus_Signal_Handler *sh, ...) EINA_ARG_NONNULL(1) EINA_SENTINEL;
/**
* @brief Add extra argument in match of signal handler to obtain specifics signals.
@ -87,7 +87,7 @@ EAPI Eina_Bool eldbus_signal_handler_match_extra_set(Eldbus_Signal_H
* @note To information:
* http://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing-match-rules
*/
EAPI Eina_Bool eldbus_signal_handler_match_extra_vset(Eldbus_Signal_Handler *sh, va_list ap) EINA_ARG_NONNULL(1);
ELDBUS_API Eina_Bool eldbus_signal_handler_match_extra_vset(Eldbus_Signal_Handler *sh, va_list ap) EINA_ARG_NONNULL(1);
/**
* @brief Add a callback function to be called when signal handler will be freed.
@ -96,7 +96,7 @@ EAPI Eina_Bool eldbus_signal_handler_match_extra_vset(Eldbus_Signal_
* @param cb callback that will be called when this signal handler is freed
* @param data data that will be passed to callback
*/
EAPI void eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
/**
* @brief Remove callback registered in eldbus_signal_handler_free_cb_add().
@ -105,15 +105,15 @@ EAPI void eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handl
* @param cb registered callback to remove
* @param data data that will be passed to callback
*/
EAPI void eldbus_signal_handler_free_cb_del(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
ELDBUS_API void eldbus_signal_handler_free_cb_del(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
EAPI const char *eldbus_signal_handler_sender_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
EAPI const char *eldbus_signal_handler_path_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
EAPI const char *eldbus_signal_handler_interface_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
EAPI const char *eldbus_signal_handler_member_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
EAPI const char *eldbus_signal_handler_match_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_signal_handler_sender_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_signal_handler_path_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_signal_handler_interface_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_signal_handler_member_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API const char *eldbus_signal_handler_match_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
EAPI Eldbus_Connection *eldbus_signal_handler_connection_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
ELDBUS_API Eldbus_Connection *eldbus_signal_handler_connection_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
/**
* @}

View File

@ -23,6 +23,7 @@ foreach eo_file : pub_eo_files
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
'-e', 'ELDBUS_API',
'-gchd', '@INPUT@'])
endforeach
@ -41,6 +42,7 @@ foreach eo_file : pub_eo_types_files
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
'-e', 'ELDBUS_API',
'-ghd', '@INPUT@'])
endforeach
@ -48,6 +50,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
eldbus_header_src = [
'Eldbus.h',
'eldbus_api.h',
'eldbus_connection.h',
'eldbus_freedesktop.h',
'eldbus_message.h',
@ -97,7 +100,7 @@ eldbus_ext_deps += dependency('dbus-1')
eldbus_lib = library('eldbus',
eldbus_src, pub_eo_file_target,
c_args : package_c_args,
c_args : [package_c_args, '-DELDBUS_BUILD'],
dependencies: eldbus_pub_deps + eldbus_deps + eldbus_ext_deps,
include_directories : config_dir,
install: true,