From b2c69365e8d1d15f26797d3758fd1588fabcc963 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 14 Sep 2017 16:05:15 +0200 Subject: [PATCH] port: make ep_port_(add|del)_socket take ep_sock_t instead of tree_node_t --- src/epoll-socket.c | 4 ++-- src/port.c | 8 ++++---- src/port.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/epoll-socket.c b/src/epoll-socket.c index 42482e2..a215d99 100644 --- a/src/epoll-socket.c +++ b/src/epoll-socket.c @@ -187,7 +187,7 @@ ep_sock_t* ep_sock_new(ep_port_t* port_info, SOCKET socket) { tree_node_init(&sock_private->pub.tree_node); queue_node_init(&sock_private->pub.queue_node); - if (ep_port_add_socket(port_info, &sock_private->pub.tree_node, socket) < 0) + if (ep_port_add_socket(port_info, &sock_private->pub, socket) < 0) goto err2; return &sock_private->pub; @@ -213,7 +213,7 @@ void ep_sock_delete(ep_port_t* port_info, ep_sock_t* sock_info) { sock_private->pending_events = 0; } - ep_port_del_socket(port_info, &sock_info->tree_node); + ep_port_del_socket(port_info, sock_info); ep_port_clear_socket_update(port_info, sock_info); ep_port_release_poll_group(sock_private->poll_group); sock_private->poll_group = NULL; diff --git a/src/port.c b/src/port.c index e81ff1c..4cabdf1 100644 --- a/src/port.c +++ b/src/port.c @@ -105,13 +105,13 @@ size_t ep_port_feed_events(ep_port_t* port_info, } int ep_port_add_socket(ep_port_t* port_info, - tree_node_t* tree_node, + ep_sock_t* sock_info, SOCKET socket) { - return tree_add(&port_info->sock_tree, tree_node, socket); + return tree_add(&port_info->sock_tree, &sock_info->tree_node, socket); } -int ep_port_del_socket(ep_port_t* port_info, tree_node_t* tree_node) { - return tree_del(&port_info->sock_tree, tree_node); +int ep_port_del_socket(ep_port_t* port_info, ep_sock_t* sock_info) { + return tree_del(&port_info->sock_tree, &sock_info->tree_node); } ep_sock_t* ep_port_find_socket(ep_port_t* port_info, SOCKET socket) { diff --git a/src/port.h b/src/port.h index c208fea..73d8920 100644 --- a/src/port.h +++ b/src/port.h @@ -40,10 +40,10 @@ EPOLL_INTERNAL poll_group_t* ep_port_acquire_poll_group( EPOLL_INTERNAL void ep_port_release_poll_group(poll_group_t* poll_group); EPOLL_INTERNAL int ep_port_add_socket(ep_port_t* port_info, - tree_node_t* tree_node, + ep_sock_t* sock_info, SOCKET socket); EPOLL_INTERNAL int ep_port_del_socket(ep_port_t* port_info, - tree_node_t* tree_node); + ep_sock_t* sock_info); EPOLL_INTERNAL ep_sock_t* ep_port_find_socket(ep_port_t* port_info, SOCKET socket);