libadmin: Tidy header includes

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

Add math.h to the list of headers that configure will check for

Change-Id: I530afa77866a0aa3a33f8684ce9cf630aa347812
Reviewed-on: http://gerrit.openafs.org/4384
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/acinclude.m4 b/acinclude.m4
index 457c55f74dcebdb805f06207aa9b2cd9b3e5c1de..8c92b66f4fada1bd0fd785f21828bc2b0fe24430 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1224,6 +1224,7 @@ AC_CHECK_HEADERS([ \
                   errno.h \
                   fcntl.h \
                   grp.h \
+                  math.h \
                   mntent.h \
                   ncurses.h \
                   netdb.h \

diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c
index feb3dc0c839b3104383d667a4a6bacd46a025219..22511737e76d3684186849588e68c9168c623084 100644 (file)
--- a/src/libadmin/adminutil/afs_utilAdmin.c
+++ b/src/libadmin/adminutil/afs_utilAdmin.c
@@ -9,15 +9,14 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <afs/afs_Admin.h>
-#include <stdio.h>
-#include <string.h>
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
-#include "afs_AdminInternal.h"
 #include <afs/pthread_glock.h>
 #include <afs/cellconfig.h>
 #include <afs/dirpath.h>
@@ -29,18 +28,12 @@
 #include <afs/bnode.h>
 #include <afs/volser.h>
 #include <afs/afscbint.h>
-#include <rx/rx.h>
-#include <rx/rxstat.h>
+
 #ifdef AFS_NT40_ENV
-# include <winsock2.h>
 # include <afs/krb5_nt.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 #endif
+
+#include "afs_AdminInternal.h"
 #include "afs_utilAdmin.h"
 
 /*

diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c
index 85a59b2ab80bfa28e7f8cc570103694087c5548b..dd17a7cf0af5bd211042a0388f1e2186cf207a09 100644 (file)
--- a/src/libadmin/bos/afs_bosAdmin.c
+++ b/src/libadmin/bos/afs_bosAdmin.c
@@ -9,31 +9,21 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <afs/stds.h>
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-#include "afs_bosAdmin.h"
-#include "../adminutil/afs_AdminInternal.h"
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>
 #include <afs/bosint.h>
 #include <afs/bnode.h>
 #include <afs/ktime.h>
 #include <afs/dirpath.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-#include <string.h>
+
+#include "afs_bosAdmin.h"
+#include "../adminutil/afs_AdminInternal.h"
 
 typedef struct bos_server {
     int begin_magic;

diff --git a/src/libadmin/cfg/cfgclient.c b/src/libadmin/cfg/cfgclient.c
index 6ec525fb40b9175f0b078d58c065f2500a156917..c9bb930722aaeb629f153431d012c279880bb94d 100644 (file)
--- a/src/libadmin/cfg/cfgclient.c
+++ b/src/libadmin/cfg/cfgclient.c
@@ -13,24 +13,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <pthread.h>
+#include <roken.h>
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>
-
 #include <afs/dirpath.h>
 #include <afs/cellconfig.h>
 #include <afs/kautils.h>

diff --git a/src/libadmin/cfg/cfgdb.c b/src/libadmin/cfg/cfgdb.c
index 945393ba74d3fa2a250855b14c5ebfb4bde1aab2..95238d00494050a5e1cd9d3c5d36816a063c7ff3 100644 (file)
--- a/src/libadmin/cfg/cfgdb.c
+++ b/src/libadmin/cfg/cfgdb.c
@@ -13,16 +13,9 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
+#include <roken.h>
 
 #include <pthread.h>
 

diff --git a/src/libadmin/cfg/cfghost.c b/src/libadmin/cfg/cfghost.c
index 2d95ef57373b492583e2f7e1523dceccae319cf8..9fbdb33ee7349d1cb6c0373baa2830a24fddbb32 100644 (file)
--- a/src/libadmin/cfg/cfghost.c
+++ b/src/libadmin/cfg/cfghost.c
@@ -13,29 +13,16 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include <roken.h>
 
 #include <pthread.h>
 
 #ifdef AFS_NT40_ENV
 #include <WINNT/vptab.h>
 #include <WINNT/afsreg.h>
-#include <io.h>
 #include <direct.h>
-#else
-#include <unistd.h>
 #endif /* AFS_NT40_ENV */
 
 #include <rx/rx.h>
@@ -49,7 +36,6 @@
 #include <afs/afs_kasAdmin.h>
 #include <afs/afs_ptsAdmin.h>
 
-
 #include <afs/kautils.h>
 #include <afs/bnode.h>
 #include <afs/prerror.h>

diff --git a/src/libadmin/cfg/cfginternal.c b/src/libadmin/cfg/cfginternal.c
index 15587cde1e47b47e7148f2e143162924e0c2b726..759577e2d252c98354abd9fea491a0f72d7c9429 100644 (file)
--- a/src/libadmin/cfg/cfginternal.c
+++ b/src/libadmin/cfg/cfginternal.c
@@ -9,32 +9,18 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
 #include <windows.h>
-#include <winsock2.h>
-#include <io.h>
 #include <WINNT/afsreg.h>
-#else
-#include <unistd.h>
-#include <math.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/param.h>
 #endif /* AFS_NT40_ENV */
-#include <dirent.h>
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
 
 #include <pthread.h>
 

diff --git a/src/libadmin/cfg/cfgservers.c b/src/libadmin/cfg/cfgservers.c
index dfb40039eaffd587a9b6d520f8fc6ba9a3e70ee2..9cf79da65c5751f052fde902aa46506c5c5c6ba8 100644 (file)
--- a/src/libadmin/cfg/cfgservers.c
+++ b/src/libadmin/cfg/cfgservers.c
@@ -17,16 +17,10 @@
 
 #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>
 #include <ctype.h>
 
 #ifdef AFS_NT40_ENV

diff --git a/src/libadmin/cfg/test/cfgtest.c b/src/libadmin/cfg/test/cfgtest.c
index cf4f90eb87ad08572545b7f4d6c5f3aeff094c73..b520da5a63f0cd205d9c44ae8b337fda56e85c67 100644 (file)
--- a/src/libadmin/cfg/test/cfgtest.c
+++ b/src/libadmin/cfg/test/cfgtest.c
@@ -11,15 +11,9 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
+#include <roken.h>
 
 #include <pthread.h>
 

diff --git a/src/libadmin/client/afs_clientAdmin.c b/src/libadmin/client/afs_clientAdmin.c
index 81ff7020cde220626417e8e546b1eef90598c66d..b26a18482a952a62658fbecb319110f64ebc2bca 100644 (file)
--- a/src/libadmin/client/afs_clientAdmin.c
+++ b/src/libadmin/client/afs_clientAdmin.c
@@ -9,37 +9,23 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include "afs_clientAdmin.h"
-#include "../adminutil/afs_AdminInternal.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <afs/cellconfig.h>
 #ifdef AFS_NT40_ENV
 #include <afs/afssyscalls.h>
-#include <winsock2.h>
 #include <afs/fs_utils.h>
 #define close(x) closesocket(x)
 #else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <afs/venus.h>
-#include <errno.h>
-#include <strings.h>
-#include <unistd.h>
 #endif
-#include <string.h>
-#include <afs/kautils.h>
 #include <rx/rx.h>
 #include <rx/rxstat.h>
 #include <rx/rx_null.h>
 #include <rx/rxkad.h>
+
+#include <afs/kautils.h>
 #include <afs/dirpath.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_vosAdmin.h>
@@ -49,6 +35,9 @@
 #include <afs/pthread_glock.h>
 #include <afs/sys_prototypes.h>
 
+#include "afs_clientAdmin.h"
+#include "../adminutil/afs_AdminInternal.h"
+
 /*
  * AFS client administration functions.
  *

diff --git a/src/libadmin/kas/afs_kasAdmin.c b/src/libadmin/kas/afs_kasAdmin.c
index df083cbdec454832317521cb92a21551a370b3e2..ccbfaec87c98593db3aa3fdc32cbaaf1d42499df 100644 (file)
--- a/src/libadmin/kas/afs_kasAdmin.c
+++ b/src/libadmin/kas/afs_kasAdmin.c
@@ -9,13 +9,10 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
-
-#include <afs/stds.h>
 #include <rx/rx.h>
 #include <rx/rxstat.h>
 #include "afs_kasAdmin.h"

diff --git a/src/libadmin/pts/afs_ptsAdmin.c b/src/libadmin/pts/afs_ptsAdmin.c
index 8e6aacc717f312b17e60b704dfb213dcde10326f..ba8200bd5d7e544fe2e1736337126cb8387cc955 100644 (file)
--- a/src/libadmin/pts/afs_ptsAdmin.c
+++ b/src/libadmin/pts/afs_ptsAdmin.c
@@ -9,21 +9,23 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
 #include <ctype.h>
-#include <afs/stds.h>
+
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-#include "afs_ptsAdmin.h"
-#include "../adminutil/afs_AdminInternal.h"
+
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>
 #include <afs/ptint.h>
 #include <afs/ptserver.h>
 
+#include "afs_ptsAdmin.h"
+#include "../adminutil/afs_AdminInternal.h"
+
 /*
  * IsValidCellHandle - validate the cell handle for making pts
  * requests.

diff --git a/src/libadmin/samples/cm_client_config.c b/src/libadmin/samples/cm_client_config.c
index 2f79fe1f1ffb1c72342287991de0075bec82a1ae..34dd62aa9bfd694ede895b87650707313e26465d 100644 (file)
--- a/src/libadmin/samples/cm_client_config.c
+++ b/src/libadmin/samples/cm_client_config.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/cm_list_cells.c b/src/libadmin/samples/cm_list_cells.c
index 518d7ca2baaa3c58ebc1b312fc229b47b9d3ff32..a82c46d9f1b02d6871fd9c7babaafb1ec801e17c 100644 (file)
--- a/src/libadmin/samples/cm_list_cells.c
+++ b/src/libadmin/samples/cm_list_cells.c
@@ -16,11 +16,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/cm_local_cell.c b/src/libadmin/samples/cm_local_cell.c
index 02aa98b011d95c2465a4c2681579d50b84e1d8a7..8260385a47b4b9a7d758ec373fcd701eff5dec62 100644 (file)
--- a/src/libadmin/samples/cm_local_cell.c
+++ b/src/libadmin/samples/cm_local_cell.c
@@ -16,6 +16,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>

diff --git a/src/libadmin/samples/cm_server_prefs.c b/src/libadmin/samples/cm_server_prefs.c
index 1b7d817737025b9e9362920a391e7ebd606203e3..2e2d0295c2744107af866d2a4de6339df7451115 100644 (file)
--- a/src/libadmin/samples/cm_server_prefs.c
+++ b/src/libadmin/samples/cm_server_prefs.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxdebug_basic_stats.c b/src/libadmin/samples/rxdebug_basic_stats.c
index f2978084951adb51293be29978e57677eb551364..2e5ca0008bb30924678e1297415382267c0a988a 100644 (file)
--- a/src/libadmin/samples/rxdebug_basic_stats.c
+++ b/src/libadmin/samples/rxdebug_basic_stats.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxdebug_conns.c b/src/libadmin/samples/rxdebug_conns.c
index 07a613c01afc3d1e13e9db09cbbd321ad1796561..bd623d6d2d2c99ce523b018e71c39900b4f585d4 100644 (file)
--- a/src/libadmin/samples/rxdebug_conns.c
+++ b/src/libadmin/samples/rxdebug_conns.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxdebug_peers.c b/src/libadmin/samples/rxdebug_peers.c
index fae6001883f9fd27a6c1ff7d72a2cb92839d7878..2438a66be2d2d93254d906e6ea282f8803cab9ad 100644 (file)
--- a/src/libadmin/samples/rxdebug_peers.c
+++ b/src/libadmin/samples/rxdebug_peers.c
@@ -16,13 +16,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
 #ifdef IGNORE_SOME_GCC_WARNINGS
  # pragma GCC diagnostic warning "-Wformat"
 #endif
 
-
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxdebug_rx_stats.c b/src/libadmin/samples/rxdebug_rx_stats.c
index 43e11ddc7b144a62a53514ee8b59695aff68b233..6dbf9f7cb9c807f1fcb83f69c81c8f9227950fa8 100644 (file)
--- a/src/libadmin/samples/rxdebug_rx_stats.c
+++ b/src/libadmin/samples/rxdebug_rx_stats.c
@@ -16,12 +16,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
-#include <string.h>
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>

diff --git a/src/libadmin/samples/rxdebug_supported_stats.c b/src/libadmin/samples/rxdebug_supported_stats.c
index 4a2153a2a4fdf28b0eabab1521bd5c31b1757d2f..0169d2db12dcaa94b1f35cd290dec6f9e6029f24 100644 (file)
--- a/src/libadmin/samples/rxdebug_supported_stats.c
+++ b/src/libadmin/samples/rxdebug_supported_stats.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxdebug_version.c b/src/libadmin/samples/rxdebug_version.c
index 2e17d4494f205047f36a0e7ec6e4f2b1820508e5..4721f43e5d008aaec761e1d82f2bb0a630479df6 100644 (file)
--- a/src/libadmin/samples/rxdebug_version.c
+++ b/src/libadmin/samples/rxdebug_version.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxstat_clear_peer.c b/src/libadmin/samples/rxstat_clear_peer.c
index 09b516ac783f1c4f386d45c0e3d406fb54ef61c4..6d9d47d44233105b92bdcd2f970d803dbfa755c8 100644 (file)
--- a/src/libadmin/samples/rxstat_clear_peer.c
+++ b/src/libadmin/samples/rxstat_clear_peer.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxstat_clear_process.c b/src/libadmin/samples/rxstat_clear_process.c
index 661e0b129abd9b8f26d3d26020f28edc8fe5f8c9..d9742a6d767d264fc40e044e7415f69f643b1911 100644 (file)
--- a/src/libadmin/samples/rxstat_clear_process.c
+++ b/src/libadmin/samples/rxstat_clear_process.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxstat_disable_peer.c b/src/libadmin/samples/rxstat_disable_peer.c
index d7058b36d485ba4fc2a47fcf8e051270d281ab59..a18d8ea862f87c995caa3b50e7f3382106cbd468 100644 (file)
--- a/src/libadmin/samples/rxstat_disable_peer.c
+++ b/src/libadmin/samples/rxstat_disable_peer.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxstat_disable_process.c b/src/libadmin/samples/rxstat_disable_process.c
index 02d5ffa36775c988066c7d3309b6a9ed63bddd64..e06c1d2905f38ed2ffab9288c919082b3ee418df 100644 (file)
--- a/src/libadmin/samples/rxstat_disable_process.c
+++ b/src/libadmin/samples/rxstat_disable_process.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxstat_enable_peer.c b/src/libadmin/samples/rxstat_enable_peer.c
index 92ef0a7dcd6f51304da5352c7986062272e81cc5..8d8a1a5692e4d5ee7f565489ac8fc4ccfe859ace 100644 (file)
--- a/src/libadmin/samples/rxstat_enable_peer.c
+++ b/src/libadmin/samples/rxstat_enable_peer.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/samples/rxstat_enable_process.c b/src/libadmin/samples/rxstat_enable_process.c
index 1878c6725e80a38cf15901423e8e5010dcd184c5..4489daa591318805b6e5adbab7fd51178bc1dc66 100644 (file)
--- a/src/libadmin/samples/rxstat_enable_process.c
+++ b/src/libadmin/samples/rxstat_enable_process.c
@@ -16,16 +16,17 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
-#include <rx/rx.h>
-#include <rx/rxstat.h>
 
 #ifdef AFS_DARWIN_ENV
 pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;

diff --git a/src/libadmin/samples/rxstat_get_peer.c b/src/libadmin/samples/rxstat_get_peer.c
index 7c962d7d42d46f6c6a23ac88606b3c64d1c334f4..5c9f05eabb2a8478c1b71c77421778dd5cc03d7f 100644 (file)
--- a/src/libadmin/samples/rxstat_get_peer.c
+++ b/src/libadmin/samples/rxstat_get_peer.c
@@ -16,17 +16,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
-#include <string.h>
-
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_clientAdmin.h>

diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c
index f8dd79757db2afc3a0eb46ac31f4b00fce582490..b8bdc308e75d9a6a17a4a70a56fe95da54716d5b 100644 (file)
--- a/src/libadmin/samples/rxstat_get_process.c
+++ b/src/libadmin/samples/rxstat_get_process.c
@@ -16,16 +16,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
-#include <string.h>
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_clientAdmin.h>

diff --git a/src/libadmin/samples/rxstat_get_version.c b/src/libadmin/samples/rxstat_get_version.c
index 7533c7bccac6d562832412665d222cef58980f06..4d53771bfc3c3791dd07ae7170e40245f477ba1b 100644 (file)
--- a/src/libadmin/samples/rxstat_get_version.c
+++ b/src/libadmin/samples/rxstat_get_version.c
@@ -16,15 +16,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxstat_query_peer.c b/src/libadmin/samples/rxstat_query_peer.c
index 67293a075b7583e387e4aa19e4d1314487b6422f..d52199cd77eaf7ef44c895279874661fa09fa4f4 100644 (file)
--- a/src/libadmin/samples/rxstat_query_peer.c
+++ b/src/libadmin/samples/rxstat_query_peer.c
@@ -16,15 +16,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxstat_query_process.c b/src/libadmin/samples/rxstat_query_process.c
index c6c6da1084ed558c5e962fe3b5c7cc259e52b4c7..eed20910f4a3d8de9f6a2eece960fc06639cdf43 100644 (file)
--- a/src/libadmin/samples/rxstat_query_process.c
+++ b/src/libadmin/samples/rxstat_query_process.c
@@ -16,16 +16,18 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
-#include <rx/rx.h>
-#include <rx/rxstat.h>
+
 
 #ifdef AFS_DARWIN_ENV
 pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;

diff --git a/src/libadmin/test/afscp.c b/src/libadmin/test/afscp.c
index 8560eb8e4af051c275fdd9d7baf3ddd56c66d0bd..819266f188eb44d6beec4d3256f1bc05605280d2 100644 (file)
--- a/src/libadmin/test/afscp.c
+++ b/src/libadmin/test/afscp.c
@@ -13,16 +13,9 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
+#include <roken.h>
 
 #include <pthread.h>
 
@@ -35,6 +28,7 @@
 
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
+
 #include "common.h"
 #include "bos.h"
 #include "client.h"

diff --git a/src/libadmin/test/client.c b/src/libadmin/test/client.c
index 0ca179caa7b4d413e2ea220eff4db76885a13c86..86fb30eaf7c68b6970b09928d0cc64cd51559d08 100644 (file)
--- a/src/libadmin/test/client.c
+++ b/src/libadmin/test/client.c
@@ -33,7 +33,6 @@
 #include <ubik.h>
 #include <ubik_int.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 

diff --git a/src/libadmin/test/kas.c b/src/libadmin/test/kas.c
index f33f4748979785e530950f3e7acc2297e2571ad0..d32c0c0eb16e7f60e3b257ffc25712c4c02e053c 100644 (file)
--- a/src/libadmin/test/kas.c
+++ b/src/libadmin/test/kas.c
@@ -17,7 +17,6 @@
 #include <roken.h>
 
 #include "kas.h"
-#include <time.h>
 
 /*
  * Utility functions

diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c
index 455a68d4587ee1895f24cba68ed0d8cc45183d17..a9c1ab1e0b9b2205bd78b8d5e0a95f0fe23aa7d4 100644 (file)
--- a/src/libadmin/test/vos.c
+++ b/src/libadmin/test/vos.c
@@ -16,14 +16,7 @@
 
 #include <roken.h>
 
-#ifndef AFS_NT40_ENV
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <afs/afsutil.h>
-#include <unistd.h>
-#endif
-
 
 #include "vos.h"
 

diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 32e6512ba8a7fa552b0ca5454de88a1f3d446b2d..934e5eb7fd5d4ec5882f1c27143e793faf79918f 100644 (file)
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -9,30 +9,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <io.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#endif
-#include "afs_vosAdmin.h"
-#include "../adminutil/afs_AdminInternal.h"
+
 #include <afs/vlserver.h>
 #include <afs/volser.h>
 #include <afs/volint.h>
 
+#include "afs_vosAdmin.h"
+#include "../adminutil/afs_AdminInternal.h"
+
 /* File descriptors are HANDLE's on NT. The following typedef helps catch
  * type errors. Duplicated from vol/ihandle.h
  */

diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c
index 4f71d8804bc8220d6bd1c596f24f8638ceb0b1e1..85b91335eb885d5909db413dfdfc714141cb683c 100644 (file)
--- a/src/libadmin/vos/lockprocs.c
+++ b/src/libadmin/vos/lockprocs.c
@@ -13,7 +13,6 @@
 #include <roken.h>
 
 #include "lockprocs.h"
-#include <string.h>
 
 /* Finds an index in VLDB entry that matches the volume type, server, and partition.
  * If type is zero, will match first index of ANY type (RW, BK, or RO).

diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c
index 9f18ab6def158636d44b46b295cc8ab45b9762e0..1d767f9c3acba34fe823a248c125d404efb58892 100644 (file)
--- a/src/libadmin/vos/vosutils.c
+++ b/src/libadmin/vos/vosutils.c
@@ -12,11 +12,11 @@
 
 #include <roken.h>
 
+#include <afs/afs_AdminErrors.h>
+
 #include "vosutils.h"
 #include "vsprocs.h"
 #include "lockprocs.h"
-#include <afs/afs_AdminErrors.h>
-#include <string.h>
 
 /*
  * VLDB entry conversion routines.

diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c
index b2d40bb0521fa4c35e51450a0e9bd163f7768f33..6c01a6264cf8016ad23808ed52e43831d0aeb01f 100644 (file)
--- a/src/libadmin/vos/vsprocs.c
+++ b/src/libadmin/vos/vsprocs.c
@@ -23,19 +23,13 @@
 
 #include <roken.h>
 
+#include <afs/afs_AdminErrors.h>
+
 #include "vsprocs.h"
 #include "vosutils.h"
 #include "lockprocs.h"
 #include "../adminutil/afs_AdminInternal.h"
-#include <afs/afs_AdminErrors.h>
 #include "afs_vosAdmin.h"
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#endif
 
 static afs_int32 GroupEntries(struct rx_connection *server, volintInfo * pntr, afs_int32 count,
              struct qHead *myQueue, afs_int32 apart);