From 0fc12902522123ec85913beac30349925b9deed8 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Thu, 24 Jan 2013 17:22:14 +0100
Subject: [PATCH] Order functions properly in conn.c.

---
 lib/conn.c | 36 +++++++++++++++++++-----------------
 lib/conn.h |  2 +-
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/lib/conn.c b/lib/conn.c
index 09a1ac0..64c2344 100644
--- a/lib/conn.c
+++ b/lib/conn.c
@@ -43,6 +43,25 @@ conn_user_dispatch_p (const struct rs_connection *conn)
 	  conn->callbacks.sent_cb);
 }
 
+
+int
+conn_activate_timeout (struct rs_connection *conn)
+{
+  assert (conn);
+  assert (conn->tev);
+  assert (conn->evb);
+  if (conn->timeout.tv_sec || conn->timeout.tv_usec)
+    {
+      rs_debug (("%s: activating timer: %d.%d\n", __func__,
+		 conn->timeout.tv_sec, conn->timeout.tv_usec));
+      if (evtimer_add (conn->tev, &conn->timeout))
+	return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
+				    "evtimer_add: %d", errno);
+    }
+  return RSE_OK;
+}
+
+/* Public functions. */
 int
 rs_conn_create (struct rs_context *ctx,
 		struct rs_connection **conn,
@@ -290,20 +309,3 @@ rs_conn_set_timeout(struct rs_connection *conn, struct timeval *tv)
   assert (tv);
   conn->timeout = *tv;
 }
-
-int
-conn_activate_timeout (struct rs_connection *conn)
-{
-  assert (conn);
-  assert (conn->tev);
-  assert (conn->evb);
-  if (conn->timeout.tv_sec || conn->timeout.tv_usec)
-    {
-      rs_debug (("%s: activating timer: %d.%d\n", __func__,
-		 conn->timeout.tv_sec, conn->timeout.tv_usec));
-      if (evtimer_add (conn->tev, &conn->timeout))
-	return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
-				    "evtimer_add: %d", errno);
-    }
-  return RSE_OK;
-}
diff --git a/lib/conn.h b/lib/conn.h
index f58cc53..cf15b80 100644
--- a/lib/conn.h
+++ b/lib/conn.h
@@ -1,6 +1,6 @@
 /* Copyright 2011 NORDUnet A/S. All rights reserved.
    See LICENSE for licensing information.  */
 
-int conn_user_dispatch_p (const struct rs_connection *conn);
 int conn_close (struct rs_connection **connp);
+int conn_user_dispatch_p (const struct rs_connection *conn);
 int conn_activate_timeout (struct rs_connection *conn);
-- 
2.1.4