diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-04-25 10:02:46 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-04-25 10:02:46 +0000 |
| commit | 56e1132db485aeb0730ce7782533ca441e63afef (patch) | |
| tree | 310f172893f10f8f2f3a249ee88fed51b03b39cc /cmd-detach-client.c | |
| parent | 0a88377086329786c438d4973365fdb21186f4e4 (diff) | |
| parent | aeedb464a6ee038289ddcfefae437928ab020cb1 (diff) | |
| download | rtmux-56e1132db485aeb0730ce7782533ca441e63afef.tar.gz rtmux-56e1132db485aeb0730ce7782533ca441e63afef.tar.bz2 rtmux-56e1132db485aeb0730ce7782533ca441e63afef.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-detach-client.c')
| -rw-r--r-- | cmd-detach-client.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/cmd-detach-client.c b/cmd-detach-client.c index 7f87d2c6..4bae9997 100644 --- a/cmd-detach-client.c +++ b/cmd-detach-client.c @@ -51,7 +51,6 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq) struct client *c, *cloop; struct session *s; enum msgtype msgtype; - u_int i; if (self->entry == &cmd_suspend_client_entry) { if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL) @@ -72,9 +71,8 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq) if (s == NULL) return (CMD_RETURN_ERROR); - for (i = 0; i < ARRAY_LENGTH(&clients); i++) { - cloop = ARRAY_ITEM(&clients, i); - if (cloop == NULL || cloop->session != s) + TAILQ_FOREACH(cloop, &clients, entry) { + if (cloop->session != s) continue; server_write_client(cloop, msgtype, cloop->session->name, @@ -88,11 +86,8 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_ERROR); if (args_has(args, 'a')) { - for (i = 0; i < ARRAY_LENGTH(&clients); i++) { - cloop = ARRAY_ITEM(&clients, i); - if (cloop == NULL || cloop->session == NULL) - continue; - if (cloop == c) + TAILQ_FOREACH(cloop, &clients, entry) { + if (cloop->session == NULL || cloop == c) continue; server_write_client(cloop, msgtype, cloop->session->name, |