port: drop '_handle' suffix from 'port_(un)register_socket()' function names
This commit is contained in:
parent
81411367b5
commit
8223744d7b
10
src/port.c
10
src/port.c
@ -354,9 +354,9 @@ int port_ctl(port_state_t* port_state,
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
int port_register_socket_handle(port_state_t* port_state,
|
int port_register_socket(port_state_t* port_state,
|
||||||
sock_state_t* sock_state,
|
sock_state_t* sock_state,
|
||||||
SOCKET socket) {
|
SOCKET socket) {
|
||||||
if (tree_add(&port_state->sock_tree,
|
if (tree_add(&port_state->sock_tree,
|
||||||
sock_state_to_tree_node(sock_state),
|
sock_state_to_tree_node(sock_state),
|
||||||
socket) < 0)
|
socket) < 0)
|
||||||
@ -364,8 +364,8 @@ int port_register_socket_handle(port_state_t* port_state,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void port_unregister_socket_handle(port_state_t* port_state,
|
void port_unregister_socket(port_state_t* port_state,
|
||||||
sock_state_t* sock_state) {
|
sock_state_t* sock_state) {
|
||||||
tree_del(&port_state->sock_tree, sock_state_to_tree_node(sock_state));
|
tree_del(&port_state->sock_tree, sock_state_to_tree_node(sock_state));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
10
src/port.h
10
src/port.h
@ -24,11 +24,11 @@ WEPOLL_INTERNAL int port_ctl(port_state_t* port_state,
|
|||||||
SOCKET sock,
|
SOCKET sock,
|
||||||
struct epoll_event* ev);
|
struct epoll_event* ev);
|
||||||
|
|
||||||
WEPOLL_INTERNAL int port_register_socket_handle(port_state_t* port_state,
|
WEPOLL_INTERNAL int port_register_socket(port_state_t* port_state,
|
||||||
sock_state_t* sock_state,
|
sock_state_t* sock_state,
|
||||||
SOCKET socket);
|
SOCKET socket);
|
||||||
WEPOLL_INTERNAL void port_unregister_socket_handle(port_state_t* port_state,
|
WEPOLL_INTERNAL void port_unregister_socket(port_state_t* port_state,
|
||||||
sock_state_t* sock_state);
|
sock_state_t* sock_state);
|
||||||
WEPOLL_INTERNAL sock_state_t* port_find_socket(port_state_t* port_state,
|
WEPOLL_INTERNAL sock_state_t* port_find_socket(port_state_t* port_state,
|
||||||
SOCKET socket);
|
SOCKET socket);
|
||||||
|
|
||||||
|
|||||||
@ -90,7 +90,7 @@ sock_state_t* sock_new(port_state_t* port_state, SOCKET socket) {
|
|||||||
tree_node_init(&sock_state->tree_node);
|
tree_node_init(&sock_state->tree_node);
|
||||||
queue_node_init(&sock_state->queue_node);
|
queue_node_init(&sock_state->queue_node);
|
||||||
|
|
||||||
if (port_register_socket_handle(port_state, sock_state, socket) < 0)
|
if (port_register_socket(port_state, sock_state, socket) < 0)
|
||||||
goto err2;
|
goto err2;
|
||||||
|
|
||||||
return sock_state;
|
return sock_state;
|
||||||
@ -111,7 +111,7 @@ static int sock__delete(port_state_t* port_state,
|
|||||||
sock__cancel_poll(sock_state);
|
sock__cancel_poll(sock_state);
|
||||||
|
|
||||||
port_cancel_socket_update(port_state, sock_state);
|
port_cancel_socket_update(port_state, sock_state);
|
||||||
port_unregister_socket_handle(port_state, sock_state);
|
port_unregister_socket(port_state, sock_state);
|
||||||
|
|
||||||
sock_state->delete_pending = true;
|
sock_state->delete_pending = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user