vfsck: Tidy header includes

Remove headers which are provided by libroken, and reorder header
includes so that they're a bit a more legible.

Change-Id: I7896d654d3b1e50352e92f1fbfb3211f79791116
Reviewed-on: http://gerrit.openafs.org/4417
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/vfsck/dir.c b/src/vfsck/dir.c
index 1f6efd6..de56cf8 100644 (file)
--- a/src/vfsck/dir.c
+++ b/src/vfsck/dir.c
@@ -18,13 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#define VICE                   /* allow us to put our changes in at will */
-#include <stdio.h>
+#include <ctype.h>
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
+#define VICE                   /* allow us to put our changes in at will */
 
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
@@ -57,7 +55,6 @@
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>

diff --git a/src/vfsck/dirutils.c b/src/vfsck/dirutils.c
index eee574e..3b1700f 100644 (file)
--- a/src/vfsck/dirutils.c
+++ b/src/vfsck/dirutils.c
@@ -10,11 +10,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <dirent.h>
 #include <afs/ihandle.h>
 #include <afs/partition.h>
 

diff --git a/src/vfsck/inode.c b/src/vfsck/inode.c
index da5e12b..6e74b19 100644 (file)
--- a/src/vfsck/inode.c
+++ b/src/vfsck/inode.c
@@ -18,12 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#define VICE                   /* control whether AFS changes are present */
-#include <stdio.h>
+#include <ctype.h>
 
-#include <sys/time.h>
-#include <sys/param.h>
+#define VICE                   /* control whether AFS changes are present */
 
 #ifdef AFS_OSF_ENV
 #include <sys/mount.h>
@@ -55,7 +54,6 @@
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>

diff --git a/src/vfsck/main.c b/src/vfsck/main.c
index 304aaea..130abeb 100644 (file)
--- a/src/vfsck/main.c
+++ b/src/vfsck/main.c
@@ -18,12 +18,15 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#define VICE                   /* allow us to put our changes in at will */
-#include <stdio.h>
+#include <ctype.h>
 
-#include <sys/param.h>
-#include <sys/time.h>
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
+#define VICE                   /* allow us to put our changes in at will */
 
 #ifdef AFS_SUN_ENV
 #define KERNEL
@@ -33,8 +36,6 @@
 #undef KERNEL
 #endif
 
-#include <sys/file.h>
-
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -45,7 +46,6 @@
 #define VFS
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -63,7 +63,6 @@
 
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
@@ -82,14 +81,7 @@
 #endif /* AFS_VFSINCL_ENV */
 #endif /* AFS_OSF_ENV */
 
-#include <sys/stat.h>
 #include <sys/wait.h>
-#ifdef AFS_SUN5_ENV
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#include <ctype.h>
 #ifdef XAFS_SUN_ENV
 #include <mntent.h>
 #else
@@ -103,7 +95,6 @@
 #endif
 #endif
 #include "fsck.h"
-#include <errno.h>
 #include <sys/signal.h>
 
 char *rawname(), *unrawname(), *blockcheck(), *malloc();

diff --git a/src/vfsck/pass1.c b/src/vfsck/pass1.c
index b044d5a..3a175f5 100644 (file)
--- a/src/vfsck/pass1.c
+++ b/src/vfsck/pass1.c
@@ -18,10 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
 #define VICE
-#include <sys/param.h>
-#include <sys/time.h>
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -37,8 +38,6 @@
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -54,7 +53,6 @@
 #ifdef AFS_HPUX_ENV
 extern int ge_danger;
 #define        DUX
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>

diff --git a/src/vfsck/pass1b.c b/src/vfsck/pass1b.c
index 64add8c..69d2941 100644 (file)
--- a/src/vfsck/pass1b.c
+++ b/src/vfsck/pass1b.c
@@ -18,10 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
 #define VICE
-#include <sys/param.h>
-#include <sys/time.h>
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -30,15 +31,12 @@
 #define        _BSD
 #define        _KERNEL
 #include <ufs/dir.h>
-#include <stdio.h>
 #undef _KERNEL
 #undef _BSD
 #else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -52,7 +50,6 @@
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>

diff --git a/src/vfsck/pass2.c b/src/vfsck/pass2.c
index 91b466e..402fa9c 100644 (file)
--- a/src/vfsck/pass2.c
+++ b/src/vfsck/pass2.c
@@ -18,10 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
 #define VICE
-#include <sys/time.h>
-#include <sys/param.h>
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -32,13 +33,10 @@
 #include <ufs/dir.h>
 #undef _KERNEL
 #undef _BSD
-#include <stdio.h>
 #else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -53,7 +51,6 @@
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
@@ -72,11 +69,6 @@
 #endif /* AFS_OSF_ENV */
 #include <afs/osi_inode.h>
 
-#ifdef AFS_SUN5_ENV
-#include <string.h>
-#else
-#include <strings.h>
-#endif
 #include "fsck.h"
 
 int pass2check();

diff --git a/src/vfsck/pass3.c b/src/vfsck/pass3.c
index 58f795a..92a9513 100644 (file)
--- a/src/vfsck/pass3.c
+++ b/src/vfsck/pass3.c
@@ -18,10 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
 #define VICE
-#include <sys/param.h>
-#include <sys/time.h>
 
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
@@ -33,13 +34,10 @@
 #include <ufs/dir.h>
 #undef _KERNEL
 #undef _BSD
-#include <stdio.h>
 #else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -53,7 +51,6 @@
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>

