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

unify more event handling, fix a little formatting 

SVN revision: 61025
This commit is contained in:
Mike Blumenkrantz 2011-07-05 00:06:27 +00:00
parent a90ffde10c
commit 58d3ee0924
4 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/ecore/src/lib/ecore_con/ecore_con.c
View File

@ -479,15 +479,11 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
(type == ECORE_CON_LOCAL_ABSTRACT)) (type == ECORE_CON_LOCAL_ABSTRACT))
/* Local */ /* Local */
#ifdef _WIN32 #ifdef _WIN32
if (!ecore_con_local_connect(svr, _ecore_con_cl_handler, if (!ecore_con_local_connect(svr, _ecore_con_cl_handler))
_ecore_con_event_server_add_free)) goto error;
goto
error;
#else #else
if (!ecore_con_local_connect(svr, _ecore_con_cl_handler, svr, if (!ecore_con_local_connect(svr, _ecore_con_cl_handler, svr))
_ecore_con_event_server_add_free)) goto error;
goto
error;
#endif #endif
if ((type == ECORE_CON_REMOTE_TCP) || if ((type == ECORE_CON_REMOTE_TCP) ||

24
legacy/ecore/src/lib/ecore_con/ecore_con_local.c
View File

@ -55,12 +55,9 @@ ecore_con_local_shutdown(void)
} }
int int
ecore_con_local_connect(Ecore_Con_Server *svr, ecore_con_local_connect(Ecore_Con_Server *svr,
Eina_Bool (*cb_done)(void *data, Eina_Bool (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler),
Ecore_Fd_Handler *fd_handler), void *data __UNUSED__)
void *data __UNUSED__,
void (*cb_free)(void *data,
void *ev))
{ {
char buf[4096]; char buf[4096];
struct sockaddr_un socket_unix; struct sockaddr_un socket_unix;
@ -158,20 +155,7 @@ ecore_con_local_connect(Ecore_Con_Server
if (!svr->fd_handler) if (!svr->fd_handler)
return 0; return 0;
if (!svr->delete_me) if (!svr->delete_me) ecore_con_event_server_add(svr);
{
/* we got our server! */
Ecore_Con_Event_Server_Add *e;
e = calloc(1, sizeof(Ecore_Con_Event_Server_Add));
if (e)
{
svr->event_count++;
e->server = svr;
ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e,
cb_free, NULL);
}
}
return 1; return 1;
} }

17
legacy/ecore/src/lib/ecore_con/ecore_con_local_win32.c
View File

@ -551,8 +551,7 @@ ecore_con_local_win32_client_del(Ecore_Con_Client *cl)
Eina_Bool Eina_Bool
ecore_con_local_connect(Ecore_Con_Server *svr, ecore_con_local_connect(Ecore_Con_Server *svr,
Eina_Bool (*cb_done)(void *data, Eina_Bool (*cb_done)(void *data,
Ecore_Fd_Handler *fd_handler), Ecore_Fd_Handler *fd_handler))
void (*cb_free)(void *data, void *ev))
{ {
char buf[256]; char buf[256];
Ecore_Win32_Handler *handler_read; Ecore_Win32_Handler *handler_read;
@ -647,19 +646,7 @@ ecore_con_local_connect(Ecore_Con_Server *svr,
goto del_handler_peek; goto del_handler_peek;
} }
if (!svr->delete_me) if (!svr->delete_me) ecore_con_event_server_add(svr);
{
Ecore_Con_Event_Server_Add *e;
e = calloc(1, sizeof(Ecore_Con_Event_Server_Add));
if (e)
{
svr->event_count++;
e->server = svr;
ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e,
cb_free, NULL);
}
}
ResumeThread(svr->thread_read); ResumeThread(svr->thread_read);

10
legacy/ecore/src/lib/ecore_con/ecore_con_private.h
View File

@ -229,8 +229,7 @@ void ecore_con_event_client_error(Ecore_Con_Client *cl, const char *error);
Eina_Bool ecore_con_local_listen(Ecore_Con_Server *svr); Eina_Bool ecore_con_local_listen(Ecore_Con_Server *svr);
Eina_Bool ecore_con_local_connect(Ecore_Con_Server *svr, Eina_Bool ecore_con_local_connect(Ecore_Con_Server *svr,
Eina_Bool (*cb_done)(void *data, Eina_Bool (*cb_done)(void *data,
Ecore_Fd_Handler *fd_handler), Ecore_Fd_Handler *fd_handler));
void (*cb_free)(void *data, void *ev));
Eina_Bool ecore_con_local_win32_server_flush(Ecore_Con_Server *svr); Eina_Bool ecore_con_local_win32_server_flush(Ecore_Con_Server *svr);
Eina_Bool ecore_con_local_win32_client_flush(Ecore_Con_Client *cl); Eina_Bool ecore_con_local_win32_client_flush(Ecore_Con_Client *cl);
void ecore_con_local_win32_server_del(Ecore_Con_Server *svr); void ecore_con_local_win32_server_del(Ecore_Con_Server *svr);
@ -243,9 +242,7 @@ int ecore_con_local_connect(Ecore_Con_Server *svr,
Eina_Bool (*cb_done)( Eina_Bool (*cb_done)(
void *data, void *data,
Ecore_Fd_Handler *fd_handler), Ecore_Fd_Handler *fd_handler),
void *data, void *data);
void (*cb_free)(
void *data, void *ev));
int ecore_con_local_listen(Ecore_Con_Server *svr, int ecore_con_local_listen(Ecore_Con_Server *svr,
Eina_Bool (*cb_listen)( Eina_Bool (*cb_listen)(
void *data, void *data,
@ -273,6 +270,9 @@ int ecore_con_info_mcast_listen(Ecore_Con_Server *svr,
void *data); void *data);
void ecore_con_info_data_clear(void *info); void ecore_con_info_data_clear(void *info);
void ecore_con_event_server_add(Ecore_Con_Server *svr);
/* from ecore_con_ssl.c */ /* from ecore_con_ssl.c */
Ecore_Con_Ssl_Error ecore_con_ssl_init(void); Ecore_Con_Ssl_Error ecore_con_ssl_init(void);
Ecore_Con_Ssl_Error ecore_con_ssl_shutdown(void); Ecore_Con_Ssl_Error ecore_con_ssl_shutdown(void);