From 59400d38a99ac8ffbfd7d89e021ed2f56ffbfd23 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Jan 2013 18:07:48 +0100 Subject: Client: use std::deque for messages --- src/MessageCommands.cxx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/MessageCommands.cxx') diff --git a/src/MessageCommands.cxx b/src/MessageCommands.cxx index 738c2eab9..c5f4d79b0 100644 --- a/src/MessageCommands.cxx +++ b/src/MessageCommands.cxx @@ -109,19 +109,14 @@ handle_read_messages(Client *client, { assert(argc == 1); - GSList *messages = client_read_messages(client); - - for (GSList *i = messages; i != NULL; i = g_slist_next(i)) { - ClientMessage *msg = (ClientMessage *)i->data; + while (!client->messages.empty()) { + const ClientMessage &msg = client->messages.front(); client_printf(client, "channel: %s\nmessage: %s\n", - msg->GetChannel(), - msg->GetMessage()); - delete msg; + msg.GetChannel(), msg.GetMessage()); + client->messages.pop_front(); } - g_slist_free(messages); - return COMMAND_RETURN_OK; } -- cgit v1.2.3