socket: make ep_sock_delete() return void

This commit is contained in:
Bert Belder 2017-09-14 00:12:42 +02:00
parent eaec721f0c
commit 4f16b267ad
3 changed files with 4 additions and 6 deletions

View File

@ -132,7 +132,7 @@ void _ep_sock_maybe_free(_ep_sock_private_t* sock_private) {
_ep_sock_free(sock_private);
}
int ep_sock_delete(ep_port_t* port_info, ep_sock_t* sock_info) {
void ep_sock_delete(ep_port_t* port_info, ep_sock_t* sock_info) {
_ep_sock_private_t* sock_private = _ep_sock_private(sock_info);
assert(!_ep_sock_is_deleted(sock_private));
@ -143,8 +143,6 @@ int ep_sock_delete(ep_port_t* port_info, ep_sock_t* sock_info) {
sock_private->flags |= _EP_SOCK_DELETED;
_ep_sock_maybe_free(sock_private);
return 0;
}
ep_sock_t* ep_sock_find(tree_t* tree, SOCKET socket) {

View File

@ -20,7 +20,8 @@ typedef struct ep_sock {
} ep_sock_t;
EPOLL_INTERNAL ep_sock_t* ep_sock_new(ep_port_t* port_info, SOCKET socket);
EPOLL_INTERNAL int ep_sock_delete(ep_port_t* port_info, ep_sock_t* sock_info);
EPOLL_INTERNAL void ep_sock_delete(ep_port_t* port_info, ep_sock_t* sock_info);
EPOLL_INTERNAL ep_sock_t* ep_sock_find(tree_t* tree, SOCKET socket);
EPOLL_INTERNAL int ep_sock_set_event(ep_port_t* port_info,

View File

@ -60,8 +60,7 @@ static int _ep_ctl_del(ep_port_t* port_info, uintptr_t socket) {
if (sock_info == NULL)
return -1;
if (ep_sock_delete(port_info, sock_info) < 0)
return -1;
ep_sock_delete(port_info, sock_info);
return 0;
}