From a373235106d22fdead116d478087d8f8f11c150d Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 22 Dec 2010 15:36:44 +0000 Subject: Sync OpenBSD patchset 806: Store sessions in an RB tree by name rather than a list, this is tidier and allows them to easily be shown sorted in various lists (list-sessions/choose-sessions). Keep a session index which is used in a couple of places internally but make it an ever-increasing number rather than filling in gaps with new sessions. --- server-window.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'server-window.c') diff --git a/server-window.c b/server-window.c index 7f43a91e..b5daac5a 100644 --- a/server-window.c +++ b/server-window.c @@ -1,4 +1,4 @@ -/* $Id: server-window.c,v 1.18 2010-12-06 22:52:21 nicm Exp $ */ +/* $Id: server-window.c,v 1.19 2010-12-22 15:36:44 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -38,17 +38,14 @@ server_window_loop(void) struct winlink *wl; struct window_pane *wp; struct session *s; - u_int i, j; + u_int i; for (i = 0; i < ARRAY_LENGTH(&windows); i++) { w = ARRAY_ITEM(&windows, i); if (w == NULL) continue; - for (j = 0; j < ARRAY_LENGTH(&sessions); j++) { - s = ARRAY_ITEM(&sessions, j); - if (s == NULL) - continue; + RB_FOREACH(s, sessions, &sessions) { wl = session_has(s, w); if (wl == NULL) continue; -- cgit