From 8b88debf018a83ea0ec561a56db5c12be96eceda Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 19:11:15 +0000
Subject: [PATCH] volser: 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.

Also, add sys/uio.h to the list of libraries that we check for.

Change-Id: I03d9c143db42a1ec415ab5624e2cbede0d34e310
Reviewed-on: http://gerrit.openafs.org/4318
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 acinclude.m4            |  1 +
 src/volser/common.c     |  3 ---
 src/volser/dumpstuff.c  | 18 +++---------------
 src/volser/lockprocs.c  |  9 +--------
 src/volser/physio.c     | 15 +--------------
 src/volser/restorevol.c | 15 ++-------------
 src/volser/vol-dump.c   | 33 +--------------------------------
 src/volser/vol_split.c  | 28 ++++++----------------------
 src/volser/volmain.c    | 20 ++------------------
 src/volser/volprocs.c   | 17 -----------------
 src/volser/voltrans.c   | 17 -----------------
 src/volser/vos.c        | 20 +-------------------
 src/volser/vsprocs.c    | 12 ------------
 src/volser/vsutils.c    | 15 ++-------------
 14 files changed, 20 insertions(+), 203 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 6ed38edb3..8e49656af 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1253,6 +1253,7 @@ AC_CHECK_HEADERS([ \
 		   sys/sysctl.h \
 		   sys/time.h \
 		   sys/types.h \
+		   sys/uio.h \
 		   sys/un.h \
 		   sys/vfs.h \
 		   syslog.h \
diff --git a/src/volser/common.c b/src/volser/common.c
index 4eccac4da..74cf8ba9a 100644
--- a/src/volser/common.c
+++ b/src/volser/common.c
@@ -12,9 +12,6 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include <afs/afsutil.h>
 #include <afs/com_err.h>
 
diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c
index 855debb35..11e07450b 100644
--- a/src/volser/dumpstuff.c
+++ b/src/volser/dumpstuff.c
@@ -12,21 +12,8 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
 #include <ctype.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#else
-#include <sys/param.h>
-#include <sys/file.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-#include <sys/stat.h>
+
 #include <afs/afs_assert.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
@@ -39,12 +26,13 @@
 #include <afs/vnode.h>
 #include <afs/volume.h>
 #include <afs/partition.h>
-#include "dump.h"
 #include <afs/daemon_com.h>
 #include <afs/fssync.h>
 #include <afs/acl.h>
 #include <afs/com_err.h>
 #include <afs/vol_prototypes.h>
+
+#include "dump.h"
 #include "volser.h"
 #include "volint.h"
 #include "dumpstuff.h"
diff --git a/src/volser/lockprocs.c b/src/volser/lockprocs.c
index 5c92ec602..e3f6a132a 100644
--- a/src/volser/lockprocs.c
+++ b/src/volser/lockprocs.c
@@ -19,23 +19,16 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <afs/voldefs.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/vlserver.h>
 #include <afs/nfs.h>
 #include <afs/afsint.h>
+
 #include "volint.h"
 #include "volser.h"
 #include "lockdata.h"
-
 #include "vsutils_prototypes.h"
 #include "lockprocs_prototypes.h"
 
diff --git a/src/volser/physio.c b/src/volser/physio.c
index 9baf650c7..b988793e0 100644
--- a/src/volser/physio.c
+++ b/src/volser/physio.c
@@ -12,27 +12,14 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-#include <string.h>
-#ifdef	AFS_SUN5_ENV
-#include <sys/fcntl.h>
-#endif
-#include <errno.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <stdio.h>
 #include <afs/afsint.h>
 #include <afs/nfs.h>
 #include <afs/afs_assert.h>
 #include <afs/dir.h>
 #include <afs/ihandle.h>
+
 #include "vol.h"
 #include "physio.h"
 
diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c
index 700173730..c4f681a12 100644
--- a/src/volser/restorevol.c
+++ b/src/volser/restorevol.c
@@ -50,21 +50,10 @@
 #include <afs/ihandle.h>
 #include <afs/vnode.h>
 #include <afs/volume.h>
-#include "volint.h"
-#include "dump.h"
 #include <afs/cmd.h>
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <stdio.h>
-#include <errno.h>
-#include <netinet/in.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <string.h>
-
+#include "volint.h"
+#include "dump.h"
 
 char rootdir[MAXPATHLEN];
 char mntroot[MAXPATHLEN];
diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c
index eb561f167..1cf127eef 100644
--- a/src/volser/vol-dump.c
+++ b/src/volser/vol-dump.c
@@ -24,21 +24,8 @@
 #include <roken.h>
 
 #include <ctype.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <time.h>
-#include <io.h>
-#else
-#include <sys/param.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#endif
-#include <afs/cmd.h>
 
+#include <afs/cmd.h>
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include <afs/nfs.h>
@@ -56,24 +43,6 @@
 #include <afs/dir.h>
 #include <afs/com_err.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef _AIX
-#include <time.h>
-#endif
-
-#include <dirent.h>
-
 #include "volser.h"
 #include "volint.h"
 #include "dump.h"
diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c
index cb3196dff..9bb5d558a 100644
--- a/src/volser/vol_split.c
+++ b/src/volser/vol_split.c
@@ -8,31 +8,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#if defined(AFS_NAMEI_ENV) && !defined(AFS_NT40_ENV)
-#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 <roken.h>
+
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
 #endif
-#endif
-#include <errno.h>
-#include <sys/stat.h>
 
+#if defined(AFS_NAMEI_ENV) && !defined(AFS_NT40_ENV)
+#include <afs/afs_assert.h>
 #include <afs/dir.h>
 #include <rx/xdr.h>
 #include <afs/afsint.h>
@@ -45,6 +28,7 @@
 #include <afs/volume.h>
 #include <afs/partition.h>
 #include <afs/viceinode.h>
+
 #include "vol.h"
 #include "volint.h"
 #include "volser.h"
diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index f90b020b8..49ab4610c 100644
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -12,26 +12,13 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <string.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
 #ifdef AFS_NT40_ENV
-#include <time.h>
-#include <fcntl.h>
 #include <windows.h>
 #include <WINNT/afsevent.h>
-#else
-#include <sys/time.h>
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <unistd.h>
 #endif
+
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <stdio.h>
-#include <signal.h>
 #include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>
@@ -53,13 +40,10 @@
 #include <afs/keys.h>
 #include <afs/dir.h>
 #include <ubik.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#include <errno.h>
 #include <afs/audit.h>
 #include <afs/afsutil.h>
 #include <lwp.h>
+
 #include "volser.h"
 #include "volint.h"
 #include "volser_internal.h"
diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c
index 012a8c3e1..875f9f6fc 100644
--- a/src/volser/volprocs.c
+++ b/src/volser/volprocs.c
@@ -14,27 +14,10 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <string.h>
-#include <errno.h>
-#ifdef AFS_NT40_ENV
-#include <stdlib.h>
-#include <fcntl.h>
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-
-#include <dirent.h>
-#include <sys/stat.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
 #include <afs/afsint.h>
-#include <signal.h>
 #include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>
diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c
index 3a80c5620..10d19bfdf 100644
--- a/src/volser/voltrans.c
+++ b/src/volser/voltrans.c
@@ -21,26 +21,9 @@
 
 #ifdef AFS_NT40_ENV
 #include <afs/afsutil.h>
-#else
-#include <sys/time.h>
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-#include <dirent.h>
-#include <sys/stat.h>
 #include <afs/afsint.h>
-#include <signal.h>
 #include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>
diff --git a/src/volser/vos.c b/src/volser/vos.c
index b74e71ae8..b9cbc82e3 100644
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -16,28 +16,13 @@
 # pragma GCC diagnostic warning "-Wimplicit-function-declaration"
 #endif
 
-#include <sys/types.h>
-#include <string.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
 #ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <io.h>
-#include <winsock2.h>
 #include <WINNT/afsreg.h>
-#else
-#include <sys/time.h>
-#include <sys/file.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #endif
-#include <sys/stat.h>
+
 #ifdef AFS_AIX_ENV
 #include <sys/statfs.h>
 #endif
-#include <errno.h>
 
 #include <lock.h>
 #include <afs/stds.h>
@@ -62,9 +47,6 @@
 #include "dump.h"
 #include "lockdata.h"
 
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
 #include "volser_internal.h"
 #include "volser_prototypes.h"
 #include "vsutils_prototypes.h"
diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index 5fdaa8ed6..ef6ef757d 100644
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -13,20 +13,9 @@
 #include <afs/procmgmt.h>	/* signal(), kill(), wait(), etc. */
 #include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
 #ifdef	AFS_AIX_ENV
 #include <sys/statfs.h>
 #endif
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#endif
 
 #include <lock.h>
 #include <afs/voldefs.h>
@@ -51,7 +40,6 @@
 #endif
 #include <afs/vnode.h>
 #include <afs/volume.h>
-#include <errno.h>
 #define ERRCODE_RANGE 8		/* from error_table.h */
 #define	CLOCKSKEW   2		/* not really skew, but resolution */
 #define CLOCKADJ(x) (((x) < CLOCKSKEW) ? 0 : (x) - CLOCKSKEW)
diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c
index 80ac4821f..8db74991d 100644
--- a/src/volser/vsutils.c
+++ b/src/volser/vsutils.c
@@ -9,27 +9,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <string.h>
 #include <ctype.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <winsock2.h>
-#else
-#include <sys/types.h>
-#include <sys/file.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif /* AFS_NT40_ENV */
-#include <sys/stat.h>
 #ifdef AFS_AIX_ENV
 #include <sys/statfs.h>
 #endif
 
-#include <errno.h>
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
@@ -42,6 +30,7 @@
 #include <afs/afsint.h>
 #include <afs/cmd.h>
 #include <rx/rxkad.h>
+
 #include "volser.h"
 #include "volint.h"
 #include "lockdata.h"
-- 
2.39.5