From 809a6d84bff887efca4134653afaf53aa07935df Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Mon, 25 Sep 2017 23:09:15 +0200 Subject: [PATCH] sock: remove ep_sock_find_in_tree() internal api --- src/port.c | 3 ++- src/sock.c | 4 ---- src/sock.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/port.c b/src/port.c index cda67d4..3d876cf 100644 --- a/src/port.c +++ b/src/port.c @@ -338,7 +338,8 @@ int ep_port_del_socket(ep_port_t* port_info, ep_sock_t* sock_info) { } ep_sock_t* ep_port_find_socket(ep_port_t* port_info, SOCKET socket) { - ep_sock_t* sock_info = ep_sock_find_in_tree(&port_info->sock_tree, socket); + ep_sock_t* sock_info = safe_container_of( + tree_find(&port_info->sock_tree, socket), ep_sock_t, tree_node); if (sock_info == NULL) return_error(NULL, ERROR_NOT_FOUND); return sock_info; diff --git a/src/sock.c b/src/sock.c index c6dba38..305d904 100644 --- a/src/sock.c +++ b/src/sock.c @@ -230,10 +230,6 @@ void ep_sock_force_delete(ep_port_t* port_info, ep_sock_t* sock_info) { ep_sock_delete(port_info, sock_info); } -ep_sock_t* ep_sock_find_in_tree(tree_t* tree, SOCKET socket) { - return safe_container_of(tree_find(tree, socket), ep_sock_t, tree_node); -} - ep_sock_t* ep_sock_from_overlapped(OVERLAPPED* overlapped) { _ep_sock_private_t* sock_private = container_of(overlapped, _ep_sock_private_t, poll_req.overlapped); diff --git a/src/sock.h b/src/sock.h index 514a1e4..ad0e28c 100644 --- a/src/sock.h +++ b/src/sock.h @@ -24,7 +24,6 @@ EPOLL_INTERNAL void ep_sock_delete(ep_port_t* port_info, ep_sock_t* sock_info); EPOLL_INTERNAL void ep_sock_force_delete(ep_port_t* port_info, ep_sock_t* sock_info); -EPOLL_INTERNAL ep_sock_t* ep_sock_find_in_tree(tree_t* tree, SOCKET socket); EPOLL_INTERNAL ep_sock_t* ep_sock_from_overlapped(OVERLAPPED* overlapped); EPOLL_INTERNAL int ep_sock_set_event(ep_port_t* port_info,