aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2015-11-01 21:57:43 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2015-11-01 21:57:43 -0200
commitfa88a2337f4c1ed74dbe5f8e9b8ab9e80aa94215 (patch)
tree289d1f0e30abe7aeb9100ab9ed3e3a755d1c18b7 /src/lib/ecore_con
parentEo do: use the __thread directive when available to manage call stack. (diff)
downloadefl-fa88a2337f4c1ed74dbe5f8e9b8ab9e80aa94215.tar.gz
Eo: Partial implementation to remove eo_dodevs/felipealmeida/eo_optimisations
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con.c88
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c38
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c4
-rw-r--r--src/lib/ecore_con/ecore_con_local_win32.c3
-rw-r--r--src/lib/ecore_con/ecore_con_url.c20
5 files changed, 77 insertions, 76 deletions
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 1582c26a2c..b407de84d2 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -109,7 +109,7 @@ static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
Eina_Bool finalized; \
- if (eo_do_ret(obj, finalized, eo_finalized_get())) \
+ if (eo_do_ret(obj, finalized, eo_finalized_get(obj))) \
{ \
ERR("This function is only allowed during construction."); \
return; \
@@ -306,10 +306,10 @@ _ecore_con_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char
if (!name || !done_cb)
return EINA_FALSE;
- obj = eo_add(ECORE_CON_CONNECTOR_CLASS, NULL,
- ecore_con_server_obj_connection_type_set(ECORE_CON_REMOTE_TCP),
- ecore_con_server_obj_name_set(name),
- ecore_con_obj_port_set(1025));
+ eo_add(obj, ECORE_CON_CONNECTOR_CLASS, NULL,
+ ecore_con_server_obj_connection_type_set(NULL, ECORE_CON_REMOTE_TCP),
+ ecore_con_server_obj_name_set(NULL, name),
+ ecore_con_obj_port_set(NULL, 1025));
lk = malloc(sizeof (Ecore_Con_Lookup));
if (!lk)
@@ -363,10 +363,10 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
/* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
/* remote system socket: TCP/IP: [name]:[port] */
- obj = eo_add(ECORE_CON_SERVER_CLASS, NULL,
- ecore_con_server_obj_connection_type_set(compl_type),
- ecore_con_server_obj_name_set(name),
- ecore_con_obj_port_set(port));
+ eo_add(obj, ECORE_CON_SERVER_CLASS, NULL,
+ ecore_con_server_obj_connection_type_set(NULL, compl_type),
+ ecore_con_server_obj_name_set(NULL, name),
+ ecore_con_obj_port_set(NULL, port));
ecore_con_server_data_set(obj, (void *) data);
@@ -376,7 +376,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
EOLIAN static Eo *
_ecore_con_server_eo_base_constructor(Ecore_Con_Server *obj, Ecore_Con_Server_Data *svr)
{
- obj = eo_do_super_ret(obj, ECORE_CON_SERVER_CLASS, obj, eo_constructor());
+ eo_super_eo_constructor(ECORE_CON_SERVER_CLASS, obj);
svr->fd = -1;
svr->reject_excess_clients = EINA_FALSE;
@@ -392,7 +392,7 @@ _ecore_con_server_eo_base_finalize(Ecore_Con_Server *obj, Ecore_Con_Server_Data
Ecore_Con_Type compl_type = svr->type;
Ecore_Con_Type type;
- eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_finalize());
+ eo_super_eo_finalize(ECORE_CON_SERVER_CLASS, obj);
svr->created = EINA_TRUE;
svr->ppid = getpid();
@@ -462,10 +462,10 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
/* local user socket: FILE: ~/.ecore/[name]/[port] */
/* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
/* remote system socket: TCP/IP: [name]:[port] */
- obj = eo_add(ECORE_CON_CONNECTOR_CLASS, NULL,
- ecore_con_server_obj_connection_type_set(compl_type),
- ecore_con_server_obj_name_set(name),
- ecore_con_obj_port_set(port));
+ eo_add(obj, ECORE_CON_CONNECTOR_CLASS, NULL,
+ ecore_con_server_obj_connection_type_set(NULL, compl_type),
+ ecore_con_server_obj_name_set(NULL, name),
+ ecore_con_obj_port_set(NULL, port));
ecore_con_server_data_set(obj, (void *) data);
@@ -481,7 +481,7 @@ _ecore_con_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSE
/* XXX: We intentionally put SERVER class here and not connector, as we'd
* like to skip that one. */
- eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_finalize());
+ eo_super_eo_finalize(ECORE_CON_SERVER_CLASS, obj);
svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT;
svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY;
@@ -548,7 +548,7 @@ error:
EAPI void
ecore_con_server_timeout_set(Ecore_Con *obj, double timeout)
{
- eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(timeout));
+ eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(obj, timeout));
}
EOLIAN static void
@@ -566,7 +566,7 @@ EAPI double
ecore_con_server_timeout_get(const Ecore_Con *obj)
{
double ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get(obj));
}
EOLIAN static double
@@ -620,7 +620,7 @@ EAPI Eina_Bool
ecore_con_server_connected_get(const Ecore_Con *obj)
{
Eina_Bool ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get(obj));
}
EOLIAN static Eina_Bool
@@ -670,7 +670,7 @@ EAPI int
ecore_con_server_port_get(const Ecore_Con *obj)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get(obj));
}
EOLIAN static void
@@ -691,7 +691,7 @@ EAPI int
ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(obj, data, size));
}
EOLIAN static int
@@ -748,7 +748,7 @@ EAPI const char *
ecore_con_server_ip_get(const Ecore_Con *obj)
{
const char *ret;
- return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
+ return eo_do_ret(obj, ret, ecore_con_obj_ip_get(obj));
}
EOLIAN static const char *
@@ -761,7 +761,7 @@ EAPI double
ecore_con_server_uptime_get(const Ecore_Con *obj)
{
double ret;
- return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
+ return eo_do_ret(obj, ret, ecore_con_obj_uptime_get(obj));
}
EOLIAN static double
@@ -773,7 +773,7 @@ _ecore_con_server_ecore_con_base_uptime_get(Eo *obj EINA_UNUSED, Ecore_Con_Serve
EAPI void
ecore_con_server_flush(Ecore_Con *obj)
{
- eo_do((Ecore_Con *)obj, ecore_con_obj_flush());
+ eo_do((Ecore_Con *)obj, ecore_con_obj_flush(obj));
}
EOLIAN static void
@@ -803,7 +803,7 @@ EAPI int
ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(obj, data, size));
}
EOLIAN static int
@@ -871,7 +871,7 @@ EAPI Eina_Bool
ecore_con_client_connected_get(const Ecore_Con *obj)
{
Eina_Bool ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get(obj));
}
EOLIAN static void
@@ -885,7 +885,7 @@ _ecore_con_client_ecore_con_base_timeout_set(Eo *obj, Ecore_Con_Client_Data *cl,
EAPI void
ecore_con_client_timeout_set(Ecore_Con *obj, double timeout)
{
- eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(timeout));
+ eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(obj, timeout));
}
EOLIAN static double
@@ -898,7 +898,7 @@ EAPI double
ecore_con_client_timeout_get(const Ecore_Con *obj)
{
double ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get(obj));
}
EAPI void *
@@ -950,7 +950,7 @@ EAPI const char *
ecore_con_client_ip_get(const Ecore_Con *obj)
{
const char *ret;
- return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
+ return eo_do_ret(obj, ret, ecore_con_obj_ip_get(obj));
}
EOLIAN static int
@@ -978,7 +978,7 @@ EAPI int
ecore_con_client_port_get(const Ecore_Con *obj)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get(obj));
}
EOLIAN static double
@@ -991,7 +991,7 @@ EAPI double
ecore_con_client_uptime_get(const Ecore_Con *obj)
{
double ret;
- return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
+ return eo_do_ret(obj, ret, ecore_con_obj_uptime_get(obj));
}
EOLIAN static void
@@ -1003,14 +1003,14 @@ _ecore_con_client_ecore_con_base_flush(Eo *obj, Ecore_Con_Client_Data *cl EINA_U
EAPI void
ecore_con_client_flush(Ecore_Con *obj)
{
- eo_do((Ecore_Con *)obj, ecore_con_obj_flush());
+ eo_do((Ecore_Con *)obj, ecore_con_obj_flush(obj));
}
EAPI int
ecore_con_server_fd_get(const Ecore_Con *obj)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get(obj));
}
EOLIAN static int
@@ -1031,7 +1031,7 @@ EAPI int
ecore_con_client_fd_get(const Ecore_Con *obj)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get(obj));
}
/**
@@ -1077,7 +1077,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
ecore_event_add(ev, e,
_ecore_con_event_server_add_free, NULL);
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
_ecore_con_event_count++;
}
@@ -1156,7 +1156,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
}
_ecore_con_event_count++;
}
@@ -1181,7 +1181,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
ecore_event_add(ev, e,
(Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
_ecore_con_event_count++;
}
@@ -1263,7 +1263,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
}
_ecore_con_event_count++;
}
@@ -1289,7 +1289,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
DBG("%s", error);
svr->event_count = eina_list_append(svr->event_count, e);
ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
_ecore_con_event_count++;
}
@@ -1310,7 +1310,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
cl->event_count = eina_list_append(cl->event_count, e);
host_server->event_count = eina_list_append(host_server->event_count, e);
ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
_ecore_con_event_count++;
}
@@ -1397,7 +1397,7 @@ _ecore_con_server_eo_base_destructor(Eo *obj, Ecore_Con_Server_Data *svr)
servers = eina_list_remove(servers, obj);
svr->data = NULL;
- eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_SERVER_CLASS, obj);
end:
return;
}
@@ -1460,7 +1460,7 @@ _ecore_con_client_eo_base_destructor(Eo *obj, Ecore_Con_Client_Data *cl)
eina_stringshare_del(cl->ip);
cl->data = NULL;
- eo_do_super(obj, ECORE_CON_CLIENT_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_CLIENT_CLASS, obj);
}
static Eina_Bool
@@ -2080,7 +2080,7 @@ _ecore_con_svr_tcp_handler(void *data,
/* a new client */
- obj = eo_add(ECORE_CON_CLIENT_CLASS, NULL);
+ eo_add(obj, ECORE_CON_CLIENT_CLASS, NULL);
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
if (!cl)
{
@@ -2355,7 +2355,7 @@ _ecore_con_svr_udp_handler(void *data,
}
/* Create a new client for use in the client data event */
- obj = eo_add(ECORE_CON_CLIENT_CLASS, NULL);
+ eo_add(obj, ECORE_CON_CLIENT_CLASS, NULL);
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
EINA_SAFETY_ON_NULL_RETURN_VAL(cl, ECORE_CALLBACK_RENEW);
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index c85e287fa2..609cf9fb6d 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -580,7 +580,7 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c
EOLIAN static Eo_Base *
_ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( ECORE_CON_EET_SERVER_OBJ_CLASS, obj);
if (!obj) return NULL;
@@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_D
ecore_event_handler_del(pd->handler_del);
ecore_event_handler_del(pd->handler_data);
- eo_do_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_EET_SERVER_OBJ_CLASS, obj);
}
EOLIAN static Eo_Base *
_ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, obj, eo_constructor());
+ eo_super_eo_constructor(ECORE_CON_EET_CLIENT_OBJ_CLASS, obj);
if (!obj) return NULL;
@@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_D
ecore_event_handler_del(pd->handler_del);
ecore_event_handler_del(pd->handler_data);
- eo_do_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_EET_CLIENT_OBJ_CLASS, obj);
}
EOLIAN static Eo_Base *
_ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
{
- obj = eo_do_super_ret(obj, ECORE_CON_EET_BASE_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor(ECORE_CON_EET_BASE_CLASS, obj);
if (!obj) return NULL;
@@ -675,7 +675,7 @@ _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
EOLIAN static void
_ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
{
- eo_do_super(obj, ECORE_CON_EET_BASE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_EET_BASE_CLASS, obj);
eet_data_descriptor_free(pd->edd);
eet_data_descriptor_free(pd->matching);
@@ -722,8 +722,8 @@ ecore_con_eet_server_new(Ecore_Con_Server *server)
if (!server) return NULL;
- ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL,
- ecore_con_eet_base_server_set(server));
+ eo_add(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS, NULL,
+ ecore_con_eet_base_server_set(NULL, server));
return ece_obj;
}
@@ -735,8 +735,8 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
if (!server) return NULL;
- ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL,
- ecore_con_eet_base_server_set(server));
+ eo_add(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL,
+ ecore_con_eet_base_server_set(NULL, server));
return ece_obj;
}
@@ -750,31 +750,31 @@ ecore_con_eet_server_free(Ecore_Con_Eet *r)
EAPI void
ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd)
{
- eo_do(ece, ecore_con_eet_base_register(name, edd));
+ eo_do(ece, ecore_con_eet_base_register(ece, name, edd));
}
EAPI void
ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data)
{
- eo_do(ece, ecore_con_eet_base_data_callback_set(name, func, data));
+ eo_do(ece, ecore_con_eet_base_data_callback_set(ece, name, func, data));
}
EAPI void
ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name)
{
- eo_do(ece, ecore_con_eet_base_data_callback_del(name));
+ eo_do(ece, ecore_con_eet_base_data_callback_del(ece, name));
}
EAPI void
ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data)
{
- eo_do(ece, ecore_con_eet_base_raw_data_callback_set(name, func, data));
+ eo_do(ece, ecore_con_eet_base_raw_data_callback_set(ece, name, func, data));
}
EAPI void
ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name)
{
- eo_do(ece, ecore_con_eet_base_raw_data_callback_del(name));
+ eo_do(ece, ecore_con_eet_base_raw_data_callback_del(ece, name));
}
EAPI void
@@ -920,7 +920,7 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
EAPI void
ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data)
{
- eo_do(ece,eo_key_data_set(ECORE_CON_EET_DATA_KEY, data));
+ eo_do(ece,eo_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data));
}
EAPI const void *
@@ -928,7 +928,7 @@ ecore_con_eet_data_get(Ecore_Con_Eet *ece)
{
const void *temp;
- return eo_do_ret(ece, temp, eo_key_data_get(ECORE_CON_EET_DATA_KEY));
+ return eo_do_ret(ece, temp, eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY));
}
EAPI Ecore_Con_Eet *
@@ -941,14 +941,14 @@ ecore_con_eet_reply(Ecore_Con_Reply *reply)
EAPI void
ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value)
{
- eo_do(reply->ece, ecore_con_eet_base_send(reply, name, value));
+ eo_do(reply->ece, ecore_con_eet_base_send(reply->ece, reply, name, value));
}
EAPI void
ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length)
{
eo_do(reply->ece,
- ecore_con_eet_base_raw_send(reply, protocol_name, section, value,
+ ecore_con_eet_base_raw_send(reply->ece, reply, protocol_name, section, value,
length));
}
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 0b84b90d45..23340fc8f8 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -5,7 +5,7 @@ EAPI Eina_Bool
ecore_con_url_url_set(Ecore_Con_Url *obj, const char *url)
{
Eina_Bool ret;
- eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_set(url));
+ eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_set(obj, url));
return ret;
}
@@ -13,7 +13,7 @@ EAPI const char *
ecore_con_url_url_get(const Ecore_Con_Url *obj)
{
const char * ret;
- eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_get());
+ eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_get(obj));
return ret;
}
diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 4d0dedbb46..453f016834 100644
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -286,7 +286,8 @@ _ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh)
(svr->client_count >= (unsigned int)svr->client_limit))
return ECORE_CALLBACK_CANCEL;
- Ecore_Con_Client *cl_obj = eo_add(ECORE_CON_CLIENT_CLASS, NULL);
+ Ecore_Con_Client *cl_obj;
+ eo_add(cl_obj, ECORE_CON_CLIENT_CLASS, NULL);
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
if (!cl)
{
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index d40fdc5bd6..e257f6c8d7 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -225,11 +225,11 @@ EAPI Ecore_Con_Url *
ecore_con_url_new(const char *url)
{
Ecore_Con_Url *url_obj;
- url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL,
- efl_network_url_set(url));
+ eo_add(url_obj, EFL_NETWORK_URL_CLASS, NULL,
+ efl_network_url_set(NULL, url));
eo_do(url_obj,
- eo_event_callback_array_add(efl_network_url_event_table_callbacks(),
+ eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(),
NULL));
return url_obj;
@@ -238,7 +238,7 @@ ecore_con_url_new(const char *url)
EOLIAN static Eo *
_efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
{
- url_obj = eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_constructor());
+ url_obj = eo_super_eo_constructor( MY_CLASS, url_obj);
if (!_init_count || !_c_init())
{
@@ -338,7 +338,7 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data
*/
_c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
_c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1);
- return eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_finalize());
+ return eo_super_eo_finalize( MY_CLASS, url_obj);
}
EAPI Ecore_Con_Url *
@@ -376,7 +376,7 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
return;
eo_do(url_obj,
- eo_event_callback_array_del(efl_network_url_event_table_callbacks(),
+ eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(),
NULL));
eo_del(url_obj);
@@ -400,7 +400,7 @@ _ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
EOLIAN static void
_efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
{
- eo_do_super(url_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, url_obj);
if (!_c) return;
if (url_con->curl_easy)
@@ -1145,7 +1145,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
e.status = status;
e.url_con = url_obj;
url_con->event_count++;
- eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_COMPLETE, &e));
+ eo_do(url_obj, eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e));
}
static void
@@ -1206,7 +1206,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
e.size = real_size;
e.data = buffer;
url_con->event_count++;
- eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_DATA, &e));
+ eo_do(url_obj, eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e));
}
else
{
@@ -1265,7 +1265,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
e.up.total = ultotal;
e.up.now = ulnow;
url_con->event_count++;
- eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_PROGRESS, &e));
+ eo_do(url_obj, eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e));
return 0;
}