From d99e748ef896956ee5f196fd52147bf46f2dcfaf Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Tue, 26 Sep 2017 21:12:28 +0200 Subject: [PATCH] sock: remove ep_sock_from_overlapped() internal API --- src/port.c | 3 +-- src/sock.c | 13 ++++--------- src/sock.h | 4 +--- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/port.c b/src/port.c index 3d876cf..5c1a217 100644 --- a/src/port.c +++ b/src/port.c @@ -136,10 +136,9 @@ static int _ep_port_feed_events(ep_port_t* port_info, for (int i = 0; i < iocp_event_count; i++) { OVERLAPPED* overlapped = iocp_events[i].lpOverlapped; - ep_sock_t* sock_info = ep_sock_from_overlapped(overlapped); struct epoll_event* ev = &epoll_events[epoll_event_count]; - epoll_event_count += ep_sock_feed_event(port_info, sock_info, ev); + epoll_event_count += ep_sock_feed_event(port_info, overlapped, ev); } return epoll_event_count; diff --git a/src/sock.c b/src/sock.c index 305d904..88878ba 100644 --- a/src/sock.c +++ b/src/sock.c @@ -230,12 +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_from_overlapped(OVERLAPPED* overlapped) { - _ep_sock_private_t* sock_private = - container_of(overlapped, _ep_sock_private_t, poll_req.overlapped); - return &sock_private->pub; -} - int ep_sock_set_event(ep_port_t* port_info, ep_sock_t* sock_info, const struct epoll_event* ev) { @@ -314,10 +308,11 @@ int ep_sock_update(ep_port_t* port_info, ep_sock_t* sock_info) { } int ep_sock_feed_event(ep_port_t* port_info, - ep_sock_t* sock_info, + OVERLAPPED* overlapped, struct epoll_event* ev) { - _ep_sock_private_t* sock_private = _ep_sock_private(sock_info); - + _ep_sock_private_t* sock_private = + container_of(overlapped, _ep_sock_private_t, poll_req.overlapped); + ep_sock_t* sock_info = &sock_private->pub; uint32_t epoll_events; bool drop_socket; int ev_count = 0; diff --git a/src/sock.h b/src/sock.h index ad0e28c..5f787a2 100644 --- a/src/sock.h +++ b/src/sock.h @@ -24,15 +24,13 @@ 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_from_overlapped(OVERLAPPED* overlapped); - EPOLL_INTERNAL int ep_sock_set_event(ep_port_t* port_info, ep_sock_t* sock_info, const struct epoll_event* ev); EPOLL_INTERNAL int ep_sock_update(ep_port_t* port_info, ep_sock_t* sock_info); EPOLL_INTERNAL int ep_sock_feed_event(ep_port_t* port_info, - ep_sock_t* sock_info, + OVERLAPPED* overlapped, struct epoll_event* ev); #endif /* EPOLL_SOCK_H_ */