diff --git a/src/vfsck/pass4.c b/src/vfsck/pass4.c
index f995056..f4edf81 100644 (file)
--- a/src/vfsck/pass4.c
+++ b/src/vfsck/pass4.c
@@ -18,10 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
 #define VICE
-#include <sys/param.h>
-#include <sys/time.h>
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -32,13 +33,10 @@
 #include <ufs/dir.h>
 #undef _KERNEL
 #undef _BSD
-#include <stdio.h>
 #else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -52,7 +50,6 @@
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>

diff --git a/src/vfsck/pass5.c b/src/vfsck/pass5.c
index 7aa9107..2632e24 100644 (file)
--- a/src/vfsck/pass5.c
+++ b/src/vfsck/pass5.c
@@ -18,10 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
 #define VICE
-#include <sys/param.h>
-#include <sys/time.h>
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -32,13 +33,10 @@
 #include <ufs/dir.h>
 #undef _KERNEL
 #undef _BSD
-#include <stdio.h>
 #else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -52,7 +50,6 @@
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>

diff --git a/src/vfsck/proplist.c b/src/vfsck/proplist.c
index 4ebb33c..956afae 100644 (file)
--- a/src/vfsck/proplist.c
+++ b/src/vfsck/proplist.c
@@ -10,14 +10,12 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #define VICE                   /* control whether AFS changes are present */
 
 #ifdef   AFS_OSF_ENV
 
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <ufs/inode.h>

diff --git a/src/vfsck/setup.c b/src/vfsck/setup.c
index 808f032..49cbd5c 100644 (file)
--- a/src/vfsck/setup.c
+++ b/src/vfsck/setup.c
@@ -18,9 +18,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
-#include <stdio.h>
-#include <string.h>
 #define VICE
 
 #if    defined(AFS_SUN_ENV) || defined(AFS_OSF_ENV)
@@ -35,8 +36,6 @@ extern vfscklogprintf();
 #endif
 
 #define DKTYPENAMES
-#include <sys/param.h>
-#include <sys/time.h>
 
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
@@ -48,13 +47,10 @@ extern vfscklogprintf();
 #include <ufs/dir.h>
 #undef _KERNEL
 #undef _BSD
-#include <stdio.h>
 #else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -68,7 +64,6 @@ extern vfscklogprintf();
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
@@ -77,10 +72,7 @@ extern vfscklogprintf();
 #endif /* AFS_VFSINCL_ENV */
 #endif /* AFS_OSF_ENV */
 
-#include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/file.h>
-#include <ctype.h>
 #ifdef AFS_SUN5_ENV
 #include <sys/mntent.h>
 #include <sys/vfstab.h>

diff --git a/src/vfsck/ufs_subr.c b/src/vfsck/ufs_subr.c
index f638421..7bd3c77 100644 (file)
--- a/src/vfsck/ufs_subr.c
+++ b/src/vfsck/ufs_subr.c
@@ -20,11 +20,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #define VICE
 
-#include <sys/param.h>
-#include <sys/time.h>
 #ifdef AFS_OSF_ENV
 #include <ufs/fs.h>
 #else /* AFS_OSF_ENV */

diff --git a/src/vfsck/ufs_tables.c b/src/vfsck/ufs_tables.c
index 1e27e8f..3b4a1d2 100644 (file)
--- a/src/vfsck/ufs_tables.c
+++ b/src/vfsck/ufs_tables.c
@@ -20,11 +20,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#ifdef KERNEL
-#include "param.h"
-#else
-#include <sys/param.h>
+#ifndef KERNEL
+#include <roken.h>
 #ifdef         AFS_HPUX_ENV
 #include <sys/fs.h>
 #endif

diff --git a/src/vfsck/utilities.c b/src/vfsck/utilities.c
index c6c9da5..67f7cd4 100644 (file)
--- a/src/vfsck/utilities.c
+++ b/src/vfsck/utilities.c
@@ -18,10 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
-#include <sys/param.h>
 #define VICE                   /* allow us to put our changes in at will */
-#include <sys/time.h>
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -37,9 +38,6 @@
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -54,7 +52,6 @@
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
@@ -72,15 +69,8 @@
 #endif /* AFS_VFSINCL_ENV */
 #endif /* AFS_OSF_ENV */
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
 #include "fsck.h"
 
-#if    defined(AFS_HPUX101_ENV)
-#include <unistd.h>
-#endif
-
 #if    defined(AFS_SUN_ENV) || defined(AFS_OSF_ENV)
 #define AFS_NEWCG_ENV
 #else

diff --git a/src/vfsck/vprintf.c b/src/vfsck/vprintf.c
index 15e688e..b266736 100644 (file)
--- a/src/vfsck/vprintf.c
+++ b/src/vfsck/vprintf.c
@@ -13,12 +13,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#define VICE                   /* allow us to put our changes in at will */
-#include <stdio.h>
+#include <ctype.h>
 
-#include <sys/param.h>
-#include <sys/time.h>
+#define VICE                   /* allow us to put our changes in at will */
 
 #ifdef AFS_SUN_ENV
 #define KERNEL
@@ -45,8 +44,6 @@
 #define VFS
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -64,7 +61,6 @@
 
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
@@ -83,16 +79,8 @@
 #endif /* AFS_VFSINCL_ENV */
 #endif /* AFS_OSF_ENV */
 
-#include <sys/stat.h>
 #include <sys/wait.h>
-#ifdef AFS_SUN5_ENV
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#include <ctype.h>
 #include "fsck.h"
-#include <errno.h>
 
 /* Vice printf:  lob the message into /vice/file/vfsck.log if it isn't the root */
 /* If we're salvaging the root, it wouldn't be such a good idea to lob stuff there */