openbsd-20021119

[openafs.git] / src / fsint / afsaux.c

diff --git a/src/fsint/afsaux.c b/src/fsint/afsaux.c
index a97394d..1f6473b 100644 (file)
--- a/src/fsint/afsaux.c
+++ b/src/fsint/afsaux.c
@@ -7,22 +7,28 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef lint
+#include <afsconfig.h>
+#ifdef KERNEL
+#include "afs/param.h"
+#else
+#include <afs/param.h>
 #endif
+
+RCSID("$Header$");
+
 #ifdef KERNEL
-#include "../afs/param.h"
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../rx/xdr.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "rx/xdr.h"
 #else /* defined(UKERNEL) */
-#if defined(AFS_ALPHA_ENV) || defined(AFS_LINUX20_ENV)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#if defined(AFS_ALPHA_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #else
-#include "../h/types.h"
-#include "../rpc/types.h"
-#include "../rpc/xdr.h"
+#include "h/types.h"
+#include "rpc/types.h"
+#include "rx/xdr.h"
 #endif
 #if !defined(AFS_ALPHA_ENV)
 #ifndef        XDR_GETINT32
@@ -32,24 +38,19 @@
 #define        XDR_PUTINT32    XDR_PUTLONG
 #endif
 #endif
-#ifndef AFS_LINUX22_ENV
-#include "../rpc/auth.h"
-#endif
 #endif /* defined(UKERNEL) */
-#include "../afsint/afsint.h"
+#include "afsint.h"
 #else /* KERNEL */
-# include <afs/param.h>
 # include <rx/xdr.h>
 # include "afsint.h"
 #endif /* KERNEL */
 
-#define MAXBS  2048            /* try to avoid horrible allocs */
-static afs_int32 bslosers = 0;
-
 #ifdef KERNEL
 #define        NVALLOC(a)      osi_Alloc(a)
 #define        NVFREE(a,b)     osi_Free(a,b)
 #else /* KERNEL */
+#define MAXBS  2048            /* try to avoid horrible allocs */
+static afs_int32 bslosers = 0;
 #define        NVALLOC(a)      malloc(a)
 #define        NVFREE(a,b)     free(a)
 #endif /* KERNEL */
@@ -57,19 +58,17 @@ static afs_int32 bslosers = 0;
 /* these things are defined in R (but not RX's) library.  For now, we add them
     only for the kernel system.  Later, when R is expunged, we'll remove the ifdef */
 #ifdef KERNEL
+#ifndef AFS_USR_DARWIN_ENV
 #ifdef AFS_AIXNFS11
 #define        AUTH_DES 1
 #endif
 #if (defined(AFS_AIX_ENV) && !defined(AUTH_DES)) || (!defined(AFS_SUN_ENV)) && !defined(AFS_SGI_ENV) && !defined(AFS_ALPHA_ENV) && !defined(AFS_SUN5_ENV)
 #ifndef        AFS_AIX32_ENV
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV)
 /*
  * XDR chars; from user mode xdr package.
  */
-bool_t
-xdr_char(xdrs, sp)
-       register XDR *xdrs;
-       char *sp;
+bool_t xdr_char(register XDR *xdrs, char *sp)
 {
        afs_int32 l;
 
@@ -102,10 +101,7 @@ xdr_char(xdrs, sp)
  */
 #ifndef        AFS_SUN5_ENV
 #ifndef AFS_HPUX110_ENV
-bool_t
-xdr_wrapstring(xdrs, cpp)
-       XDR *xdrs;
-       char **cpp;
+bool_t xdr_wrapstring(XDR *xdrs, char **cpp)
 {
        if (xdr_string(xdrs, cpp, 1024)) {
                return(TRUE);
@@ -125,13 +121,8 @@ xdr_wrapstring(xdrs, cpp)
  * > elemsize: size of each element
  * > xdr_elem: routine to XDR each element
  */
-bool_t
-xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem)
-       register XDR *xdrs;
-       register char *basep;
-       register u_int nelem;
-       register u_int elemsize;
-       register xdrproc_t xdr_elem;    
+bool_t xdr_vector(register XDR *xdrs, register char *basep, 
+       register u_int nelem, register u_int elemsize, register xdrproc_t xdr_elem)
 {
        register u_int i;
        register char *elptr;
@@ -145,12 +136,12 @@ xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem)
        }
        return(TRUE);   
 }
+#endif
 #endif /* KERNEL */
 
 #ifndef KERNEL
-xdr_CBS(x, abbs)
-    XDR *x;
-    struct CBS *abbs; {
+bool_t xdr_CBS(XDR *x, struct CBS *abbs)
+{
     afs_int32 len;
     if (x->x_op == XDR_FREE) {
        NVFREE(abbs->SeqBody,abbs->SeqLen);
@@ -172,9 +163,8 @@ xdr_CBS(x, abbs)
     }
 }
 
-xdr_BBS(x, abbs)
-    XDR *x;
-    struct BBS *abbs; {
+bool_t xdr_BBS(XDR *x, struct BBS *abbs)
+{
     afs_int32 maxLen, len;
     if (x->x_op == XDR_FREE) {
        NVFREE(abbs->SeqBody, abbs->MaxSeqLen);
@@ -199,9 +189,8 @@ xdr_BBS(x, abbs)
     }
 }
 
-xdr_AFSAccessList(x, abbs)
-    XDR *x;
-    struct BBS *abbs; {
+bool_t xdr_AFSAccessList(XDR *x, AFSAccessList *abbs)
+{
     afs_int32 maxLen, len;
     if (x->x_op == XDR_FREE) {
        NVFREE(abbs->SeqBody, abbs->MaxSeqLen);