aboutsummaryrefslogtreecommitdiff
path: root/cmd-kill-session.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-09-17 00:01:08 +0100
committerThomas Adam <thomas@xteddy.org>2015-09-17 00:01:08 +0100
commita3bce7a3223dcd3e886777190ea64e27a3595a4f (patch)
tree821e3c63abe986591a9865bd9ab4e31b34032fa8 /cmd-kill-session.c
parent57ad1f6ddf0776a2115b3bf62d58744666b1b283 (diff)
parentc1d0b6a6eed2fd393ea30d257ce147e8f6b5e6c8 (diff)
downloadrtmux-a3bce7a3223dcd3e886777190ea64e27a3595a4f.tar.gz
rtmux-a3bce7a3223dcd3e886777190ea64e27a3595a4f.tar.bz2
rtmux-a3bce7a3223dcd3e886777190ea64e27a3595a4f.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-kill-session.c')
-rw-r--r--cmd-kill-session.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd-kill-session.c b/cmd-kill-session.c
index d7e2a219..74843eb6 100644
--- a/cmd-kill-session.c
+++ b/cmd-kill-session.c
@@ -41,16 +41,16 @@ enum cmd_retval
cmd_kill_session_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
- struct session *s, *s2, *s3;
+ struct session *s, *sloop, *stmp;
if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
return (CMD_RETURN_ERROR);
if (args_has(args, 'a')) {
- RB_FOREACH_SAFE(s2, sessions, &sessions, s3) {
- if (s != s2) {
- server_destroy_session(s2);
- session_destroy(s2);
+ RB_FOREACH_SAFE(sloop, sessions, &sessions, stmp) {
+ if (sloop != s) {
+ server_destroy_session(sloop);
+ session_destroy(sloop);
}
}
} else {