From 8705c6b4352bc2ffa3f06cd7eed0df65d6e3a5ba Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 20 Dec 2010 00:19:20 +0000 Subject: [PATCH] Dead sessions are never on the active sessions list, so the SESSION_DEAD flag is effectively unused. Remove it. --- session.c | 9 ++++----- tmux.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/session.c b/session.c index c4d553cb..ba114e4b 100644 --- a/session.c +++ b/session.c @@ -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); } diff --git a/tmux.h b/tmux.h index 8b384af1..f5384773 100644 --- a/tmux.h +++ b/tmux.h @@ -948,7 +948,6 @@ struct session { struct paste_stack buffers; #define SESSION_UNATTACHED 0x1 /* not attached to any clients */ -#define SESSION_DEAD 0x2 int flags; struct termios *tio;