From 9c018a718ad4f0b77bcd20494b74358315da5162 Mon Sep 17 00:00:00 2001
From: Bob Halley <source@isc.org>
Date: Fri, 16 Oct 1998 21:54:53 +0000
Subject: [PATCH] move sooner and set_index further down

---
 lib/isc/timer.c | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 651d8fb111..fc9d50ca58 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -83,31 +83,6 @@ struct timer_manager_t {
 	heap_t				heap;
 };
 
-
-static boolean_t
-sooner(void *v1, void *v2) {
-	timer_t t1, t2;
-
-	t1 = v1;
-	t2 = v2;
-	REQUIRE(VALID_TIMER(t1));
-	REQUIRE(VALID_TIMER(t2));
-
-	if (os_time_compare(&t1->due, &t2->due) < 0)
-		return (TRUE);
-	return (FALSE);
-}
-
-static void
-set_index(void *what, unsigned int index) {
-	timer_t timer;
-
-	timer = what;
-	REQUIRE(VALID_TIMER(timer));
-
-	timer->index = index;
-}
-
 static inline isc_result
 schedule(timer_t timer, os_time_t *nowp, boolean_t broadcast_ok) {
 	isc_result result;
@@ -557,6 +532,30 @@ run(void *uap) {
 	return (NULL);
 }
 
+static boolean_t
+sooner(void *v1, void *v2) {
+	timer_t t1, t2;
+
+	t1 = v1;
+	t2 = v2;
+	REQUIRE(VALID_TIMER(t1));
+	REQUIRE(VALID_TIMER(t2));
+
+	if (os_time_compare(&t1->due, &t2->due) < 0)
+		return (TRUE);
+	return (FALSE);
+}
+
+static void
+set_index(void *what, unsigned int index) {
+	timer_t timer;
+
+	timer = what;
+	REQUIRE(VALID_TIMER(timer));
+
+	timer->index = index;
+}
+
 isc_result
 timer_manager_create(mem_context_t mctx, timer_manager_t *managerp) {
 	timer_manager_t manager;