forked from enlightenment/efl
split ecore_con_dns free functions into one that removes from list and one that does the freeing
This commit is contained in:
parent
ce48dd9927
commit
0c34c3d940
|
@ -47,7 +47,6 @@ static dns_hosts *hosts = NULL;
|
||||||
static void
|
static void
|
||||||
_ecore_con_dns_free(Ecore_Con_DNS *dns)
|
_ecore_con_dns_free(Ecore_Con_DNS *dns)
|
||||||
{
|
{
|
||||||
if (dns->svr->infos) dns->svr->infos = eina_list_remove(dns->svr->infos, dns);
|
|
||||||
if (dns->timer) ecore_timer_del(dns->timer);
|
if (dns->timer) ecore_timer_del(dns->timer);
|
||||||
if (dns->fdh) ecore_main_fd_handler_del(dns->fdh);
|
if (dns->fdh) ecore_main_fd_handler_del(dns->fdh);
|
||||||
if (dns->ai) dns_ai_close(dns->ai);
|
if (dns->ai) dns_ai_close(dns->ai);
|
||||||
|
@ -55,6 +54,13 @@ _ecore_con_dns_free(Ecore_Con_DNS *dns)
|
||||||
free(dns);
|
free(dns);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_ecore_con_dns_del(Ecore_Con_DNS *dns)
|
||||||
|
{
|
||||||
|
if (dns->svr && dns->svr->infos) dns->svr->infos = eina_list_remove(dns->svr->infos, dns);
|
||||||
|
_ecore_con_dns_free(dns);
|
||||||
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_dns_addrinfo_get(Ecore_Con_DNS *dns, const char *addr, int port)
|
_dns_addrinfo_get(Ecore_Con_DNS *dns, const char *addr, int port)
|
||||||
{
|
{
|
||||||
|
@ -100,13 +106,13 @@ _ecore_con_dns_check(Ecore_Con_DNS *dns)
|
||||||
dns->fdh = NULL;
|
dns->fdh = NULL;
|
||||||
dns->done_cb(dns->data, &result);
|
dns->done_cb(dns->data, &result);
|
||||||
free(ent);
|
free(ent);
|
||||||
_ecore_con_dns_free(dns);
|
_ecore_con_dns_del(dns);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
error:
|
error:
|
||||||
dns->done_cb(dns->data, NULL);
|
dns->done_cb(dns->data, NULL);
|
||||||
_ecore_con_dns_free(dns);
|
_ecore_con_dns_del(dns);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,7 +134,7 @@ static Eina_Bool
|
||||||
_dns_timer_cb(Ecore_Con_DNS *dns)
|
_dns_timer_cb(Ecore_Con_DNS *dns)
|
||||||
{
|
{
|
||||||
dns->done_cb(dns->data, NULL);
|
dns->done_cb(dns->data, NULL);
|
||||||
_ecore_con_dns_free(dns);
|
_ecore_con_dns_del(dns);
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue