From 9b245d856b165f195b0da93df77e4a28a1698b46 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 15:26:38 +0000
Subject: [PATCH] util: 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: I5e5e67b695f07bf121b0543c7f936278009eff15
Reviewed-on: http://gerrit.openafs.org/4301
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/config/afsconfig-windows.h |  3 ++
 src/util/assert.c              |  7 +----
 src/util/casestrcpy.c          |  4 +--
 src/util/dirpath.c             | 12 +++-----
 src/util/exec.c                |  5 +---
 src/util/fileutil.c            | 18 ++----------
 src/util/flipbase64.c          |  3 +-
 src/util/fstab.c               |  8 ++---
 src/util/get_krbrlm.c          |  3 +-
 src/util/hostparse.c           | 13 ++-------
 src/util/hputil.c              |  4 +--
 src/util/krb5_nt.c             |  2 +-
 src/util/kreltime.c            | 11 +++----
 src/util/ktime.c               | 11 ++-----
 src/util/netutils.c            | 17 ++---------
 src/util/pthread_glock.c       |  2 +-
 src/util/readdir_nt.c          |  4 +--
 src/util/secutil_nt.c          |  2 --
 src/util/serverLog.c           | 23 ++-------------
 src/util/snprintf.c            | 22 +-------------
 src/util/softsig.c             | 12 ++------
 src/util/tabular_output.c      |  9 ++----
 src/util/thread_pool.c         | 13 +--------
 src/util/uuid.c                | 53 ++++++++++------------------------
 src/util/volparse.c            |  6 ----
 src/util/work_queue.c          | 11 ++-----
 26 files changed, 58 insertions(+), 220 deletions(-)

diff --git a/src/config/afsconfig-windows.h b/src/config/afsconfig-windows.h
index 19d905b2b..507e696c6 100644
--- a/src/config/afsconfig-windows.h
+++ b/src/config/afsconfig-windows.h
@@ -124,6 +124,9 @@
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
+/* Define if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
 /* Define if you have the <sys/time.h> header file.  */
 #undef HAVE_SYS_TIME_H
 
diff --git a/src/util/assert.c b/src/util/assert.c
index 49834ccd0..3ef2c798f 100644
--- a/src/util/assert.c
+++ b/src/util/assert.c
@@ -10,14 +10,9 @@
 /* ReallyAbort:  called from assert. May/85 */
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <stdlib.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <string.h>
 
+#include <roken.h>
 
-#include <stdio.h>
 #include "afsutil.h"
 
 #ifdef AFS_NT40_ENV
diff --git a/src/util/casestrcpy.c b/src/util/casestrcpy.c
index dbcae071e..606a898d6 100644
--- a/src/util/casestrcpy.c
+++ b/src/util/casestrcpy.c
@@ -10,11 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <string.h>
 #include <ctype.h>
-#include <stddef.h>
-#include <stdarg.h>
 
 /* Just like strncpy but shift-case in transit and forces null termination */
 char *
diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index 7469b64af..5a1a7d3e6 100644
--- a/src/util/dirpath.c
+++ b/src/util/dirpath.c
@@ -10,28 +10,24 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <limits.h>
-#include <errno.h>
-#include <stdio.h>
+
 #include "afs_assert.h"
 #include "afsutil.h"
 #include "fileutil.h"
+
 #ifdef AFS_PTHREAD_ENV
 #include <pthread.h>
 static pthread_once_t dirInit_once = PTHREAD_ONCE_INIT;
 #endif
+
 #ifdef AFS_NT40_ENV
-#include <windows.h>
 #include <WINNT\afssw.h>
 #endif
-#ifdef AFS_DARWIN_ENV
-#include <unistd.h>
-#endif
 
 /* local vars */
 /* static storage for path strings */
diff --git a/src/util/exec.c b/src/util/exec.c
index df8722e7f..d2bd66c08 100644
--- a/src/util/exec.c
+++ b/src/util/exec.c
@@ -12,10 +12,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <roken.h>
 
 /* helper for afs_exec_alt; just constructs the string for the 'alternate'
  * program */
diff --git a/src/util/fileutil.c b/src/util/fileutil.c
index 329d8f3c9..509d72897 100644
--- a/src/util/fileutil.c
+++ b/src/util/fileutil.c
@@ -11,30 +11,16 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <afs/stds.h>
 #include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
 
 #ifdef AFS_NT40_ENV
-#include <windows.h>
-#include <io.h>
 #include "errmap_nt.h"
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
 #include "fileutil.h"
 
 
diff --git a/src/util/flipbase64.c b/src/util/flipbase64.c
index ef1c6c99b..7498a3d09 100644
--- a/src/util/flipbase64.c
+++ b/src/util/flipbase64.c
@@ -12,10 +12,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
+#include <roken.h>
 
 #if defined(AFS_NAMEI_ENV)
-#include <sys/types.h>
 #include "afsutil.h"
 
 /* This version of base64 gets it right and starts converting from the low
diff --git a/src/util/fstab.c b/src/util/fstab.c
index d89cdf051..439c69536 100644
--- a/src/util/fstab.c
+++ b/src/util/fstab.c
@@ -30,19 +30,15 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
 #if defined(AFS_DARWIN_ENV)
 /*
  * Reworked from FreeBSD umount
  */
 
-#include <sys/param.h>
 #include <sys/mount.h>
-
-#include <err.h>
-#include <errno.h>
 #include <fstab.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 size_t
 mntinfo(struct statfs **mntbuffer)
diff --git a/src/util/get_krbrlm.c b/src/util/get_krbrlm.c
index 1866a5129..f817b0df1 100644
--- a/src/util/get_krbrlm.c
+++ b/src/util/get_krbrlm.c
@@ -8,9 +8,8 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
+
 #include "afsutil.h"
 
 /*
diff --git a/src/util/hostparse.c b/src/util/hostparse.c
index 2462931ce..0079d8cf6 100644
--- a/src/util/hostparse.c
+++ b/src/util/hostparse.c
@@ -14,24 +14,15 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <direct.h>
 #else
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <ctype.h>
 #endif
-#include <string.h>
-#include <errno.h>
-#include "afsutil.h"
 
+#include "afsutil.h"
 
 /* also parse a.b.c.d addresses */
 struct hostent *
diff --git a/src/util/hputil.c b/src/util/hputil.c
index 50b308c9b..3e9ae038e 100644
--- a/src/util/hputil.c
+++ b/src/util/hputil.c
@@ -10,11 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_HPUX_ENV
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <utime.h>
 
 /* insque/remque moved to timer.c where they are used. */
diff --git a/src/util/krb5_nt.c b/src/util/krb5_nt.c
index 61d6b39be..ac215df42 100644
--- a/src/util/krb5_nt.c
+++ b/src/util/krb5_nt.c
@@ -24,7 +24,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
- #include <afsconfig.h>
+#include <afsconfig.h>
 #include <afs/param.h>
 
 #include <windows.h>
diff --git a/src/util/kreltime.c b/src/util/kreltime.c
index 1f9470b76..efad111db 100644
--- a/src/util/kreltime.c
+++ b/src/util/kreltime.c
@@ -9,17 +9,14 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include "ktime.h"
-#include <time.h>
 #include <ctype.h>
-#include <string.h>
-#include "afsutil.h"
 
+#include "ktime.h"
+#include "afsutil.h"
 
 /* maximum values for relative dates */
 
diff --git a/src/util/ktime.c b/src/util/ktime.c
index ad68aa7c1..eec1f3be9 100644
--- a/src/util/ktime.c
+++ b/src/util/ktime.c
@@ -10,18 +10,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <time.h>
 #include <ctype.h>
-#ifdef AFS_NT40_ENV
-#include <malloc.h>
-#endif
-#include <string.h>
-#include <stdlib.h>
-#include "afsutil.h"
 
+#include "afsutil.h"
 #include "ktime.h"
 
 /* some date parsing routines */
diff --git a/src/util/netutils.c b/src/util/netutils.c
index e92251362..c12aeb413 100644
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -14,28 +14,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <roken.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <roken.h>
 #include <ctype.h>
-#if defined(AFS_NT40_ENV)
-# include <winsock2.h>
-#else
-# if defined(__FreeBSD__)
-#  include <sys/types.h>
-# endif
-# include <netinet/in.h>
-# include <sys/errno.h>
-#endif
-#include <errno.h>
 
 #include <rx/rx.h>
+#include <afs/dirpath.h>
 
 #include "afs_assert.h"
 #include "afsutil.h"
-#include <afs/dirpath.h>
 
 #define AFS_IPINVALID        0xffffffff	/* invalid IP address */
 #define AFS_IPINVALIDIGNORE  0xfffffffe	/* no input given to extractAddr */
diff --git a/src/util/pthread_glock.c b/src/util/pthread_glock.c
index ba80cb412..93f9ee68c 100644
--- a/src/util/pthread_glock.c
+++ b/src/util/pthread_glock.c
@@ -10,13 +10,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #if defined(AFS_NT40_ENV) && defined(AFS_PTHREAD_ENV)
 #define AFS_GRMUTEX_DECLSPEC __declspec(dllexport)
 #endif
 #ifdef AFS_PTHREAD_ENV
 #include <afs/pthread_glock.h>
-#include <string.h>
 
 /*
  * Implement a pthread based recursive global lock for use in porting
diff --git a/src/util/readdir_nt.c b/src/util/readdir_nt.c
index bfc09cf1c..3435495cd 100644
--- a/src/util/readdir_nt.c
+++ b/src/util/readdir_nt.c
@@ -19,14 +19,12 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <errno.h>
 #include <afs/errmap_nt.h>
 #include <windows.h>
 #include <winbase.h>
 #include <dirent.h>
-#include <stdlib.h>
-#include <sys/stat.h>
 
 /* opendir() - The case insensitive version of opendir */
 DIR *
diff --git a/src/util/secutil_nt.c b/src/util/secutil_nt.c
index 127cd943e..83a7362d3 100644
--- a/src/util/secutil_nt.c
+++ b/src/util/secutil_nt.c
@@ -11,8 +11,6 @@
 
 #include <afs/param.h>
 #include <afsconfig.h>
-
-
 #include <afs/stds.h>
 
 #include <stddef.h>
diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 1cba0949c..65a245642 100644
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -18,35 +18,16 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
-
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#include <time.h>
-#else
-#ifdef AFS_AIX_ENV
-#include <time.h>
-#endif
-#include <sys/param.h>
-#include <sys/time.h>
-#include <syslog.h>
-#endif
 #include <afs/procmgmt.h>	/* signal(), kill(), wait(), etc. */
 
 #include <roken.h>		/* Must come after procmgmt.h */
 
-#include <fcntl.h>
-#include <afs/stds.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 #include "afsutil.h"
 #include "fileutil.h"
 #include <lwp.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+
 #if defined(AFS_PTHREAD_ENV)
 #include <afs/afs_assert.h>
 /* can't include rx when we are libutil; it's too early */
diff --git a/src/util/snprintf.c b/src/util/snprintf.c
index 200f12593..1f79105be 100644
--- a/src/util/snprintf.c
+++ b/src/util/snprintf.c
@@ -36,28 +36,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
+#include <roken.h>
 #include <ctype.h>
