Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29573
Modified Files:
session.c tmux.h
Log Message:
Sync OpenBSD patchset 803:
Dead sessions are never on the active sessions list, so the SESSION_DEAD
flag is effectively unused. Remove it.
Index: session.c
===================================================================
RCS file: /cvsroot/tmux/tmux/session.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- session.c 22 Dec 2010 15:28:50 -0000 1.79
+++ session.c 22 Dec 2010 15:31:56 -0000 1.80
@@ -166,7 +166,6 @@
}
if (i == ARRAY_LENGTH(&dead_sessions))
ARRAY_ADD(&dead_sessions, s);
- s->flags |= SESSION_DEAD;
}
/* Find session index. */
@@ -187,7 +186,7 @@
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 {
@@ -196,7 +195,7 @@
else
i++;
s2 = ARRAY_ITEM(&sessions, i);
- } while (s2 == NULL || s2->flags & SESSION_DEAD);
+ } while (s2 == NULL);
return (s2);
}
@@ -208,7 +207,7 @@
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 {
@@ -217,7 +216,7 @@
else
i--;
s2 = ARRAY_ITEM(&sessions, i);
- } while (s2 == NULL || s2->flags & SESSION_DEAD);
+ } while (s2 == NULL);
return (s2);
}
Index: tmux.h
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.h,v
retrieving revision 1.589
retrieving revision 1.590
diff -u -d -r1.589 -r1.590
--- tmux.h 22 Dec 2010 15:31:00 -0000 1.589
+++ tmux.h 22 Dec 2010 15:31:56 -0000 1.590
@@ -946,7 +946,6 @@
struct paste_stack buffers;
#define SESSION_UNATTACHED 0x1 /* not attached to any clients */
-#define SESSION_DEAD 0x2
int flags;
struct termios *tio;
------------------------------------------------------------------------------
Forrester recently released a report on the Return on Investment (ROI) of
Google Apps. They found a 300% ROI, 38%-56% cost savings, and break-even
within 7 months. Over 3 million businesses have gone Google with Google Apps:
an online email calendar, and document program that's accessible from your
browser. Read the Forrester report: http://p.sf.net/sfu/googleapps-sfnew
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
