forked from enlightenment/efl
avoid looping infinitely while freeing servers, and don't log while freeing servers in case ecore_con's log domain has already been unregistered
SVN revision: 54479
This commit is contained in:
parent
3552a91b7d
commit
cc01698872
|
@ -165,11 +165,14 @@ ecore_con_init(void)
|
||||||
EAPI int
|
EAPI int
|
||||||
ecore_con_shutdown(void)
|
ecore_con_shutdown(void)
|
||||||
{
|
{
|
||||||
|
Eina_List *l, *l2;
|
||||||
|
Ecore_Con_Server *svr;
|
||||||
|
|
||||||
if (--_ecore_con_init_count != 0)
|
if (--_ecore_con_init_count != 0)
|
||||||
return _ecore_con_init_count;
|
return _ecore_con_init_count;
|
||||||
|
|
||||||
while (servers)
|
EINA_LIST_FOREACH_SAFE(servers, l, l2, svr)
|
||||||
_ecore_con_server_free(eina_list_data_get(servers));
|
_ecore_con_server_free(svr);
|
||||||
|
|
||||||
ecore_con_info_shutdown();
|
ecore_con_info_shutdown();
|
||||||
ecore_con_ssl_shutdown();
|
ecore_con_ssl_shutdown();
|
||||||
|
@ -1143,7 +1146,6 @@ _ecore_con_server_free(Ecore_Con_Server *svr)
|
||||||
Ecore_Con_Event_Server_Del *e;
|
Ecore_Con_Event_Server_Del *e;
|
||||||
|
|
||||||
svr->dead = EINA_TRUE;
|
svr->dead = EINA_TRUE;
|
||||||
INF("Lost server %s", svr->ip);
|
|
||||||
e = calloc(1, sizeof(Ecore_Con_Event_Server_Del));
|
e = calloc(1, sizeof(Ecore_Con_Event_Server_Del));
|
||||||
EINA_SAFETY_ON_NULL_RETURN(e);
|
EINA_SAFETY_ON_NULL_RETURN(e);
|
||||||
|
|
||||||
|
@ -1214,7 +1216,6 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
|
||||||
Ecore_Con_Event_Client_Del *e;
|
Ecore_Con_Event_Client_Del *e;
|
||||||
|
|
||||||
cl->dead = EINA_TRUE;
|
cl->dead = EINA_TRUE;
|
||||||
INF("Lost client %s", cl->ip);
|
|
||||||
e = calloc(1, sizeof(Ecore_Con_Event_Client_Del));
|
e = calloc(1, sizeof(Ecore_Con_Event_Client_Del));
|
||||||
EINA_SAFETY_ON_NULL_RETURN(e);
|
EINA_SAFETY_ON_NULL_RETURN(e);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue