Tidy up UKERNEL includes

UKERNEL is just another userspace build - there's no need to
maintain completely separate header file lists in each object file
for "userspace" and "ukernel". Tidy this up to improve the
readability of these sections of code.

Change-Id: I69f476a0b8aae1204cd4207c7c656ec7e07184df
Reviewed-on: http://gerrit.openafs.org/1758
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/auth/authcon.c b/src/auth/authcon.c
index 36b0670..61fd731 100644 (file)
--- a/src/auth/authcon.c
+++ b/src/auth/authcon.c
@@ -8,27 +8,8 @@
  */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
-
 
-#if defined(UKERNEL)
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include "afs/stds.h"
-#include "afs/pthread_glock.h"
-#include "rx/rxkad.h"
-#include "rx/rx.h"
-#include "afs/cellconfig.h"
-#include "afs/keys.h"
-#include "afs/auth.h"
-#include "afs/pthread_glock.h"
-#include "des.h"
-#include "des_prototypes.h"
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <afs/pthread_glock.h>
 #include <sys/types.h>
@@ -49,7 +30,6 @@
 #include "cellconfig.h"
 #include "keys.h"
 #include "auth.h"
-#endif /* defined(UKERNEL) */
 
 /* return a null security object if nothing else can be done */
 static afs_int32

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index f20173f..4c21918 100644 (file)
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -13,14 +13,6 @@
 
 #include <afs/stds.h>
 #include <afs/pthread_glock.h>
-#ifdef UKERNEL
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include "des/des.h"
-#include "rx/rxkad.h"
-#include <netdb.h>
-#include <ctype.h>
-#else /* UKERNEL */
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
@@ -54,7 +46,7 @@
 #endif
 #include <rx/rxkad.h>
 #include <rx/rx.h>
-#endif /* UKERNEL */
+
 #include <afs/afsutil.h>
 #include "cellconfig.h"
 #include "keys.h"

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 0620157..bb885be 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -10,30 +10,11 @@
 /* ticket caching code */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
-
 
 #if defined(UKERNEL)
-#include "afs/sysincludes.h"
 #include "afsincludes.h"
-#include "afs/stds.h"
-#include "afs/pthread_glock.h"
-#include "afs/vice.h"
-#include "afs/auth.h"
-#include "afs/venus.h"
-#include "afs/pthread_glock.h"
-#include "afs/dirpath.h"
-#include <ctype.h>
-
-#if !defined(min)
-#define min(a,b) ((a)<(b)?(a):(b))
-#endif /* !defined(min) */
-
-#else /* defined(UKERNEL) */
+#endif
 
 #ifdef AFS_SUN5_ENV
 #include <unistd.h>
@@ -69,9 +50,10 @@
 #include <afs/auth.h>
 #include <afs/venus.h>
 #include <afs/afsutil.h>
-#include <afs/sys_prototypes.h>
 
-#endif /* defined(UKERNEL) */
+#if !defined(UKERNEL)
+#include <afs/sys_prototypes.h>
+#endif
 
 #if defined(LINUX_KEYRING_SUPPORT) && defined(HAVE_SESSION_TO_PARENT)
 #include <sys/syscall.h>

diff --git a/src/des/des.h b/src/des/des.h
index 2b4b768..747caad 100644 (file)
--- a/src/des/des.h
+++ b/src/des/des.h
@@ -11,11 +11,7 @@
 #ifndef DES_DEFS
 #define DES_DEFS
 
-#if defined(UKERNEL)
-#include "des/mit-cpyright.h"
-#else /* defined(UKERNEL) */
 #include "mit-cpyright.h"
-#endif /* defined(UKERNEL) */
 
 typedef unsigned char des_cblock[8];   /* crypto-block size */
 /* Key schedule */

diff --git a/src/fsint/afsaux.c b/src/fsint/afsaux.c
index b5f85bd..bbfda38 100644 (file)
--- a/src/fsint/afsaux.c
+++ b/src/fsint/afsaux.c
@@ -8,11 +8,7 @@
  */
 
 #include <afsconfig.h>
-#ifdef KERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
 
 #ifdef KERNEL

diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index de499d3..34e56a6 100644 (file)
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -10,11 +10,7 @@
 /* These routines provide a convenient interface to the AuthServer. */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
 #ifdef IGNORE_SOME_GCC_WARNINGS
 # pragma GCC diagnostic warning "-Wstrict-prototypes"
@@ -23,25 +19,6 @@
 
 #define UBIK_LEGACY_CALLITER 1
 
-#if defined(UKERNEL)
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include "afs_usrops.h"
-#include "afs/stds.h"
-#include "afs/pthread_glock.h"
-#include "des.h"
-#include "des_prototypes.h"
-#include "rx/rxkad.h"
-#include "afs/cellconfig.h"
-#include "ubik.h"
-#include "afs/auth.h"
-#include "afs/afsutil.h"
-
-#include "afs/kauth.h"
-#include "afs/kautils.h"
-#include "afs/pthread_glock.h"
-
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <afs/pthread_glock.h>
 #include <sys/types.h>
@@ -65,8 +42,10 @@
 #include <afs/afsutil.h>
 #include "kauth.h"
 #include "kautils.h"
-#endif /* defined(UKERNEL) */
 
+#ifdef UKERNEL
+#include "afs_usrops.h"
+#endif
 
 static struct afsconf_dir *conf = 0;
 static struct afsconf_cell explicit_cell_server_list;

diff --git a/src/kauth/client.c b/src/kauth/client.c
index ffd6875..7db7ba0 100644 (file)
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -8,31 +8,8 @@
  */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
-
 
-#if defined(UKERNEL)
-#if defined(HAVE_UNISTD_H) && !defined(__USE_XOPEN)
-#define __USE_XOPEN
-#endif
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include "afs/stds.h"
-#include "afs/pthread_glock.h"
-#include "afs/cellconfig.h"
-#include "afs/afsutil.h"
-#include "afs/auth.h"
-#include "afs/kauth.h"
-#include "afs/kautils.h"
-#include "afs/pthread_glock.h"
-#include "des/des.h"
-#include "des/des_prototypes.h"
-
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <afs/pthread_glock.h>
 #include <stdio.h>
@@ -54,7 +31,6 @@
 #include <des_prototypes.h>
 #include "kauth.h"
 #include "kautils.h"
-#endif /* defined(UKERNEL) */
 
 
 /* This defines the Andrew string_to_key function.  It accepts a password

diff --git a/src/kauth/kaaux.c b/src/kauth/kaaux.c
index bf673a0..5f83d22 100644 (file)
--- a/src/kauth/kaaux.c
+++ b/src/kauth/kaaux.c
@@ -11,13 +11,8 @@
 #include <afs/param.h>
 
 
-#if defined(UKERNEL)
-#include "rx/xdr.h"
-#include "afs/kauth.h"
-#else /* defined(UKERNEL) */
 #include <rx/xdr.h>
 #include <afs/kauth.h>
-#endif /* defined(UKERNEL) */
 
 #define MAXBS  2048            /* try to avoid horrible allocs */
 

diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c
index 959b909..bcd88dc 100644 (file)
--- a/src/kauth/kalocalcell.c
+++ b/src/kauth/kalocalcell.c
@@ -8,26 +8,8 @@
  */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
-
-#if defined(UKERNEL)
-#include "afs/pthread_glock.h"
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include "afs_usrops.h"
-#include "afs/cellconfig.h"
-#include "afs/pthread_glock.h"
-#include "rx/xdr.h"
-#include "rx/rx.h"
-#include "afs/kauth.h"
-#include "afs/kautils.h"
-#include "afs/afsutil.h"
-#else /* defined(UKERNEL) */
 #include <afs/pthread_glock.h>
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
@@ -42,7 +24,10 @@
 #include "kauth.h"
 #include "kautils.h"
 #include <afs/afsutil.h>
-#endif /* defined(UKERNEL) */
+
+#ifdef UKERNEL
+#include "afs_usrops.h"
+#endif
 
 /* This is a utility routine that many parts of kauth use but it invokes the
    afsconf package so its best to have it in a separate .o file to make the

diff --git a/src/kauth/kautils.p.h b/src/kauth/kautils.p.h
index 32d491a..3504aa7 100644 (file)
--- a/src/kauth/kautils.p.h
+++ b/src/kauth/kautils.p.h
@@ -19,7 +19,6 @@
 #ifndef __KAUTILS__
 #define __KAUTILS__
 
-#if !defined(UKERNEL)
 #include <des.h>
 #include <afs/auth.h>
 
@@ -39,12 +38,6 @@
 #include <afs/cellconfig.h>
 #include <afs/afsutil.h>
 
-#else
-#include "ubik.h"
-#include "afs/auth.h"
-#include "afs/cellconfig.h"
-#endif /* !defined(UKERNEL) */
-
 
 #define KA_TIMESTR_LEN 30
 #define Date afs_uint32

diff --git a/src/kauth/token.c b/src/kauth/token.c
index 07e7978..e2e7c5e 100644 (file)
--- a/src/kauth/token.c
+++ b/src/kauth/token.c
@@ -12,27 +12,12 @@
    from the AuthServer. */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
+#ifdef UKERNEL
+# include "afsincludes.h"
+#endif
 
-#if defined(UKERNEL)
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include "afs/stds.h"
-#include "rx/xdr.h"
-#include "afs/pthread_glock.h"
-#include "afs/lock.h"
-#include "ubik.h"
-#include "afs/kauth.h"
-#include "afs/kautils.h"
-#include "afs/auth.h"
-#include "afs/pthread_glock.h"
-#include "afs/afsutil.h"
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <sys/types.h>
 #include <rx/xdr.h>
@@ -53,7 +38,6 @@
 #include "kauth.h"
 #include "kautils.h"
 #include <afs/auth.h>
-#endif /* defined(UKERNEL) */
 
 
 afs_int32

diff --git a/src/kauth/user.c b/src/kauth/user.c
index 380b39f..9f002a7 100644 (file)
--- a/src/kauth/user.c
+++ b/src/kauth/user.c
@@ -11,34 +11,9 @@
  * package. */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
 
-#if defined(UKERNEL)
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include "afs/stds.h"
-#include "afs/com_err.h"
-#include "afs/cellconfig.h"
-#include "afs/auth.h"
-#include "afs/ptint.h"
-#include "afs/pterror.h"
-#include "afs/ptserver.h"
-#include "rx/rx.h"
-#include "rx/rx_globals.h"
-#include "rx/rxkad.h"
-#include "afs/kauth.h"
-#include "afs/kautils.h"
-#include "afs/afsutil.h"
-#include "afs/ptuser.h"
-#include "des.h"
-#include "des_prototypes.h"
-#include "afs/ktc.h"
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <signal.h>
 #include <afs/com_err.h>
@@ -57,7 +32,11 @@
 #include <afs/ptuser.h>
 #include <afs/ptserver.h>
 #include <afs/afsutil.h>
+
+#ifndef UKERNEL
 #include <afs/sys_prototypes.h>
+#endif
+
 #include <des.h>
 #include <des_prototypes.h>
 #include <rx/rx.h>
@@ -66,7 +45,6 @@
 #include "kauth.h"
 #include "kautils.h"
 #include <afs/ktc.h>
-#endif /* defined(UKERNEL) */
 
 
 afs_int32

diff --git a/src/ptserver/ptclient.h b/src/ptserver/ptclient.h
index 429ba91..65e45ac 100644 (file)
--- a/src/ptserver/ptclient.h
+++ b/src/ptserver/ptclient.h
@@ -7,16 +7,9 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#if defined(UKERNEL)
-#include "afs/lock.h"
-#include "ubik.h"
-#include "afs/ptint.h"
-#include "afs/ptserver.h"
-#else /* defined(UKERNEL) */
 #include <lock.h>
 #include <ubik.h>
 #include "ptint.h"
 #include "ptserver.h"
-#endif /* defined(UKERNEL) */
 
 #define pr_ErrorMsg afs_error_message

diff --git a/src/ptserver/ptserver.h b/src/ptserver/ptserver.h
index 2e777ab..4742dbb 100644 (file)
--- a/src/ptserver/ptserver.h
+++ b/src/ptserver/ptserver.h
@@ -7,11 +7,7 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#if defined(UKERNEL)
-#include "afs/ptint.h"
-#else /* defined(UKERNEL) */
 #include "ptint.h"
-#endif /* defined(UKERNEL) */
 
 #define        PRSRV           73
 

diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
index 12054ab..d59878e 100644 (file)
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -8,28 +8,8 @@
  */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
-
 
-#if defined(UKERNEL)
-#include "afs/sysincludes.h"
-#include "afs_usrops.h"
-#include "afsincludes.h"
-#include "afs/stds.h"
-#include "rx/rx.h"
-#include "rx/xdr.h"
-#include "afs/auth.h"
-#include "afs/cellconfig.h"
-#include "afs/afsutil.h"
-#include "afs/ptclient.h"
-#include "afs/ptuser.h"
-#include "afs/pterror.h"
-#include "afs/com_err.h"
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <ctype.h>
 #include <sys/types.h>
@@ -50,8 +30,10 @@
 #include "ptclient.h"
 #include "ptuser.h"
 #include "pterror.h"
-#endif /* defined(UKERNEL) */
 
+#ifdef UKERNEL
+# include "afs_usrops.h"
+#endif
 
 struct ubik_client *pruclient = 0;
 static afs_int32 lastLevel;    /* security level pruclient, if any */

diff --git a/src/rx/rx_conncache.c b/src/rx/rx_conncache.c
index 5a94f33..887d9e9 100644 (file)
--- a/src/rx/rx_conncache.c
+++ b/src/rx/rx_conncache.c
@@ -12,23 +12,12 @@
  */
 
 #include <afsconfig.h>
-#ifdef UKERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
-
 
-#ifdef UKERNEL
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include "rx/rx.h"
-#else /* ! UKERNEL */
 #include <sys/types.h>
 #include <errno.h>
 #include <assert.h>
 #include "rx.h"
-#endif /* UKERNEL */
 
 /*
  * We initialize rxi_connectionCache at compile time, so there is no

diff --git a/src/rxkad/crc.c b/src/rxkad/crc.c
index e9f5d78..de694bd 100644 (file)
--- a/src/rxkad/crc.c
+++ b/src/rxkad/crc.c
@@ -34,23 +34,9 @@
 /* RCSID("$Heimdal: crc.c,v 1.9 2000/08/03 01:45:14 assar Exp $"); */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "../afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
 
-#if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../rx/xdr.h"
-#include "../rx/rx.h"
-#include "../des/des.h"
-#include "../afs/lifetimes.h"
-#include "../afs/rxkad.h"
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
@@ -64,7 +50,6 @@
 #include <rx/rxkad.h>
 #include <des.h>
 #include "lifetimes.h"
-#endif /* defined(UKERNEL) */
 
 static u_long table[256];
 

diff --git a/src/rxkad/md4.c b/src/rxkad/md4.c
index 1738b90..fd574fb 100644 (file)
--- a/src/rxkad/md4.c
+++ b/src/rxkad/md4.c
@@ -32,22 +32,8 @@
  */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "../afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
-#if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../rx/xdr.h"
-#include "../rx/rx.h"
-#include "../des/des.h"
-#include "../afs/lifetimes.h"
-#include "../afs/rxkad.h"
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
@@ -61,14 +47,6 @@
 #include <rx/rxkad.h>
 #include <des.h>
 #include "lifetimes.h"
-#endif /* defined(UKERNEL) */
-
-
-
-
-
-
-
 #include "md4.h"
 #include "hash.h"
 

diff --git a/src/rxkad/md5.c b/src/rxkad/md5.c
index 0910063..8e34522 100644 (file)
--- a/src/rxkad/md5.c
+++ b/src/rxkad/md5.c
@@ -32,22 +32,8 @@
  */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "../afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
-#if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../rx/xdr.h"
-#include "../rx/rx.h"
-#include "../des/des.h"
-#include "../afs/lifetimes.h"
-#include "../afs/rxkad.h"
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
@@ -60,13 +46,6 @@
 #include <rx/rxkad.h>
 #include <des.h>
 #include "lifetimes.h"
-#endif /* defined(UKERNEL) */
-
-
-
-
-
-
 
 #include "md5.h"
 #include "hash.h"

diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c
index 10cde7b..a98fec2 100644 (file)
--- a/src/rxkad/ticket.c
+++ b/src/rxkad/ticket.c
@@ -8,25 +8,10 @@
  */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
 #include <stdio.h>
 
-#if defined(UKERNEL)
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include "afs/stds.h"
-#include "rx/xdr.h"
-#include "rx/rx.h"
-#include "rxkad/lifetimes.h"
-#include "des.h"
-#include "des/des_prototypes.h"
-#include "rx/rxkad.h"
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
@@ -41,7 +26,6 @@
 #include <rx/rx.h>
 #include "lifetimes.h"
 #include "rxkad.h"
-#endif /* defined(UKERNEL) */
 
 /* This union is used to insure we allocate enough space for a key
  * schedule even if we are linked against a library that uses OpenSSL's

diff --git a/src/rxkad/ticket5.c b/src/rxkad/ticket5.c
index da90081..3dea140 100644 (file)
--- a/src/rxkad/ticket5.c
+++ b/src/rxkad/ticket5.c
@@ -55,25 +55,12 @@
  */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "../afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
 #ifdef IGNORE_SOME_GCC_WARNINGS
 # pragma GCC diagnostic warning "-Wimplicit-function-declaration"
 #endif
 
-#if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../rx/xdr.h"
-#include "../rx/rx.h"
-#include "../afs/lifetimes.h"
-#include "../afs/rxkad.h"
-#else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
@@ -86,7 +73,6 @@
 #include <rx/rx.h>
 #include "lifetimes.h"
 #include "rxkad.h"
-#endif /* defined(UKERNEL) */
 
 #include "v5gen-rewrite.h"
 #include "asn1-common.h"

diff --git a/src/rxstat/rxstat.c b/src/rxstat/rxstat.c
index 9a30a0a..bfb7898 100644 (file)
--- a/src/rxstat/rxstat.c
+++ b/src/rxstat/rxstat.c
@@ -7,28 +7,18 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifdef UKERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 #include <afsconfig.h>
 
 
-#ifdef UKERNEL
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
-#include <rx/rxstat.h>
-#else /* UKERNEL */
 #include <afs/stds.h>
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-#ifdef KERNEL
+#if defined(KERNEL) && !defined(UKERNEL)
 #include "sys/errno.h"
-#else /* KERNEL */
+#else /* KERNEL && !UKERNEL */
 #include <errno.h>
-#endif /* KERNEL */
-#endif /* UKERNEL */
+#endif /* KERNEL && !UKERNEL */
 
 /*
  * This file creates a centralized mechanism for implementing the rpc

diff --git a/src/ubik/ubik.p.h b/src/ubik/ubik.p.h
index fcfd460..5f9f48f 100644 (file)
--- a/src/ubik/ubik.p.h
+++ b/src/ubik/ubik.p.h
@@ -36,11 +36,7 @@
 
 #endif
 
-#if defined(UKERNEL)
-#include "ubik_int.h"
-#else /* defined(UKERNEL) */
 #include <ubik_int.h>
-#endif /* defined(UKERNEL) */
 
 /*! \name ubik_trans types */
 #define        UBIK_READTRANS      0

diff --git a/src/ubik/ubikclient.c b/src/ubik/ubikclient.c
index b185db7..d1af899 100644 (file)
--- a/src/ubik/ubikclient.c
+++ b/src/ubik/ubikclient.c
@@ -8,29 +8,16 @@
  */
 
 #include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
 #ifdef IGNORE_SOME_GCC_WARNINGS
 # pragma GCC diagnostic warning "-Wstrict-prototypes"
 #endif
 
-#if defined(UKERNEL)
-#include "afs/sysincludes.h"
+#ifdef UKERNEL
 #include "afsincludes.h"
-#include "afs/stds.h"
-#include "rx/xdr.h"
-#include "rx/rx.h"
-#include "afs/lock.h"
-#include "afs/rxgen_consts.h"
-#define UBIK_LEGACY_CALLITER 1
-#include "ubik.h"
-#include "afs/pthread_glock.h"
-#include <netdb.h>
-#else /* defined(UKERNEL) */
+#endif
+
 #include <afs/stds.h>
 #include <afs/pthread_glock.h>
 #include <stdio.h>
@@ -46,8 +33,8 @@
 #include <netinet/in.h>
 #endif
 #include <afs/rxgen_consts.h>
+#define UBIK_LEGACY_CALLITER
 #include "ubik.h"
-#endif /* defined(UKERNEL) */
 
 #ifdef HAVE_STDINT_H
 # include <stdint.h>

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index 3aa037b..18b7b72 100644 (file)
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -162,9 +162,7 @@ extern size_t strlcat(char *dst, const char *src, size_t siz);
 extern size_t strlcpy(char *dst, const char *src, size_t siz);
 #endif
 
-#ifndef UKERNEL
-#include "afs/ktime.h"
-#endif
+#include <afs/ktime.h>
 #include "afsutil_prototypes.h"
 
 #endif /* _AFSUTIL_H_ */

diff --git a/src/util/hostparse.c b/src/util/hostparse.c
index 1ae412e..e090323 100644 (file)
--- a/src/util/hostparse.c
+++ b/src/util/hostparse.c
@@ -15,12 +15,6 @@
 #include <afs/param.h>
 
 
-#ifdef UKERNEL
-#include "afs/sysincludes.h"
-#include "afs/afsutil.h"
-#include <netdb.h>
-#include <ctype.h>
-#else /* UKERNEL */
 #include <stdio.h>
 #include <sys/types.h>
 #include <stdlib.h>
@@ -37,7 +31,6 @@
 #include <string.h>
 #include <errno.h>
 #include "afsutil.h"
-#endif /* UKERNEL */
 
 
 /* also parse a.b.c.d addresses */