diff options
| author |   nicm <nicm@openbsd.org> | 2010-12-20 00:19:20 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-12-20 00:19:20 +0000 |
| commit | 653112141bc34e615c48b924e10d2e183424c4c0 (patch) | |
| tree | 5287852702d816ab04850c6a32953fa833fc82f4 /usr.bin/tmux/session.c | |
| parent | Use pointer rather than index for the client's last session. (diff) | |
| download | wireguard-openbsd-653112141bc34e615c48b924e10d2e183424c4c0.tar.xz wireguard-openbsd-653112141bc34e615c48b924e10d2e183424c4c0.zip | |
Dead sessions are never on the active sessions list, so the SESSION_DEAD
flag is effectively unused. Remove it.
Diffstat (limited to 'usr.bin/tmux/session.c')
| -rw-r--r-- | usr.bin/tmux/session.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.bin/tmux/session.c b/usr.bin/tmux/session.c index c23d1b79e8c..fedeb545ec9 100644 --- a/usr.bin/tmux/session.c +++ b/usr.bin/tmux/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.21 2010/12/20 00:03:55 nicm Exp $ */ +/* $OpenBSD: session.c,v 1.22 2010/12/20 00:19:20 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -167,7 +167,6 @@ session_destroy(struct session *s) } if (i == ARRAY_LENGTH(&dead_sessions)) ARRAY_ADD(&dead_sessions, s); - s->flags |= SESSION_DEAD; } /* Find session index. */ @@ -188,7 +187,7 @@ session_next_session(struct session *s) struct session *s2; u_int i; - if (ARRAY_LENGTH(&sessions) == 0 || session_index(s, &i) != 0) + if (ARRAY_LENGTH(&sessions) == 0 || !session_alive(s)) return (NULL); do { @@ -197,7 +196,7 @@ session_next_session(struct session *s) else i++; s2 = ARRAY_ITEM(&sessions, i); - } while (s2 == NULL || s2->flags & SESSION_DEAD); + } while (s2 == NULL); return (s2); } @@ -209,7 +208,7 @@ session_previous_session(struct session *s) struct session *s2; u_int i; - if (ARRAY_LENGTH(&sessions) == 0 || session_index(s, &i) != 0) + if (ARRAY_LENGTH(&sessions) == 0 || !session_alive(s)) return (NULL); do { @@ -218,7 +217,7 @@ session_previous_session(struct session *s) else i--; s2 = ARRAY_ITEM(&sessions, i); - } while (s2 == NULL || s2->flags & SESSION_DEAD); + } while (s2 == NULL); return (s2); } |