From f5dc5551aaca99916b06bcca81c141eb36fb6e73 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Mon, 28 Mar 2011 00:24:17 +0100
Subject: [PATCH] venus: Tidy up header includes

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

Change-Id: I431cff2dbfa5ca57a9884d7d8eb1695d3f79affd
Reviewed-on: http://gerrit.openafs.org/4415
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/venus/afsio.c    | 37 ++++---------------------------------
 src/venus/cacheout.c | 17 +++--------------
 src/venus/cmdebug.c  | 14 +-------------
 src/venus/dedebug.c  | 10 +---------
 src/venus/fs.c       | 20 +++-----------------
 src/venus/fstrace.c  | 26 +-------------------------
 src/venus/gcpags.c   | 17 ++---------------
 src/venus/kdump.c    |  5 +----
 src/venus/livesys.c  | 14 ++------------
 src/venus/twiddle.c  | 15 ++-------------
 src/venus/up.c       | 25 -------------------------
 src/venus/whatfid.c  | 13 ++-----------
 12 files changed, 22 insertions(+), 191 deletions(-)

diff --git a/src/venus/afsio.c b/src/venus/afsio.c
index 2e026492a..33c124e19 100644
--- a/src/venus/afsio.c
+++ b/src/venus/afsio.c
@@ -27,49 +27,26 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-
-#include <stdio.h>
 #include <setjmp.h>
-#include <sys/types.h>
-#include <string.h>
 #include <ctype.h>
 #ifdef AFS_NT40_ENV
 #include <windows.h>
-#include <winsock2.h>
 #define _CRT_RAND_S
-#include <stdlib.h>
 #include <process.h>
-#include <fcntl.h>
-#include <io.h>
 #include <afs/smb_iocons.h>
 #include <afs/afsd.h>
 #include <afs/cm_ioctl.h>
 #include <afs/pioctl_nt.h>
 #include <WINNT/syscfg.h>
 #else
-#include <sys/param.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <fcntl.h>
-#include <pwd.h>
 #include <afs/venus.h>
-#include <sys/time.h>
-#include <netdb.h>
 #include <afs/afsint.h>
 #define FSINT_COMMON_XG 1
 #endif
-#include <sys/stat.h>
-#include <errno.h>
-#include <signal.h>
 #include <afs/vice.h>
 #include <afs/cmd.h>
 #include <afs/auth.h>
@@ -88,21 +65,15 @@
 #include <afs/ihandle.h>
 #include <afs/vnode.h>
 #include <afs/com_err.h>
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
 #ifdef HAVE_DIRECT_H
 #include <direct.h>
 #endif
-#ifdef AFS_DARWIN_ENV
-#include <sys/malloc.h>
-#else
-#include <malloc.h>
-#endif
+
+#include <hcrypto/md5.h>
+
 #include <afs/errors.h>
 #include <afs/sys_prototypes.h>
 #include <rx/rx_prototypes.h>
-#include <hcrypto/md5.h>
 
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
diff --git a/src/venus/cacheout.c b/src/venus/cacheout.c
index 5fbd058fc..99123b758 100644
--- a/src/venus/cacheout.c
+++ b/src/venus/cacheout.c
@@ -7,35 +7,24 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <afs/vldbint.h>
 
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <stdio.h>
-#include <string.h>
-
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
+#include <roken.h>
 
 #include <ctype.h>
-#include <sys/types.h>
+
 #include <afs/cmd.h>
 #include <afs/cellconfig.h>
 #include <afs/afsint.h>
 #include <afs/vlserver.h>
 #include <rx/rx.h>
 #include <rx/xdr.h>
-
 #include <ubik.h>
 #include <afs/kauth.h>
 #include <afs/afsutil.h>
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <afs/vldbint.h>
 
 /*
 File servers in NW byte order.
diff --git a/src/venus/cmdebug.c b/src/venus/cmdebug.c
index 85c0beabb..4454e0c55 100644
--- a/src/venus/cmdebug.c
+++ b/src/venus/cmdebug.c
@@ -12,22 +12,10 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <rpc.h>
-#else
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-#include <stdio.h>
-#include <string.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
 #endif
+
 #include <afs/afscbint.h>
 #include <afs/cmd.h>
 #include <rx/rx.h>
diff --git a/src/venus/dedebug.c b/src/venus/dedebug.c
index 4e291cbdd..e03f62be1 100644
--- a/src/venus/dedebug.c
+++ b/src/venus/dedebug.c
@@ -10,16 +10,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
 #include <afs/afscbint.h>
 #include <afs/cmd.h>
 #include <afs/com_err.h>
diff --git a/src/venus/fs.c b/src/venus/fs.c
index adf5a0b5d..0f27cf8e6 100644
--- a/src/venus/fs.c
+++ b/src/venus/fs.c
@@ -9,30 +9,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
+#include <ctype.h>
+
 #include <afs/afs_consts.h>
 #include <afs/afs_args.h>
 #include <rx/xdr.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <netinet/in.h>
-#include <sys/stat.h>
-#include <afs/stds.h>
 #include <afs/vice.h>
 #include <afs/venus.h>
 #include <afs/com_err.h>
 #include <afs/afs_consts.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
-
-#include <string.h>
 
 #undef VIRTUE
 #undef VICE
@@ -46,10 +35,7 @@
 #include <afs/volser.h>
 #include <afs/vlserver.h>
 #include <afs/cmd.h>
-#include <afs/afsutil.h>
 #include <afs/com_err.h>
-#include <stdlib.h>
-#include <assert.h>
 #include <afs/ptclient.h>
 #include <afs/ptuser.h>
 #include <afs/afsutil.h>
diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c
index 3cb5bfa60..fe6f85f90 100644
--- a/src/venus/fstrace.c
+++ b/src/venus/fstrace.c
@@ -12,24 +12,10 @@
  */
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#if !defined(AFS_SUN3_ENV) && !defined(sys_vax_ul43)
-#include <time.h>
-/*#ifdef	AFS_AIX_ENV*/
-#include <sys/time.h>
-/*#endif*/
-#include <errno.h>
-#undef abs
-#include <stdlib.h>
-
-#include <string.h>
-
-#include <afs/stds.h>
 #include <afs/cmd.h>
 #include <afs/afs_args.h>
 #include <afs/icl.h>
