From c153ec0c9e1794b8ee545e99d8c00ab1eab04efa Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 19:23:34 +0000
Subject: [PATCH] vol: Tidy header includes

Since we adopted libroken, we get a lot of header includes automatically
from roken.h. Use these, instead of including lots of things multiple
times.

Change-Id: Ifd88310dc26ebfd995b4a25b2984ddb01606264f
Reviewed-on: http://gerrit.openafs.org/4319
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/vol/clone.c         | 17 +++--------------
 src/vol/common.c        |  4 +---
 src/vol/daemon_com.c    | 21 ++-------------------
 src/vol/devname.c       | 21 +++++----------------
 src/vol/fssync-client.c | 21 +++------------------
 src/vol/fssync-debug.c  | 17 +----------------
 src/vol/fssync-server.c | 21 ---------------------
 src/vol/gi.c            |  5 +----
 src/vol/ihandle.c       | 16 +++-------------
 src/vol/listinodes.c    | 11 ++---------
 10 files changed, 21 insertions(+), 133 deletions(-)

diff --git a/src/vol/clone.c b/src/vol/clone.c
index 58912ff7eb..0b04756981 100644
--- a/src/vol/clone.c
+++ b/src/vol/clone.c
@@ -20,30 +20,19 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <afs/afs_assert.h>
 #ifdef AFS_NT40_ENV
-#include <fcntl.h>
 #include <windows.h>
 #include <winbase.h>
-#include <io.h>
-#include <time.h>
-#else
-#include <sys/file.h>
-#include <sys/time.h>
-#include <unistd.h>
 #endif
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
 
+#include <afs/afs_assert.h>
 #include <rx/xdr.h>
 #include <afs/afsint.h>
+#include <afs/afssyscalls.h>
+
 #include "nfs.h"
 #include "lwp.h"
 #include "lock.h"
-#include <afs/afssyscalls.h>
 #include "ihandle.h"
 #include "vnode.h"
 #include "volume.h"
diff --git a/src/vol/common.c b/src/vol/common.c
index 0e483772db..7af9a6f900 100644
--- a/src/vol/common.c
+++ b/src/vol/common.c
@@ -14,12 +14,10 @@
 
  */
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <afs/afsutil.h>
 
diff --git a/src/vol/daemon_com.c b/src/vol/daemon_com.c
index afcc057490..4e64abce32 100644
--- a/src/vol/daemon_com.c
+++ b/src/vol/daemon_com.c
@@ -23,29 +23,12 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <time.h>
-#else
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-#include <errno.h>
 #include <afs/afs_assert.h>
-#include <signal.h>
-#include <string.h>
-
-
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include "nfs.h"
 #include <afs/errors.h>
+
+#include "nfs.h"
 #include "daemon_com.h"
 #include "lwp.h"
 #include "lock.h"
diff --git a/src/vol/devname.c b/src/vol/devname.c
index e7f0147618..c30b155137 100644
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -7,15 +7,15 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <sys/param.h>
 #include <afsconfig.h>
-
-
 #include <afs/param.h>
+
+#include <roken.h>
+
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <string.h>
 #include <ctype.h>
+
 #if !defined(AFS_SGI_ENV)
 #ifdef	AFS_OSF_ENV
 #include <ufs/fs.h>
@@ -39,17 +39,11 @@
 #endif /* AFS_VFSINCL_ENV */
 #endif /* AFS_OSF_ENV */
 #endif /* AFS_SGI_ENV */
-#include <sys/errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
 #include <sys/file.h>
 #ifdef	AFS_AIX_ENV
 #include <sys/vfs.h>
-#include <fcntl.h>
 #else
 #ifdef	AFS_HPUX_ENV
-#include <fcntl.h>
 #include <mntent.h>
 #else
 #if	defined(AFS_SUN_ENV) || defined(AFS_SUN5_ENV)
@@ -61,7 +55,6 @@
 #endif
 #else
 #if defined(AFS_SGI_ENV)
-#include <fcntl.h>
 #include <mntent.h>
 #else
 #ifdef AFS_LINUX22_ENV
@@ -73,13 +66,9 @@
 #endif /* AFS_SGI_ENV */
 #endif /* AFS_HPUX_ENV */
 #endif
-#include <netdb.h>
-#include <netinet/in.h>
 #include <sys/wait.h>
 #include <setjmp.h>
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
+
 #include "ihandle.h"
 #include "partition.h"
 
