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

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:
Mike Blumenkrantz 2010-11-11 20:34:35 +00:00
parent 3552a91b7d
commit cc01698872
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,11 +165,14 @@ ecore_con_init(void)
EAPI int
ecore_con_shutdown(void)
{
Eina_List *l, *l2;
Ecore_Con_Server *svr;
if (--_ecore_con_init_count != 0)
return _ecore_con_init_count;
while (servers)
_ecore_con_server_free(eina_list_data_get(servers));
EINA_LIST_FOREACH_SAFE(servers, l, l2, svr)
_ecore_con_server_free(svr);
ecore_con_info_shutdown();
ecore_con_ssl_shutdown();
@ -1143,7 +1146,6 @@ _ecore_con_server_free(Ecore_Con_Server *svr)
Ecore_Con_Event_Server_Del *e;
svr->dead = EINA_TRUE;
INF("Lost server %s", svr->ip);
e = calloc(1, sizeof(Ecore_Con_Event_Server_Del));
EINA_SAFETY_ON_NULL_RETURN(e);
@ -1214,7 +1216,6 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
Ecore_Con_Event_Client_Del *e;
cl->dead = EINA_TRUE;
INF("Lost client %s", cl->ip);
e = calloc(1, sizeof(Ecore_Con_Event_Client_Del));
EINA_SAFETY_ON_NULL_RETURN(e);