From cce1bd6059fd9dc5e909a56e879331d6f46bdf99 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 20:07:37 +0000
Subject: [PATCH] bozo: 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: Ie4f1b955c111f30b98aa8793b3e3d15dd0bb9275
Reviewed-on: http://gerrit.openafs.org/4322
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/bozo/bnode.c          | 21 +--------------------
 src/bozo/bos.c            | 24 +++---------------------
 src/bozo/bos_util.c       | 10 +++-------
 src/bozo/bosoprocs.c      | 17 ++---------------
 src/bozo/bosserver.c      | 31 ++++++++-----------------------
 src/bozo/cronbnodeops.c   | 12 +++---------
 src/bozo/ezbnodeops.c     |  7 -------
 src/bozo/fsbnodeops.c     | 19 +------------------
 src/bozo/smail-notifier.c | 10 ++--------
 9 files changed, 23 insertions(+), 128 deletions(-)

diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c
index 374c7b29e..e348f637f 100644
--- a/src/bozo/bnode.c
+++ b/src/bozo/bnode.c
@@ -14,32 +14,13 @@
 #include <roken.h>
 
 #include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <dirent.h>
-#include <errno.h>
-#include <sys/types.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <sys/file.h>
-#include <sys/time.h>
-#endif
-#ifdef BOZO_SAVE_CORES
-#include <time.h>
-#endif
-#include <sys/stat.h>
-#include <string.h>
 
-#include <afs/procmgmt.h>	/* signal(), kill(), wait(), etc. */
 #include <lwp.h>
 #include <rx/rx.h>
 #include <afs/audit.h>
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
+
 #include "bnode.h"
 #include "bosprototypes.h"
 
diff --git a/src/bozo/bos.c b/src/bozo/bos.c
index 7545b2d97..5d74868bc 100644
--- a/src/bozo/bos.c
+++ b/src/bozo/bos.c
@@ -9,30 +9,14 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <afs/procmgmt.h>
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <io.h>
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <strings.h>
-#endif /* AFS_NT40_ENV */
-#include <string.h>
-#include <afs/procmgmt.h>	/* signal(), kill(), wait(), etc. */
-#include <time.h>
+#include <hcrypto/ui.h>
+
 #include "bnode.h"
-#include <errno.h>
 #include <afs/afsutil.h>
 #include <afs/cellconfig.h>
 #include <rx/rx.h>
@@ -40,12 +24,10 @@
 #include <rx/xdr.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
-#include <stdio.h>
 #include <afs/cmd.h>
 #include <afs/com_err.h>
 #include <ubik.h>
 #include <afs/ktime.h>
-#include <hcrypto/ui.h>
 #include <afs/kautils.h>
 #include <afs/volser.h>
 
diff --git a/src/bozo/bos_util.c b/src/bozo/bos_util.c
index e3795e536..5aab9de31 100644
--- a/src/bozo/bos_util.c
+++ b/src/bozo/bos_util.c
@@ -22,20 +22,16 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdio.h>
+#include <hcrypto/ui.h>
+#include <hcrypto/des.h>
 
 #include <afs/stds.h>
 #include <afs/afsutil.h>
 #include <afs/keys.h>
 #include <afs/cellconfig.h>
 #include <afs/kautils.h>
-#include <hcrypto/ui.h>
-#include <hcrypto/des.h>
 
 int
 main(int argc, char **argv)
diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c
index c21d37dbe..2ec18a6f3 100644
--- a/src/bozo/bosoprocs.c
+++ b/src/bozo/bosoprocs.c
@@ -9,37 +9,24 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #ifdef AFS_NT40_ENV
-#include <io.h>
-#include <fcntl.h>
 #include <sys/utime.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
 #endif /* AFS_NT40_ENV */
+
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
-#include <errno.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
 #include <afs/ktime.h>
 #include <afs/audit.h>
 #include <afs/kautils.h>
-#include <string.h>
 
 #include "bnode.h"
 #include "bosint.h"
diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index a964c3846..5d1eaecbc 100644
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -9,6 +9,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <afs/procmgmt.h>
 #include <roken.h>
