From 4659c5c9924171525454cd2a2280ed9370476998 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun, 27 Mar 2011 22:34:01 +0100
Subject: [PATCH] rxkad: Tidy header includes

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

Change-Id: I7e07f98802ad059052d528a57278c971e857e074
Reviewed-on: http://gerrit.openafs.org/4407
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/rxkad/bg-fcrypt.c    | 18 ++----------------
 src/rxkad/crc.c          |  9 +--------
 src/rxkad/crypt_conn.c   | 21 +++------------------
 src/rxkad/fc_test.c      |  8 +++-----
 src/rxkad/fcrypt.c       | 19 +++----------------
 src/rxkad/rxkad_client.c | 29 +++++------------------------
 src/rxkad/rxkad_common.c | 31 ++++++-------------------------
 src/rxkad/rxkad_server.c | 15 +++------------
 src/rxkad/tcrypt.c       |  5 ++---
 src/rxkad/ticket.c       | 11 ++---------
 src/rxkad/ticket5.c      | 11 +++--------
 11 files changed, 33 insertions(+), 144 deletions(-)

diff --git a/src/rxkad/bg-fcrypt.c b/src/rxkad/bg-fcrypt.c
index 687c267..4aefaee 100644
--- a/src/rxkad/bg-fcrypt.c
+++ b/src/rxkad/bg-fcrypt.c
@@ -31,39 +31,25 @@
  * SUCH DAMAGE.
  */
 #include <afsconfig.h>
-#ifdef KERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#include <roken.h>
-#endif
-
+#include <afs/stds.h>
 
 #define DEBUG 0
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "afs/stds.h"
 #include "h/types.h"
 #if !defined(AFS_LINUX20_ENV) && !defined(AFS_OBSD_ENV)
 #include "netinet/in.h"
 #endif
 #else /* UKERNEL */
 #include "afs/sysincludes.h"
-#include "afs/stds.h"
 #endif /* UKERNEL */
 #ifdef AFS_LINUX22_ENV
 #include <asm/byteorder.h>
 #endif
 
 #else /* KERNEL */
-
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
+#include <roken.h>
 #include <rx/rx.h>
 #endif /* KERNEL */
 
diff --git a/src/rxkad/crc.c b/src/rxkad/crc.c
index cadaf74..4ff6f80 100644
--- a/src/rxkad/crc.c
+++ b/src/rxkad/crc.c
@@ -35,17 +35,10 @@
 
 #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>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
diff --git a/src/rxkad/crypt_conn.c b/src/rxkad/crypt_conn.c
index ff7a461..20b91bf 100644
--- a/src/rxkad/crypt_conn.c
+++ b/src/rxkad/crypt_conn.c
@@ -12,39 +12,24 @@
 
 
 #include <afsconfig.h>
-#ifdef KERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#include <roken.h>
-#endif
-
+#include <afs/stds.h>
 
 #ifdef KERNEL
-#include "afs/stds.h"
 #ifndef UKERNEL
 #include "h/types.h"
 #if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_XBSD_ENV)
 #include "h/systm.h"
 #endif
-#include "rx/rx.h"
 #include "netinet/in.h"
 #else /* !UKERNEL */
 #include "afs/sysincludes.h"
-#include "rx/rx.h"
 #endif /* !UKERNEL */
 #else /* !KERNEL */
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <string.h>
-#include <rx/rx.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
+#include <roken.h>
 #endif /* KERNEL */
 
+#include <rx/rx.h>
 #include <rx/rxkad_stats.h>
 #include "private_data.h"
 #define XPRT_RXKAD_CRYPT
diff --git a/src/rxkad/fc_test.c b/src/rxkad/fc_test.c
index 823b1e9..bff1363 100644
--- a/src/rxkad/fc_test.c
+++ b/src/rxkad/fc_test.c
@@ -33,6 +33,9 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+
+#include <roken.h>
+
 #include "rxkad.h"
 #include <rx/rx.h>
 #include "private_data.h"
@@ -44,11 +47,6 @@
 typedef afs_int32 int32;
 typedef afs_uint32 u_int32;
 
-#include <stdio.h>
-#include <string.h>
-
-#include <time.h>
-
 const char the_quick[] = "The quick brown fox jumps over the lazy dogs.\0\0";
 
 const unsigned char key1[8] =
diff --git a/src/rxkad/fcrypt.c b/src/rxkad/fcrypt.c
index e6afb20..723f781 100644
--- a/src/rxkad/fcrypt.c
+++ b/src/rxkad/fcrypt.c
@@ -13,17 +13,12 @@
 
 
 #include <afsconfig.h>
-#ifdef KERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
-
+#include <afs/stds.h>
 
 #define DEBUG 0
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "afs/stds.h"
 #if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV)
 #include "h/systm.h"
 #endif
@@ -33,23 +28,15 @@
 #endif
 #else /* UKERNEL */
 #include "afs/sysincludes.h"
-#include "afs/stds.h"
 #endif /* UKERNEL */
 #ifdef AFS_LINUX22_ENV
 #include <asm/byteorder.h>
 #endif
 
 #else /* KERNEL */
