From 2fcdc9298d11a2f038f6425e6c5c24bd23da6b8c Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun, 27 Mar 2011 22:55:05 +0100
Subject: [PATCH] ubik: Tidy up header includes

Remove headers which are provided by libroken, and reorder header
includes so that they're a bit a more legible.

Change-Id: Iddd472b25de2d833b3235eceab593afdd1527e03
Reviewed-on: http://gerrit.openafs.org/4411
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/ubik/beacon.c      | 16 ----------------
 src/ubik/disk.c        | 14 --------------
 src/ubik/lock.c        |  8 --------
 src/ubik/phys.c        | 20 --------------------
 src/ubik/recovery.c    | 15 ---------------
 src/ubik/remote.c      | 12 ------------
 src/ubik/ubik.c        | 13 -------------
 src/ubik/ubikclient.c  | 15 +--------------
 src/ubik/ubikcmd.c     | 13 -------------
 src/ubik/udebug.c      | 20 --------------------
 src/ubik/uinit.c       | 17 ++---------------
 src/ubik/utst_client.c | 14 ++------------
 src/ubik/utst_server.c | 16 +++-------------
 src/ubik/vote.c        | 10 ----------
 14 files changed, 8 insertions(+), 195 deletions(-)

diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c
index ebd340819..679ae2b0b 100644
--- a/src/ubik/beacon.c
+++ b/src/ubik/beacon.c
@@ -12,22 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <string.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <time.h>
-#else
-#include <sys/file.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
diff --git a/src/ubik/disk.c b/src/ubik/disk.c
index 69a1115e8..478a1118a 100644
--- a/src/ubik/disk.c
+++ b/src/ubik/disk.c
@@ -12,23 +12,9 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <string.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#endif
-
 #include <lock.h>
 #include <rx/xdr.h>
 
-
-
 #define UBIK_INTERNALS
 #include "ubik.h"
 #include "ubik_int.h"
diff --git a/src/ubik/lock.c b/src/ubik/lock.c
index a158d65f0..dd808d3a7 100644
--- a/src/ubik/lock.c
+++ b/src/ubik/lock.c
@@ -12,14 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#ifndef AFS_NT40_ENV
-#include <sys/file.h>
-#endif
-
 #include <lock.h>
 #include <rx/xdr.h>
 
diff --git a/src/ubik/phys.c b/src/ubik/phys.c
index d76363239..b8fbef4eb 100644
--- a/src/ubik/phys.c
+++ b/src/ubik/phys.c
@@ -12,27 +12,7 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <io.h>
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#endif
-#include <sys/stat.h>
-
-/* #ifdef AFS_PTHREAD_ENV */
-#if 0   /* temporary hack - klm */
-/* nothing */
-#else
 #include <lwp.h>
-#endif
 
 #include <lock.h>
 #include <afs/afsutil.h>
diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index aa221b0d3..92f75ea67 100644
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -12,21 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <string.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <time.h>
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <sys/time.h>
-#endif
-
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
diff --git a/src/ubik/remote.c b/src/ubik/remote.c
index 1bde0360a..e34e33f40 100644
--- a/src/ubik/remote.c
+++ b/src/ubik/remote.c
@@ -12,18 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <string.h>
-#include <stdarg.h>
-
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#endif
-
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c
index 4218365e4..855e2f282 100644
--- a/src/ubik/ubik.c
+++ b/src/ubik/ubik.c
@@ -12,19 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
-
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <sys/param.h>
-#endif
-
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
diff --git a/src/ubik/ubikclient.c b/src/ubik/ubikclient.c
index b6a86ca73..40fc4e87a 100644
--- a/src/ubik/ubikclient.c
+++ b/src/ubik/ubikclient.c
@@ -9,6 +9,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
@@ -20,28 +21,14 @@
 #include "afsincludes.h"
 #endif
 
-#include <afs/stds.h>
 #include <afs/pthread_glock.h>
-#include <stdio.h>
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lock.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <unistd.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
 #include <afs/rxgen_consts.h>
 #define UBIK_LEGACY_CALLITER
 #include "ubik.h"
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-
 short ubik_initializationState;	/*!< initial state is zero */
 
 
diff --git a/src/ubik/ubikcmd.c b/src/ubik/ubikcmd.c
index d387cb6e8..7611fc273 100644
--- a/src/ubik/ubikcmd.c
+++ b/src/ubik/ubikcmd.c
@@ -12,19 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
-
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <sys/param.h>
-#include <netdb.h>
-#endif
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c
index 79ced899c..1bc53a475 100644
--- a/src/ubik/udebug.c
+++ b/src/ubik/udebug.c
@@ -12,26 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <signal.h>
-#include <time.h>
-
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c
index f823e0b62..fee0aadff 100644
--- a/src/ubik/uinit.c
+++ b/src/ubik/uinit.c
@@ -9,28 +9,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.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>
+# include <sys/statfs.h>
 #endif
 
-#include <string.h>
-
 #include <afs/dirpath.h>
-#include <errno.h>
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
diff --git a/src/ubik/utst_client.c b/src/ubik/utst_client.c
index 0662c2d42..1f1ff5121 100644
--- a/src/ubik/utst_client.c
+++ b/src/ubik/utst_client.c
@@ -11,22 +11,12 @@
 #include <afs/param.h>
 #include <afs/stds.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <afsutil.h>
-#else
-#include <sys/file.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lock.h>
+
 #include "ubik.h"
 #include "utst_int.h"
 
diff --git a/src/ubik/utst_server.c b/src/ubik/utst_server.c
index cd08fc546..fda298b80 100644
--- a/src/ubik/utst_server.c
+++ b/src/ubik/utst_server.c
@@ -9,25 +9,15 @@
 
 #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 <winsock2.h>
-#include <afsutil.h>
-#else
-#include <sys/file.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lock.h>
 #include <afs/afsutil.h>
+
 #include "ubik.h"
 #include "utst_int.h"
 
diff --git a/src/ubik/vote.c b/src/ubik/vote.c
index 0e16cb0dd..41b35ab8f 100644
--- a/src/ubik/vote.c
+++ b/src/ubik/vote.c
@@ -12,20 +12,10 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#endif
 #include <lock.h>
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/afsutil.h>
-#include <time.h>
-#include <stdarg.h>
 
 #define UBIK_INTERNALS
 #include "ubik.h"
-- 
2.39.5