@@ -17,51 +18,35 @@
 # pragma GCC diagnostic warning "-Wdeprecated-declarations"
 #endif
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
+
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <direct.h>
-#include <io.h>
 #include <WINNT/afsevent.h>
-#else
-#include <unistd.h>
-#include <netinet/in.h>
-#include <syslog.h>
 #endif /* AFS_NT40_ENV */
-#include <afs/cellconfig.h>
+
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <rx/rx_globals.h>
-#include "bosint.h"
-#include "bnode.h"
-#include "bosprototypes.h"
 #include <rx/rxkad.h>
 #include <rx/rxstat.h>
 #include <afs/keys.h>
 #include <afs/ktime.h>
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
-#include <afs/procmgmt.h>	/* signal(), kill(), wait(), etc. */
 #include <afs/audit.h>
 #include <afs/cellconfig.h>
+
 #if defined(AFS_SGI_ENV)
 #include <afs/afs_args.h>
 #endif
 
+#include "bosint.h"
+#include "bnode.h"
+#include "bosprototypes.h"
+
 #define BOZO_LWP_STACKSIZE	16000
 extern struct bnode_ops fsbnode_ops, dafsbnode_ops, ezbnode_ops, cronbnode_ops;
 
diff --git a/src/bozo/cronbnodeops.c b/src/bozo/cronbnodeops.c
index 4f0205bfe..f4eeab185 100644
--- a/src/bozo/cronbnodeops.c
+++ b/src/bozo/cronbnodeops.c
@@ -13,22 +13,16 @@
 #include <afs/procmgmt.h>
 #include <roken.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <lwp.h>
-#include <time.h>
 #include <ctype.h>
-#include <stdio.h>
+
 #ifdef AFS_NT40_ENV
 #include <io.h>
 #endif
 
-#include <string.h>
-#include <stdlib.h>
-
+#include <lwp.h>
 #include <afs/ktime.h>
 #include <afs/afsutil.h>
-#include <afs/procmgmt.h>	/* signal(), kill(), wait(), etc. */
+
 #include "bnode.h"
 #include "bosprototypes.h"
 
diff --git a/src/bozo/ezbnodeops.c b/src/bozo/ezbnodeops.c
index 0cfd3e74f..2a8f397e6 100644
--- a/src/bozo/ezbnodeops.c
+++ b/src/bozo/ezbnodeops.c
@@ -13,20 +13,13 @@
 #include <afs/procmgmt.h>
 #include <roken.h>
 
-#include <sys/types.h>
-#include <errno.h>
-#include <sys/stat.h>
 #include <lwp.h>
 #include <rx/rx.h>
 #ifdef AFS_NT40_ENV
 #include <io.h>
 #endif
 
-#include <string.h>
-#include <stdlib.h>
-
 #include <afs/afsutil.h>
-#include <afs/procmgmt.h>	/* signal(), kill(), wait(), etc. */
 #include "bnode.h"
 #include "bosprototypes.h"
 
diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c
index e5684a11e..ed4f02d57 100644
--- a/src/bozo/fsbnodeops.c
+++ b/src/bozo/fsbnodeops.c
@@ -13,27 +13,10 @@
 #include <afs/procmgmt.h>
 #include <roken.h>
 
-#include <sys/types.h>
 #include <lwp.h>
 #include <rx/rx.h>
-#include <errno.h>
-#include <stdio.h>
-#ifdef	AFS_SUN5_ENV
-#include <fcntl.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#endif /* AFS_NT40_ENV */
-#include <sys/stat.h>
-#include <afs/procmgmt.h>	/* signal(), kill(), wait(), etc. */
 #include <afs/afsutil.h>
+
 #include "bnode.h"
 #include "bosprototypes.h"
 
diff --git a/src/bozo/smail-notifier.c b/src/bozo/smail-notifier.c
index 3c52be3da..4f8da1f32 100644
--- a/src/bozo/smail-notifier.c
+++ b/src/bozo/smail-notifier.c
@@ -9,16 +9,10 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdio.h>
 #include <afs/afsutil.h>
 
 /*
-- 
2.39.5