From 89e80cabd56bf2f7fa783575fe9b1f6192fade42 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 22 Apr 2015 15:05:03 +0000
Subject: window_index is only used in one place (window_destroy) so inline it
 there.

---
 window.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'window.c')

diff --git a/window.c b/window.c
index 3c8d4955..d8f29026 100644
--- a/window.c
+++ b/window.c
@@ -245,16 +245,6 @@ winlink_stack_remove(struct winlink_stack *stack, struct winlink *wl)
 	}
 }
 
-int
-window_index(struct window *s, u_int *i)
-{
-	for (*i = 0; *i < ARRAY_LENGTH(&windows); (*i)++) {
-		if (s == ARRAY_ITEM(&windows, *i))
-			return (0);
-	}
-	return (-1);
-}
-
 struct window *
 window_find_by_id(u_int id)
 {
@@ -341,7 +331,11 @@ window_destroy(struct window *w)
 
 	window_unzoom(w);
 
-	if (window_index(w, &i) != 0)
+	for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
+		if (w == ARRAY_ITEM(&windows, i))
+			break;
+	}
+	if (i == ARRAY_LENGTH(&windows))
 		fatalx("index not found");
 	ARRAY_SET(&windows, i, NULL);
 	while (!ARRAY_EMPTY(&windows) && ARRAY_LAST(&windows) == NULL)
-- 
cgit