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>

diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c
index ebd340819eb16f67068fe63b567fed38b13a40e2..679ae2b0b500b43f0f5db0421a059b6f9f419308 100644 (file)
--- 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 69a1115e86de95ea52909ec8e5f950f3f8143364..478a1118a17830458dda9b4c29dc062e2b48a5e5 100644 (file)
--- 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 a158d65f074f4ac306f076fa76969ee8fe6cfbc7..dd808d3a77e4b52c4b71b8b5de988a7007014d32 100644 (file)
--- 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 d763632395f64b804c026fa5750710ee43e6191e..b8fbef4ebd5671a6bede085d9b2ac90ef8db16e1 100644 (file)
--- 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 aa221b0d3b32252f4889a4c376295c0b6f198aad..92f75ea675db1f70316d98a541358d19b0cf13fb 100644 (file)
--- 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 1bde0360a5cfb32306ef132cc1a5109335fdab1d..e34e33f400a6355ddd651b2fc9ace7ed61b182d5 100644 (file)
--- 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 4218365e4243e6da95fa9b3863829ac29a5c04c1..855e2f282b8aa30f6f94435aae14e4f0607bc289 100644 (file)
--- 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 b6a86ca73bb913091f6fd603403e13fe1e99aa7b..40fc4e87a8f0a687c9a79234d0fd79c157d22f41 100644 (file)
--- 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 d387cb6e88eba9304b260e7d37a8ba1ff4bcade5..7611fc27394a000b1885ce9b1bed123893f95a1f 100644 (file)
--- 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 79ced899ce05cb18f22eb08fbbf967ff17de46d1..1bc53a475ef66eae796a1bd53985c77f1b6fb256 100644 (file)
--- 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 f823e0b62a7abbb93590f1882eb2b0e1bab350a5..fee0aadff5fc0eeadd6b82641f33d9b51b5a0c38 100644 (file)
--- 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 0662c2d427359151d9d6c3637bf57876d46c14ff..1f1ff51219473241f7867b02d03dc9c49c6e2496 100644 (file)
--- 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 cd08fc5464921806d73fce3f820b60b6fbd90d2c..fda298b803fab8284614fbf146d667b15d053961 100644 (file)
--- 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 0e16cb0dd665a500dfac79a604858eea89ac806f..41b35ab8f46dda8cc8d1807f01a826aeb07ce815 100644 (file)
--- 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"