@@ -49,7 +35,6 @@ int afs_icl_sizeofLong = 1;
 int afs_64bit_kernel = 1;	/* Default for 6.2+, and always for 6.1 */
 extern int afs_icl_sizeofLong;	/* Used in ICL_SIZEHACK() */
 #ifdef AFS_SGI62_ENV
-#include <unistd.h>
 
 /* If _SC_KERN_POINTERS not in sysconf, then we can assume a 32 bit abi. */
 void
@@ -2124,12 +2109,3 @@ main(int argc, char *argv[])
 
     return (cmd_Dispatch(argc, argv));
 }
-#else
-#include "AFS_component_version_number.c"
-
-int
-main(int argc, char *argv[])
-{
-    printf("fstrace is NOT supported for this OS\n");
-}
-#endif
diff --git a/src/venus/gcpags.c b/src/venus/gcpags.c
index 3395ef70e..5dc3cf8ea 100644
--- a/src/venus/gcpags.c
+++ b/src/venus/gcpags.c
@@ -9,32 +9,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
 #include <rx/xdr.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <errno.h>
-#include <stdio.h>
-#include <netinet/in.h>
-#include <sys/stat.h>
-#include <afs/stds.h>
 #include <afs/vice.h>
 #include <afs/venus.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
 #undef VIRTUE
 #undef VICE
 #include "afs/prs_fs.h"
 #include <afs/afsint.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
-#include <strings.h>
-
-
-
 
 #include "AFS_component_version_number.c"
 
diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index a7afff4ea..ebc2ab3be 100644
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -10,10 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>		/* for malloc() */
+#include <roken.h>
 
 #include <afs/cmd.h>
 
diff --git a/src/venus/livesys.c b/src/venus/livesys.c
index 7d845b325..63c14106f 100644
--- a/src/venus/livesys.c
+++ b/src/venus/livesys.c
@@ -9,28 +9,18 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
 #include <afs/afs_args.h>
 #include <rx/xdr.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <errno.h>
-#include <stdio.h>
-#include <netinet/in.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <afs/stds.h>
 #include <afs/com_err.h>
 #include <afs/vice.h>
 #include <afs/venus.h>
 #include <afs/com_err.h>
 #include <afs/afs_consts.h>
 #include <afs/sys_prototypes.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
 
 static char space[AFS_PIOCTL_MAXSIZE];
 
diff --git a/src/venus/twiddle.c b/src/venus/twiddle.c
index a3433e66c..94d83dc33 100644
--- a/src/venus/twiddle.c
+++ b/src/venus/twiddle.c
@@ -9,31 +9,20 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
 #include <rx/xdr.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <errno.h>
-#include <stdio.h>
-#include <netinet/in.h>
-#include <sys/stat.h>
-#include <afs/stds.h>
 #include <afs/com_err.h>
 #include <afs/vice.h>
 #include <afs/venus.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
 #undef VIRTUE
 #undef VICE
 #include "afs/prs_fs.h"
 #include <afs/afsint.h>
-#include <errno.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
-#include <strings.h>
 #include <afs/com_err.h>
 #include <afs/afs_consts.h>
 #include <afs/sys_prototypes.h>
diff --git a/src/venus/up.c b/src/venus/up.c
index b91105343..522dc08b4 100644
--- a/src/venus/up.c
+++ b/src/venus/up.c
@@ -12,37 +12,12 @@
 
 #include <roken.h>
 
-#include <errno.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#undef	_NONSTD_TYPES
-#endif
-#include <stdio.h>
-#include <unistd.h>
 #include <afs/afs_args.h>
-#include <sys/param.h>
-#ifdef	AFS_SUN5_ENV
-#include <fcntl.h>
-#endif
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <sys/time.h>
 #define VIRTUE
 #define VICE
-#include <sys/ioctl.h>
 #include <afs/vice.h>
 #undef VIRTUE
 #undef VICE
-#include <sys/ioctl.h>
-#include <netdb.h>
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
 #include <afs/venus.h>
 #include <afs/sys_prototypes.h>
 #include <afs/afsutil.h>
diff --git a/src/venus/whatfid.c b/src/venus/whatfid.c
index 925f76bce..830f69bb5 100644
--- a/src/venus/whatfid.c
+++ b/src/venus/whatfid.c
@@ -12,18 +12,10 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <errno.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <afs/stds.h>
 #include <afs/com_err.h>
 #include <afs/vice.h>
 #include <afs/venus.h>
@@ -31,7 +23,6 @@
 #include <afs/afsint.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
-#include <strings.h>
 
 
 struct VenusFid {
-- 
2.39.5