diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-04-25 20:45:02 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-04-25 20:45:02 +0000 |
| commit | 72e9ebf2ece28c986050162bf4f401a6a7679f53 (patch) | |
| tree | c31a424328859542a7a1248a9e411aac8fc5b3e9 /server-client.c | |
| parent | 56e1132db485aeb0730ce7782533ca441e63afef (diff) | |
| parent | a568b9cadce002f6f7e8ee914c995242bd70cce5 (diff) | |
| download | rtmux-72e9ebf2ece28c986050162bf4f401a6a7679f53.tar.gz rtmux-72e9ebf2ece28c986050162bf4f401a6a7679f53.tar.bz2 rtmux-72e9ebf2ece28c986050162bf4f401a6a7679f53.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/server-client.c b/server-client.c index f221a150..5dc2b9aa 100644 --- a/server-client.c +++ b/server-client.c @@ -93,7 +93,7 @@ server_client_create(int fd) RB_INIT(&c->status_old); c->message_string = NULL; - ARRAY_INIT(&c->message_log); + TAILQ_INIT(&c->message_log); c->prompt_string = NULL; c->prompt_buffer = NULL; @@ -137,8 +137,7 @@ server_client_open(struct client *c, char **cause) void server_client_lost(struct client *c) { - struct message_entry *msg; - u_int i; + struct message_entry *msg, *msg1; TAILQ_REMOVE(&clients, c, entry); log_debug("lost client %d", c->ibuf.fd); @@ -174,11 +173,11 @@ server_client_lost(struct client *c) free(c->message_string); if (event_initialized(&c->message_timer)) evtimer_del(&c->message_timer); - for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) { - msg = &ARRAY_ITEM(&c->message_log, i); + TAILQ_FOREACH_SAFE(msg, &c->message_log, entry, msg1) { free(msg->msg); + TAILQ_REMOVE(&c->message_log, msg, entry); + free(msg); } - ARRAY_FREE(&c->message_log); free(c->prompt_string); free(c->prompt_buffer); |