From 4f16b267adedf0173e99a69afd80b4e587a53ec4 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Thu, 14 Sep 2017 00:12:42 +0200
Subject: [PATCH] socket: make ep_sock_delete() return void

---
 src/epoll-socket.c | 4 +---
 src/epoll-socket.h | 3 ++-
 src/epoll.c        | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/epoll-socket.c b/src/epoll-socket.c
index b500347..81e0f48 100644
--- a/src/epoll-socket.c
+++ b/src/epoll-socket.c
@@ -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) {
diff --git a/src/epoll-socket.h b/src/epoll-socket.h
index 16e261b..df4a061 100644
--- a/src/epoll-socket.h
+++ b/src/epoll-socket.h
@@ -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,
diff --git a/src/epoll.c b/src/epoll.c
index b5c8873..db67d5d 100644
--- a/src/epoll.c
+++ b/src/epoll.c
@@ -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;
 }