-#include <string.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifndef AFS_NT40_ENV
-#include <netinet/in.h>
-#include <netdb.h>
-#ifndef HAVE_VSYSLOG
-#include <syslog.h>
-#endif
-#else
-#include <winsock2.h>
-#endif
-#if defined(AFS_AIX32_ENV) || defined(AFS_SUN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SGI65_ENV)
-#include <sys/socket.h>
-#endif
 
 /* This is an enhanced version of the *printf functionality shipped
  * with Heimdal.  In addition to the standard Unix formatting types
diff --git a/src/util/softsig.c b/src/util/softsig.c
index 6fe861ea1..e0e6480b4 100644
--- a/src/util/softsig.c
+++ b/src/util/softsig.c
@@ -11,17 +11,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/procmgmt.h> /* Must be before roken.h */
+
+#include <roken.h>
 
-#include <afs/param.h>
 #include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#ifndef  AFS_NT40_ENV
-#include <signal.h>
-#include <unistd.h>
-#else
-#include <afs/procmgmt.h>
-#endif
 #include <pthread.h>
 
 #include "pthread_nosigs.h"
diff --git a/src/util/tabular_output.c b/src/util/tabular_output.c
index b879b8da8..7e55e8b78 100644
--- a/src/util/tabular_output.c
+++ b/src/util/tabular_output.c
@@ -27,14 +27,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <time.h>
+
+#include <roken.h>
+
 #include <afs/afsutil.h>
 #include <afs/tabular_output.h>
-#include <errno.h>
 
 /* private structures */
 
diff --git a/src/util/thread_pool.c b/src/util/thread_pool.c
index ab16080b6..eb89dfba2 100644
--- a/src/util/thread_pool.c
+++ b/src/util/thread_pool.c
@@ -10,21 +10,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <dirent.h>
 #include <afs/afs_assert.h>
-#include <string.h>
-#include <sys/file.h>
-#include <sys/param.h>
 #include <lock.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_HPUX_ENV)
-#include <unistd.h>
-#endif
 #include <afs/afsutil.h>
 #include <lwp.h>
 #include <afs/afsint.h>
diff --git a/src/util/uuid.c b/src/util/uuid.c
index 603961086..08cbeb9a5 100644
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -43,48 +43,27 @@
  */
 
 #include <afsconfig.h>
-#ifdef KERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#include <roken.h>
-#endif
 
+#ifndef KERNEL
+# include <roken.h>
+
+# ifdef AFS_NT40_ENV
+#  include <rpc.h>
+#  include <process.h>
+# else
+#  include <net/if.h>
+#  if !defined(AFS_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV)
+#   include <netinet/if_ether.h>
+#  endif
+# endif
 
-#ifdef KERNEL
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#else /* KERNEL */
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <rpc.h>
-#include <winsock2.h>
-#include <process.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
-#include <net/if.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#endif
-#include <sys/stat.h>
-#include <fcntl.h>
-#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV)
-#include <netinet/if_ether.h>
-#endif
 #include "afsutil.h"
-#endif /* KERNEL */
 
+#else
+# include "afs/sysincludes.h"
+# include "afsincludes.h"
+#endif
 
 typedef struct {
     char eaddr[6];		/* 6 bytes of ethernet hardware address */
diff --git a/src/util/volparse.c b/src/util/volparse.c
index 1e161f705..c4cb1f877 100644
--- a/src/util/volparse.c
+++ b/src/util/volparse.c
@@ -10,12 +10,6 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#include <string.h>
-#include <errno.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 #include <roken.h>
 
 #include "afsutil.h"
diff --git a/src/util/work_queue.c b/src/util/work_queue.c
index cbda5cc0d..e523fe176 100644
--- a/src/util/work_queue.c
+++ b/src/util/work_queue.c
@@ -10,17 +10,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+#include <sys/file.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <dirent.h>
 #include <afs/afs_assert.h>
-#include <string.h>
-#include <sys/file.h>
-#include <sys/param.h>
 #include <lock.h>
 
 #define __AFS_WORK_QUEUE_IMPL 1
-- 
2.39.5