From 6960a3038a7b5d8dfc5e43fef43c62e0d6ce634c Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 10:54:44 +0000
Subject: [PATCH] vlserver: 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: I8b304bcd0e376601fbe622f7453d0295b188b697
Reviewed-on: http://gerrit.openafs.org/4300
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/vlserver/cnvldb.c     |  8 ++------
 src/vlserver/sascnvldb.c  | 21 ++-----------------
 src/vlserver/vlclient.c   | 22 ++------------------
 src/vlserver/vldb_check.c | 43 +++++++++++++++------------------------
 src/vlserver/vlprocs.c    | 13 ++----------
 src/vlserver/vlserver.c   | 23 +++------------------
 src/vlserver/vlutils.c    |  9 +-------
 7 files changed, 28 insertions(+), 111 deletions(-)

diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c
index 320a9aa1e..bbbb51409 100644
--- a/src/vlserver/cnvldb.c
+++ b/src/vlserver/cnvldb.c
@@ -9,16 +9,12 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdio.h>
 #include <sys/file.h>
-#include <string.h>
 
-#include <netinet/in.h>
 #include <afs/venus.h>
 #include <afs/cmd.h>
 #include <afs/afsutil.h>
diff --git a/src/vlserver/sascnvldb.c b/src/vlserver/sascnvldb.c
index 2bf0c838d..b046e8273 100644
--- a/src/vlserver/sascnvldb.c
+++ b/src/vlserver/sascnvldb.c
@@ -9,31 +9,14 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-
 #include <afs/stds.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdio.h>
+
 #include <sys/file.h>
-#include "cnvldb.h"		/* CHANGEME! */
-#include <netinet/in.h>
 #include <afs/venus.h>
 #include <afs/cmd.h>
 #include <afs/afs_consts.h>
 
-#ifdef notdef
-#include <afs/vice.h>
-#undef VIRTUE
-#undef VICE
-#include "afs/prs_fs.h"
-#include <afs/afsint.h>
-#include <afs/cellconfig.h>
-#include <ubik.h>
-#endif
-#include <strings.h>
-
-
+#include "cnvldb.h"		/* CHANGEME! */
 
 static char pn[] = "cnvldb";
 static char tempname[] = "XXnewvldb";
diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c
index 36a8ea434..8c41d18b6 100644
--- a/src/vlserver/vlclient.c
+++ b/src/vlserver/vlclient.c
@@ -9,35 +9,16 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <afs/afsutil.h>
@@ -50,6 +31,7 @@
 #include <afs/cmd.h>
 #include <lock.h>
 #include <ubik.h>
+
 #include "vlserver.h"
 
 void fill_listattributes_entry(struct VldbListByAttributes *, char **, int);
diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c
index 99a44405d..496bbe604 100644
--- a/src/vlserver/vldb_check.c
+++ b/src/vlserver/vldb_check.c
@@ -7,6 +7,22 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <roken.h>
+
+#ifdef AFS_NT40_ENV
+#include <WINNT/afsevent.h>
+#endif
+
+#include <ubik.h>
+#include <afs/afsutil.h>
+#include <afs/cmd.h>
+
+#include "vlserver.h"
+#include "vldbint.h"
+
 /* Read a VLDB file and verify it for correctness */
 
 #define VL  0x001		/* good volume entry */
@@ -43,33 +59,6 @@
 #define vldbread(x,y,z) vldbio(x,y,z,0)
 #define vldbwrite(x,y,z) vldbio(x,y,z,1)
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
-#include <roken.h>
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <WINNT/afsevent.h>
-#include <io.h>
-#else
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
-
-#include "vlserver.h"
-#include "vldbint.h"
-#include <ubik.h>
-#include <afs/afsutil.h>
-#include <afs/cmd.h>
-
 #define ADDR(x) (x/sizeof(struct nvlentry))
 
 int fd;
diff --git a/src/vlserver/vlprocs.c b/src/vlserver/vlprocs.c
index 06c9fbf12..1b25ab1a3 100644
--- a/src/vlserver/vlprocs.c
+++ b/src/vlserver/vlprocs.c
@@ -12,28 +12,19 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
 #include <lock.h>
 #include <afs/afsutil.h>
 #include <ubik.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
 #include <afs/keys.h>
 #include <afs/cellconfig.h>
+
 #include "vlserver.h"
 #include "vlserver_internal.h"
 #include "afs/audit.h"
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#endif
+
 #ifdef HAVE_POSIX_REGEX		/* use POSIX regexp library */
 #include <regex.h>
 #endif
diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index 76e60b133..5f22a6e27 100644
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -9,35 +9,17 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
 #endif
+
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
-#include <time.h>
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
 
 #include <rx/xdr.h>
 #include <rx/rx.h>
@@ -51,6 +33,7 @@
 #include <lock.h>
 #include <ubik.h>
 #include <afs/afsutil.h>
+
 #include "vlserver.h"
 #include "vlserver_internal.h"
 
diff --git a/src/vlserver/vlutils.c b/src/vlserver/vlutils.c
index 0dc6a5343..231bc2db4 100644
--- a/src/vlserver/vlutils.c
+++ b/src/vlserver/vlutils.c
@@ -12,17 +12,10 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-
 #include <lock.h>
 #include <rx/xdr.h>
 #include <ubik.h>
+
 #include "vlserver.h"
 #include "vlserver_internal.h"
 
-- 
2.39.5