diff options
| -rw-r--r-- | src/ClientGlobal.cxx | 13 | ||||
| -rw-r--r-- | src/ClientList.cxx | 23 | ||||
| -rw-r--r-- | src/ClientList.hxx | 9 |
3 files changed, 13 insertions, 32 deletions
diff --git a/src/ClientGlobal.cxx b/src/ClientGlobal.cxx index 47179b53d..2ce2d3839 100644 --- a/src/ClientGlobal.cxx +++ b/src/ClientGlobal.cxx @@ -53,20 +53,9 @@ void client_manager_init(void) * 1024; } -static void client_close_all(void) -{ - while (!client_list_is_empty()) { - Client *client = client_list_get_first(); - - client->Close(); - } - - assert(client_list_is_empty()); -} - void client_manager_deinit(void) { - client_close_all(); + client_list_close_all(); client_max_connections = 0; } diff --git a/src/ClientList.cxx b/src/ClientList.cxx index b45be34c3..bfa04fea1 100644 --- a/src/ClientList.cxx +++ b/src/ClientList.cxx @@ -30,25 +30,11 @@ static std::list<Client *> clients; static unsigned num_clients; bool -client_list_is_empty(void) -{ - return num_clients == 0; -} - -bool client_list_is_full(void) { return num_clients >= client_max_connections; } -Client * -client_list_get_first(void) -{ - assert(!clients.empty()); - - return clients.front(); -} - void client_list_add(Client *client) { @@ -74,3 +60,12 @@ client_list_remove(Client *client) clients.erase(i); --num_clients; } + +void +client_list_close_all() +{ + while (!clients.empty()) + clients.front()->Close(); + + assert(num_clients == 0); +} diff --git a/src/ClientList.hxx b/src/ClientList.hxx index fccc01d81..a5a89ceea 100644 --- a/src/ClientList.hxx +++ b/src/ClientList.hxx @@ -23,14 +23,8 @@ class Client; bool -client_list_is_empty(void); - -bool client_list_is_full(void); -Client * -client_list_get_first(void); - void client_list_add(Client *client); @@ -40,4 +34,7 @@ client_list_foreach(void (*callback)(Client *client, void *ctx), void *ctx); void client_list_remove(Client *client); +void +client_list_close_all(); + #endif |