===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/session.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- src/usr.bin/tmux/session.c	2011/01/01 01:12:09	1.27
+++ src/usr.bin/tmux/session.c	2011/01/13 02:07:06	1.28
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.27 2011/01/01 01:12:09 nicm Exp $ */
+/* $OpenBSD: session.c,v 1.28 2011/01/13 02:07:06 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -181,12 +181,9 @@
 	if (RB_EMPTY(&sessions) || !session_alive(s))
 		return (NULL);
 
-	s2 = s;
-	do {
-		s2 = RB_NEXT(sessions, &sessions, s2);
-		if (s2 == NULL)
-			s2 = RB_MIN(sessions, &sessions);
-	} while (s2 != s);
+	s2 = RB_NEXT(sessions, &sessions, s2);
+	if (s2 == NULL)
+		s2 = RB_MIN(sessions, &sessions);
 	if (s2 == s)
 		return (NULL);
 	return (s2);
@@ -201,12 +198,9 @@
 	if (RB_EMPTY(&sessions) || !session_alive(s))
 		return (NULL);
 
-	s2 = s;
-	do {
-		s2 = RB_PREV(sessions, &sessions, s2);
-		if (s2 == NULL)
-			s2 = RB_MAX(sessions, &sessions);
-	} while (s2 != s);
+	s2 = RB_PREV(sessions, &sessions, s2);
+	if (s2 == NULL)
+		s2 = RB_MAX(sessions, &sessions);
 	if (s2 == s)
 		return (NULL);
 	return (s2);