forked from enlightenment/efl
* ecore_con_info: Fix typo preventing dns resolution,
fix error handling and use eina in one more place. SVN revision: 39265
This commit is contained in:
parent
09f9cd39c5
commit
488d1beafd
|
@ -203,8 +203,7 @@ ecore_con_info_get(Ecore_Con_Server *svr,
|
||||||
int canonname_len = 0;
|
int canonname_len = 0;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
/* FIXME with EINA */
|
eina_convert_itoa(svr->port, service);
|
||||||
snprintf(service, NI_MAXSERV, "%i", svr->port);
|
|
||||||
/* CHILD */
|
/* CHILD */
|
||||||
if (!getaddrinfo(svr->name, service, hints, &result) && result)
|
if (!getaddrinfo(svr->name, service, hints, &result) && result)
|
||||||
{
|
{
|
||||||
|
@ -212,8 +211,9 @@ ecore_con_info_get(Ecore_Con_Server *svr,
|
||||||
canonname_len = strlen(result->ai_canonname) + 1;
|
canonname_len = strlen(result->ai_canonname) + 1;
|
||||||
tosend_len = sizeof(Ecore_Con_Info) + result->ai_addrlen + canonname_len;
|
tosend_len = sizeof(Ecore_Con_Info) + result->ai_addrlen + canonname_len;
|
||||||
|
|
||||||
if ((tosend = malloc(tosend_len)));
|
if (!(tosend = malloc(tosend_len)))
|
||||||
goto on_error;
|
goto on_error;
|
||||||
|
|
||||||
memset(tosend, 0, tosend_len);
|
memset(tosend, 0, tosend_len);
|
||||||
container = (Ecore_Con_Info *)tosend;
|
container = (Ecore_Con_Info *)tosend;
|
||||||
|
|
||||||
|
@ -234,10 +234,9 @@ ecore_con_info_get(Ecore_Con_Server *svr,
|
||||||
|
|
||||||
free(tosend);
|
free(tosend);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
err = write(fd[1], "", 1);
|
|
||||||
|
|
||||||
on_error:
|
on_error:
|
||||||
|
err = write(fd[1], "", 1);
|
||||||
close(fd[1]);
|
close(fd[1]);
|
||||||
# ifdef __USE_ISOC99
|
# ifdef __USE_ISOC99
|
||||||
_Exit(0);
|
_Exit(0);
|
||||||
|
|
Loading…
Reference in New Issue