enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

some small cleanups to unify more error code 

SVN revision: 66066
This commit is contained in:
Mike Blumenkrantz 2011-12-10 05:17:34 +00:00
parent ff57b89995
commit e90a7c7cbd
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1458,6 +1458,7 @@ _ecore_con_cb_tcp_listen(void *data,
{ {
Ecore_Con_Server *svr; Ecore_Con_Server *svr;
struct linger lin; struct linger lin;
const char *memerr = NULL;
svr = data; svr = data;
@ -1499,16 +1500,14 @@ _ecore_con_cb_tcp_listen(void *data,
_ecore_con_svr_tcp_handler, svr, NULL, NULL); _ecore_con_svr_tcp_handler, svr, NULL, NULL);
if (!svr->fd_handler) if (!svr->fd_handler)
{ {
ecore_con_event_server_error(svr, "Memory allocation failure"); memerr = "Memory allocation failure";
ecore_con_ssl_server_shutdown(svr); goto error;
_ecore_con_server_kill(svr);
} }
return; return;
error: error:
if (errno) if (errno || memerr) ecore_con_event_server_error(svr, errno ? strerror(errno) : memerr);
ecore_con_event_server_error(svr, strerror(errno));
ecore_con_ssl_server_shutdown(svr); ecore_con_ssl_server_shutdown(svr);
_ecore_con_server_kill(svr); _ecore_con_server_kill(svr);
} }
@ -1524,6 +1523,7 @@ _ecore_con_cb_udp_listen(void *data,
struct ipv6_mreq mreq6; struct ipv6_mreq mreq6;
#endif #endif
const int on = 1; const int on = 1;
const char *memerr = NULL;
svr = data; svr = data;
type = svr->type; type = svr->type;
@ -1577,10 +1577,8 @@ _ecore_con_cb_udp_listen(void *data,
_ecore_con_svr_udp_handler, svr, NULL, NULL); _ecore_con_svr_udp_handler, svr, NULL, NULL);
if (!svr->fd_handler) if (!svr->fd_handler)
{ {
ecore_con_event_server_error(svr, "Memory allocation failure"); memerr = "Memory allocation failure";
ecore_con_ssl_server_shutdown(svr); goto error;
_ecore_con_server_kill(svr);
return;
} }
svr->ip = eina_stringshare_add(net_info->ip); svr->ip = eina_stringshare_add(net_info->ip);
@ -1588,7 +1586,7 @@ _ecore_con_cb_udp_listen(void *data,
return; return;
error: error:
if (errno) ecore_con_event_server_error(svr, strerror(errno)); if (errno || memerr) ecore_con_event_server_error(svr, errno ? strerror(errno) : memerr);
ecore_con_ssl_server_shutdown(svr); ecore_con_ssl_server_shutdown(svr);
_ecore_con_server_kill(svr); _ecore_con_server_kill(svr);
} }
@ -1600,6 +1598,7 @@ _ecore_con_cb_tcp_connect(void *data,
Ecore_Con_Server *svr; Ecore_Con_Server *svr;
int res; int res;
int curstate = 0; int curstate = 0;
const char *memerr = NULL;
svr = data; svr = data;
@ -1668,18 +1667,17 @@ _ecore_con_cb_tcp_connect(void *data,
if (!svr->fd_handler) if (!svr->fd_handler)
{ {
ecore_con_event_server_error(svr, "Memory allocation failure"); memerr = "Memory allocation failure";
ecore_con_ssl_server_shutdown(svr); goto error;
_ecore_con_server_kill(svr);
} }
if ((!svr->dead) && ((!svr->ecs) || (svr->ecs->lookup))) if ((!svr->ecs) || (svr->ecs->lookup))
svr->ip = eina_stringshare_add(net_info->ip); svr->ip = eina_stringshare_add(net_info->ip);
return; return;
error: error:
if (errno) ecore_con_event_server_error(svr, strerror(errno)); if (errno || memerr) ecore_con_event_server_error(svr, errno ? strerror(errno) : memerr);
ecore_con_ssl_server_shutdown(svr); ecore_con_ssl_server_shutdown(svr);
_ecore_con_server_kill(svr); _ecore_con_server_kill(svr);
} }
@ -1691,6 +1689,7 @@ _ecore_con_cb_udp_connect(void *data,
Ecore_Con_Server *svr; Ecore_Con_Server *svr;
int curstate = 0; int curstate = 0;
int broadcast = 1; int broadcast = 1;
const char *memerr = NULL;
svr = data; svr = data;
errno = 0; errno = 0;
@ -1711,8 +1710,8 @@ _ecore_con_cb_udp_connect(void *data,
goto error; goto error;
} }
} }
else if (setsockopt(svr->fd, SOL_SOCKET, SO_REUSEADDR, if (setsockopt(svr->fd, SOL_SOCKET, SO_REUSEADDR,
(const void *)&curstate, sizeof(curstate)) < 0) (const void *)&curstate, sizeof(curstate)) < 0)
goto error; goto error;
if (connect(svr->fd, net_info->info.ai_addr, net_info->info.ai_addrlen) < 0) if (connect(svr->fd, net_info->info.ai_addr, net_info->info.ai_addrlen) < 0)
@ -1723,18 +1722,17 @@ _ecore_con_cb_udp_connect(void *data,
if (!svr->fd_handler) if (!svr->fd_handler)
{ {
ecore_con_event_server_error(svr, "Memory allocation failure"); memerr = "Memory allocation failure";
ecore_con_ssl_server_shutdown(svr); goto error;
_ecore_con_server_kill(svr);
} }
if ((!svr->dead) && ((!svr->ecs) || (svr->ecs->lookup))) if ((!svr->ecs) || (svr->ecs->lookup))
svr->ip = eina_stringshare_add(net_info->ip); svr->ip = eina_stringshare_add(net_info->ip);
return; return;
error: error:
if (errno) ecore_con_event_server_error(svr, strerror(errno)); if (errno || memerr) ecore_con_event_server_error(svr, errno ? strerror(errno) : memerr);
ecore_con_ssl_server_shutdown(svr); ecore_con_ssl_server_shutdown(svr);
_ecore_con_server_kill(svr); _ecore_con_server_kill(svr);
} }