diff --git a/src/vol/fssync-client.c b/src/vol/fssync-client.c
index 0aff910b7e..0d884bc59a 100644
--- a/src/vol/fssync-client.c
+++ b/src/vol/fssync-client.c
@@ -37,32 +37,17 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <time.h>
-#else
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/time.h>
-#endif
-#include <errno.h>
 #include <afs/afs_assert.h>
-#include <signal.h>
-#include <string.h>
-
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include "nfs.h"
 #include <afs/errors.h>
+#include <afs/afssyscalls.h>
+
+#include "nfs.h"
 #include "daemon_com.h"
 #include "fssync.h"
 #include "lwp.h"
 #include "lock.h"
-#include <afs/afssyscalls.h>
 #include "ihandle.h"
 #include "vnode.h"
 #include "volume.h"
diff --git a/src/vol/fssync-debug.c b/src/vol/fssync-debug.c
index e0fb64695f..0c2780d34f 100644
--- a/src/vol/fssync-debug.c
+++ b/src/vol/fssync-debug.c
@@ -20,29 +20,14 @@
 
 #include <roken.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <errno.h>
 #ifdef AFS_NT40_ENV
-#include <io.h>
 #include <WINNT/afsevent.h>
-#else
-#include <sys/param.h>
-#include <sys/file.h>
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
 #endif
+
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include <afs/afs_assert.h>
 
-#include <fcntl.h>
-
 #ifndef AFS_NT40_ENV
 #include <afs/osi_inode.h>
 #endif
diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index fa28fda517..0d2aa7e06f 100644
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -45,27 +45,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <time.h>
-#else
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-#include <errno.h>
-#include <afs/afs_assert.h>
-#include <signal.h>
-#include <string.h>
-
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include "nfs.h"
diff --git a/src/vol/gi.c b/src/vol/gi.c
index b825a2a17b..e4e7f7c34b 100644
--- a/src/vol/gi.c
+++ b/src/vol/gi.c
@@ -10,11 +10,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 int statflag;
 
diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c
index d109ee3334..9bfdd9e859 100644
--- a/src/vol/ihandle.c
+++ b/src/vol/ihandle.c
@@ -16,31 +16,21 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <limits.h>
+
 #if defined(AFS_SUN5_ENV) || defined(AFS_NBSD_ENV)
 #include <sys/fcntl.h>
 #include <sys/resource.h>
 #endif
-#endif
 
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <errno.h>
 #include <afs/afssyscalls.h>
+
 #include "nfs.h"
 #include "ihandle.h"
 #include "viceinode.h"
 #include "afs/afs_assert.h"
-#include <limits.h>
 
 #ifdef AFS_PTHREAD_ENV
 pthread_once_t ih_glock_once = PTHREAD_ONCE_INIT;
diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index 32f57a6630..013dfaa769 100644
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -20,8 +20,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#include <string.h>
-
+#include <roken.h>
 
 #ifndef AFS_NAMEI_ENV
 #if defined(AFS_LINUX20_ENV) || defined(AFS_SUN4_ENV)
@@ -42,7 +41,6 @@ ListViceInodes(char *devname, char *mountedOn, FD_t inodeFile,
 }
 #else
 #include <ctype.h>
-#include <sys/param.h>
 #if defined(AFS_SGI_ENV)
 #else
 #ifdef	AFS_OSF_ENV
@@ -69,7 +67,6 @@ ListViceInodes(char *devname, char *mountedOn, FD_t inodeFile,
 #endif
 #endif /* AFS_VFSINCL_ENV */
 #endif /* AFS_OSF_ENV */
-#include <sys/time.h>
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef	  AFS_SUN5_ENV
@@ -89,20 +86,16 @@ ListViceInodes(char *devname, char *mountedOn, FD_t inodeFile,
 #endif /* AFS_SGI_ENV */
 #include <afs/osi_inode.h>
 #include <sys/file.h>
-#include <stdio.h>
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include "nfs.h"
 #include <afs/afssyscalls.h>
 #include "viceinode.h"
-#include <sys/stat.h>
 #if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV)
 #include <sys/ino.h>
 #endif
 #include <afs/afs_assert.h>
-#if defined(AFS_HPUX101_ENV)
-#include <unistd.h>
-#endif
+
 #include "lock.h"
 #include "ihandle.h"
 #include "vnode.h"