From 05d43d9882817f2a63602bd36818276a329407a4 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sun, 28 Oct 2012 19:38:42 +0000
Subject: [PATCH] Declare functions as static and move global variables to the
 top; no functional changes.

---
 sbin/tunefs/tunefs.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 228132f12680..688952fc790a 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -70,14 +70,16 @@ __FBSDID("$FreeBSD$");
 /* the optimization warning string template */
 #define	OPTWARN	"should optimize for %s with minfree %s %d%%"
 
+static int blocks;
+static char clrbuf[MAXBSIZE];
 static struct uufsd disk;
 #define	sblock disk.d_fs
 
-void usage(void);
-void printfs(void);
-int journal_alloc(int64_t size);
-void journal_clear(void);
-void sbdirty(void);
+static void usage(void);
+static void printfs(void);
+static int journal_alloc(int64_t size);
+static void journal_clear(void);
+static void sbdirty(void);
 
 int
 main(int argc, char *argv[])
@@ -545,16 +547,13 @@ main(int argc, char *argv[])
 		err(12, "%s", special);
 }
 
-void
+static void
 sbdirty(void)
 {
 	disk.d_fs.fs_flags |= FS_UNCLEAN | FS_NEEDSFSCK;
 	disk.d_fs.fs_clean = 0;
 }
 
-static int blocks;
-static char clrbuf[MAXBSIZE];
-
 static ufs2_daddr_t
 journal_balloc(void)
 {
@@ -880,7 +879,7 @@ indir_fill(ufs2_daddr_t blk, int level, int *resid)
 /*
  * Clear the flag bits so the journal can be removed.
  */
-void
+static void
 journal_clear(void)
 {
 	struct ufs1_dinode *dp1;
@@ -911,7 +910,7 @@ journal_clear(void)
 	}
 }
 
-int
+static int
 journal_alloc(int64_t size)
 {
 	struct ufs1_dinode *dp1;
@@ -1060,7 +1059,7 @@ journal_alloc(int64_t size)
 	return (-1);
 }
 
-void
+static void
 usage(void)
 {
 	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n",
@@ -1073,7 +1072,7 @@ usage(void)
 	exit(2);
 }
 
-void
+static void
 printfs(void)
 {
 	warnx("POSIX.1e ACLs: (-a)                                %s",