===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- src/usr.bin/tmux/cmd-attach-session.c	2015/02/05 10:29:43	1.32
+++ src/usr.bin/tmux/cmd-attach-session.c	2015/04/24 23:17:11	1.33
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-attach-session.c,v 1.32 2015/02/05 10:29:43 nicm Exp $ */
+/* $OpenBSD: cmd-attach-session.c,v 1.33 2015/04/24 23:17:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -51,7 +51,6 @@
 	struct window_pane	*wp = NULL;
 	const char		*update;
 	char			*cause;
-	u_int			 i;
 	int			 fd;
 	struct format_tree	*ft;
 	char			*cp;
@@ -92,11 +91,8 @@
 			 * Can't use server_write_session in case attaching to
 			 * the same session as currently attached to.
 			 */
-			for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-				c = ARRAY_ITEM(&clients, i);
-				if (c == NULL || c->session != s)
-					continue;
-				if (c == cmdq->client)
+			TAILQ_FOREACH(c, &clients, entry) {
+				if (c->session != s || c == cmdq->client)
 					continue;
 				server_write_client(c, MSG_DETACH,
 				    c->session->name,