+# include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <rx/rx.h>
+# include <rx/rx.h>
 #endif /* KERNEL */
 
 #include "sboxes.h"
diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c
index 24c06d7..1e36c16 100644
--- a/src/rxkad/rxkad_client.c
+++ b/src/rxkad/rxkad_client.c
@@ -12,16 +12,10 @@
  * make any use of DES. */
 
 #include <afsconfig.h>
-#ifdef KERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#include <roken.h>
-#endif
-
+#include <afs/stds.h>
 
 #ifdef KERNEL
-#include "afs/stds.h"
 #ifndef UKERNEL
 #include "h/types.h"
 #include "h/time.h"
@@ -37,29 +31,16 @@
 #else /* !UKERNEL */
 #include "afs/sysincludes.h"
 #endif /* !UKERNEL */
-#ifndef AFS_LINUX22_ENV
-#include "rpc/types.h"
-#include "rx/xdr.h"
-#endif
-#include "rx/rx.h"
 #else /* ! KERNEL */
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <time.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-#include <rx/rx.h>
-#include <rx/xdr.h>
+#include <roken.h>
 #ifdef AFS_PTHREAD_ENV
 #include "rx/rxkad.h"
 #endif /* AFS_PTHREAD_ENV */
 #endif /* KERNEL */
 
+#include <rx/rx.h>
+#include <rx/xdr.h>
+
 #include "stats.h"
 #include "private_data.h"
 #define XPRT_RXKAD_CLIENT
diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c
index ef1e528..e4b01d3 100644
--- a/src/rxkad/rxkad_common.c
+++ b/src/rxkad/rxkad_common.c
@@ -10,12 +10,8 @@
 /* The rxkad security object.  Routines used by both client and servers. */
 
 #include <afsconfig.h>
-#ifdef KERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#include <roken.h>
-#endif
+#include <afs/stds.h>
 
 #ifdef AFS_SUN59_ENV
 #include <sys/time_impl.h>
@@ -23,10 +19,8 @@
 
 #define INCLUDE_RXKAD_PRIVATE_DECLS
 
-
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "afs/stds.h"
 #include "afs/afs_osi.h"
 #if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV)
 #include "h/systm.h"
@@ -36,34 +30,21 @@
 #endif
 #include "h/types.h"
 #include "h/time.h"
-#ifndef AFS_LINUX22_ENV
-#include "rpc/types.h"
-#include "rx/xdr.h"
-#endif /* AFS_LINUX22_ENV */
 #else /* !UKERNEL */
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #endif /* !UKERNEL */
-#include "rx/rx.h"
-
 #else /* KERNEL */
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <string.h>
-#include <time.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#ifdef AFS_PTHREAD_ENV
+#include <roken.h>
+#if defined(AFS_NT40_ENV) && defined(AFS_PTHREAD_ENV)
 #define RXKAD_STATS_DECLSPEC __declspec(dllexport)
 #endif
-#else
-#include <netinet/in.h>
-#endif
-#include <rx/rx.h>
-#include <rx/xdr.h>
 #include <afs/afsutil.h>
 #endif /* KERNEL */
 
+#include <rx/rx.h>
+#include <rx/xdr.h>
+
 #include "stats.h"
 #include "private_data.h"
 #define XPRT_RXKAD_COMMON
diff --git a/src/rxkad/rxkad_server.c b/src/rxkad/rxkad_server.c
index 91c74dc..0b2745a 100644
--- a/src/rxkad/rxkad_server.c
+++ b/src/rxkad/rxkad_server.c
@@ -13,27 +13,18 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #if (defined(AFS_AIX_ENV) && defined(KERNEL) && !defined(UKERNEL)) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV)
 #include <sys/systm.h>
 #endif
-#include <time.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
+
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <afs/afsutil.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+
 #include "stats.h"
 #include "private_data.h"
 #define XPRT_RXKAD_SERVER
diff --git a/src/rxkad/tcrypt.c b/src/rxkad/tcrypt.c
index 9145660..71d4784 100644
--- a/src/rxkad/tcrypt.c
+++ b/src/rxkad/tcrypt.c
@@ -9,11 +9,10 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <netinet/in.h>
 #include "fcrypt.h"
 
 
diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c
index 774a7f2..d733ac1 100644
--- a/src/rxkad/ticket.c
+++ b/src/rxkad/ticket.c
@@ -9,20 +9,13 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
+
 #include "lifetimes.h"
 #include "rxkad.h"
 
diff --git a/src/rxkad/ticket5.c b/src/rxkad/ticket5.c
index f7bf5dd..a709d5d 100644
--- a/src/rxkad/ticket5.c
+++ b/src/rxkad/ticket5.c
@@ -56,6 +56,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
@@ -63,18 +64,12 @@
 # pragma GCC diagnostic warning "-Wimplicit-function-declaration"
 #endif
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
+
 #include <hcrypto/md4.h>
 #include <hcrypto/md5.h>
+
 #include "lifetimes.h"
 #include "rxkad.h"
 
-- 
1.9.4