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 ebd3408..679ae2b 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 69a1115..478a111 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 a158d65..dd808d3 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 d763632..b8fbef4 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 aa221b0..92f75ea 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 1bde036..e34e33f 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 4218365..855e2f2 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 b6a86ca..40fc4e8 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 d387cb6..7611fc2 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 79ced89..1bc53a4 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 f823e0b..fee0aad 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 0662c2d..1f1ff51 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 cd08fc5..fda298b 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 0e16cb0..41b35ab 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"