pthreaded servers: 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: I6e431eb16d35fd9bd4aa07e7a9b3e47ca7281fab
Reviewed-on: http://gerrit.openafs.org/4410
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/tsalvaged/salvsync-debug.c b/src/tsalvaged/salvsync-debug.c
index 6c7d34b..58a1796 100644 (file)
--- a/src/tsalvaged/salvsync-debug.c
+++ b/src/tsalvaged/salvsync-debug.c
@@ -18,33 +18,17 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <errno.h>
+#include <roken.h>
+
 #ifdef AFS_NT40_ENV
-#include <io.h>
 #include <WINNT/afsevent.h>
-#else
-#include <sys/param.h>
-#include <sys/file.h>
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
 #endif
 
-#include <roken.h>
-
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include <afs/afs_assert.h>
 #include <afs/dir.h>
 
-#include <fcntl.h>
-
 #ifndef AFS_NT40_ENV
 #include <afs/osi_inode.h>
 #endif

diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c
index 8c104a5..83a0cee 100644 (file)
--- a/src/tviced/serialize_state.c
+++ b/src/tviced/serialize_state.c
@@ -17,19 +17,6 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <stdlib.h>            /* for malloc() */
-#include <time.h>              /* ANSI standard location for time stuff */
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <io.h>
-#else
-#include <sys/time.h>
-#include <sys/file.h>
-#endif
-#include <sys/stat.h>
-
 #include <afs/stds.h>
 #include <afs/afs_assert.h>
 
@@ -49,7 +36,6 @@
 #include <afs/afsutil.h>
 #include <rx/rx.h>
 #include <afs/cellconfig.h>
-#include <stdlib.h>
 
 #include "../viced/viced_prototypes.h"
 #include "../viced/viced.h"

diff --git a/src/tviced/state_analyzer.c b/src/tviced/state_analyzer.c
index 2185013..219ea27 100644 (file)
--- a/src/tviced/state_analyzer.c
+++ b/src/tviced/state_analyzer.c
@@ -16,18 +16,12 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/file.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <time.h>
-#include <string.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
+#include <sys/mman.h>
+
 #include <rx/xdr.h>
 #include <afs/afs_assert.h>
 #include <lwp.h>
@@ -48,18 +42,11 @@
 #include <afs/afsutil.h>
 #include <rx/rx.h>
 #include <afs/cellconfig.h>
-#include <stdlib.h>
 #include "../util/afsutil_prototypes.h"
 #include "../viced/viced.h"
 #include "../viced/host.h"
 #include "../viced/callback.h"
 #include "serialize_state.h"
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
 
 #ifndef AFS_DEMAND_ATTACH_FS
 int