From owner-svn-src-head@FreeBSD.ORG  Wed Dec  4 20:15:53 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EE4D6AF5;
 Wed,  4 Dec 2013 20:15:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DACF11E4A;
 Wed,  4 Dec 2013 20:15:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB4KFrQX068337;
 Wed, 4 Dec 2013 20:15:53 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB4KFrk1068336;
 Wed, 4 Dec 2013 20:15:53 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201312042015.rB4KFrk1068336@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 4 Dec 2013 20:15:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258940 - head/sbin/route
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Dec 2013 20:15:54 -0000

Author: eadler
Date: Wed Dec  4 20:15:53 2013
New Revision: 258940
URL: http://svnweb.freebsd.org/changeset/base/258940

Log:
  route(1): Pull static data to the top of the file.
  
  This is a pre-requisisite to some upcoming changes.
  
  Submitted by:	Sebastian Huber <sebastian.huber@embedded-brains.de>
  Discussed on:	-hackers

Modified:
  head/sbin/route/route.c

Modified: head/sbin/route/route.c
==============================================================================
--- head/sbin/route/route.c	Wed Dec  4 20:13:29 2013	(r258939)
+++ head/sbin/route/route.c	Wed Dec  4 20:15:53 2013	(r258940)
@@ -74,6 +74,14 @@ __FBSDID("$FreeBSD$");
 
 #define ATALK_BUF_SIZE 20
 
+struct fibl {
+	TAILQ_ENTRY(fibl)	fl_next;
+
+	int	fl_num;
+	int	fl_error;
+	int	fl_errno;
+};
+
 static struct keytab {
 	const char	*kt_cp;
 	int	kt_i;
@@ -99,6 +107,13 @@ static int	rtm_seq;
 static char	rt_line[NI_MAXHOST];
 static char	net_line[MAXHOSTNAMELEN + 1];
 
+static struct {
+	struct	rt_msghdr m_rtm;
+	char	m_space[512];
+} m_rtmsg;
+
+static TAILQ_HEAD(fibl_head_t, fibl) fibl_head;
+
 static int	atalk_aton(const char *, struct at_addr *);
 static char	*atalk_ntoa(struct at_addr, char [ATALK_BUF_SIZE]);
 static void	printb(int, const char *);
@@ -129,16 +144,6 @@ static void	set_metric(char *, int);
 static int	set_sofib(int);
 static void	sockaddr(char *, struct sockaddr *, size_t);
 static void	sodump(struct sockaddr *, const char *);
-
-struct fibl {
-	TAILQ_ENTRY(fibl)	fl_next;
-
-	int	fl_num;
-	int	fl_error;
-	int	fl_errno;
-};
-static TAILQ_HEAD(fibl_head_t, fibl) fibl_head;
-
 static int	fiboptlist_csv(const char *, struct fibl_head_t *);
 static int	fiboptlist_range(const char *, struct fibl_head_t *);
 
@@ -1483,11 +1488,6 @@ monitor(int argc, char *argv[])
 	}
 }
 
-static struct {
-	struct	rt_msghdr m_rtm;
-	char	m_space[512];
-} m_rtmsg;
-
 static int
 rtmsg(int cmd, int flags, int fib)
 {