#define mem_free(ptr, bsize) free(ptr)
#endif
-#ifdef KERNEL
-#define osi_alloc afs_osi_Alloc
-#define osi_free afs_osi_Free
-
-/* keep here for now, 64 bit issues */
-extern void *afs_osi_Alloc(size_t x);
-extern void *afs_osi_Alloc_NoSleep(size_t x);
-extern void afs_osi_Free(void *x, size_t asize);
-
-#ifndef UKERNEL
+#if defined(AFS_AMD64_LINUX24_ENV) || (defined(KERNEL) && !defined(UKERNEL))
#define xdr_void afs_xdr_void
#define xdr_int afs_xdr_int
#define xdr_u_int afs_xdr_u_int
#define xdr_int64 afs_xdr_int64
#define xdr_uint64 afs_xdr_uint64
#endif
+
+#ifdef KERNEL
+#define osi_alloc afs_osi_Alloc
+#define osi_free afs_osi_Free
+
+/* keep here for now, 64 bit issues */
+extern void *afs_osi_Alloc(size_t x);
+#ifndef afs_osi_Alloc_NoSleep
+extern void *afs_osi_Alloc_NoSleep(size_t x);
+#endif
+extern void afs_osi_Free(void *x, size_t asize);
+
#endif
-#ifndef major /* ouch! */
+#ifndef major /* ouch! */
#include <sys/types.h>
#endif
* request.
*/
enum xdr_op {
- XDR_ENCODE=0,
- XDR_DECODE=1,
- XDR_FREE=2
+ XDR_ENCODE = 0,
+ XDR_DECODE = 1,
+ XDR_FREE = 2
};
/*
* bool_t (*xdrproc_t)(XDR *, caddr_t *);
*/
#if 0
-typedef bool_t (*xdrproc_t)();
+typedef bool_t(*xdrproc_t) ();
#else
-typedef bool_t (*xdrproc_t) (void *, ...);
+#ifdef AFS_I386_LINUX26_ENV
+typedef bool_t(*xdrproc_t) (void *, caddr_t *, u_int);
+#else
+typedef bool_t(*xdrproc_t) (void *, ...);
+#endif
#endif
* and two private fields for the use of the particular impelementation.
*/
typedef struct {
- enum xdr_op x_op; /* operation; fast additional param */
- struct xdr_ops {
-#if defined(AFS_SGI61_ENV) && defined(KERNEL) && (_MIPS_SZLONG != _MIPS_SZINT)
+ enum xdr_op x_op; /* operation; fast additional param */
+ struct xdr_ops {
+#if defined(KERNEL) && ((defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV))
/* NOTE: SGI 6.1 adds two routines to the xdr_ops if the size of a long is
* 64 bits. I've only done this for the kernel, since other changes may
* be necessary if we make a 64 bit user version of AFS.
*/
- bool_t (*x_getint64)(void *xdrs, afs_int64 *lp); /* get 32 bits into a long */
- bool_t (*x_putint64)(void *xdrs, afs_int64 *lp); /* send 32 bits of a long */
-#endif /* AFS_SGI61_ENV */
+ bool_t(*x_getint64) (void *xdrs, afs_int64 * lp); /* get 32 bits into a long */
+ bool_t(*x_putint64) (void *xdrs, afs_int64 * lp); /* send 32 bits of a long */
+#endif /* defined(KERNEL) && ((defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV)) */
#if !(defined(KERNEL) && defined(AFS_SUN57_ENV))
- bool_t (*x_getint32)(void *xdrs, afs_int32 *lp); /* get an afs_int32 from underlying stream */
- bool_t (*x_putint32)(void *xdrs, afs_int32 *lp); /* put an afs_int32 to " */
+ bool_t(*x_getint32) (void *xdrs, afs_int32 * lp); /* get an afs_int32 from underlying stream */
+ bool_t(*x_putint32) (void *xdrs, afs_int32 * lp); /* put an afs_int32 to " */
#endif
- bool_t (*x_getbytes)(void *xdrs, caddr_t addr, u_int len);/* get some bytes from " */
- bool_t (*x_putbytes)(void *xdrs, caddr_t addr, u_int len);/* put some bytes to " */
- u_int (*x_getpostn)(void *xdrs);/* returns bytes off from beginning */
- bool_t (*x_setpostn)(void *xdrs, u_int pos);/* lets you reposition the stream */
- afs_int32 * (*x_inline)(void *xdrs, u_int len); /* buf quick ptr to buffered data */
- void (*x_destroy)(void *xdrs); /* free privates of this xdr_stream */
+ bool_t(*x_getbytes) (void *xdrs, caddr_t addr, u_int len); /* get some bytes from " */
+ bool_t(*x_putbytes) (void *xdrs, caddr_t addr, u_int len); /* put some bytes to " */
+ u_int(*x_getpostn) (void *xdrs); /* returns bytes off from beginning */
+ bool_t(*x_setpostn) (void *xdrs, u_int pos); /* lets you reposition the stream */
+ afs_int32 *(*x_inline) (void *xdrs, u_int len); /* buf quick ptr to buffered data */
+ void (*x_destroy) (void *xdrs); /* free privates of this xdr_stream */
#if defined(KERNEL) && defined(AFS_SUN57_ENV)
- bool_t (*x_control)(void *xdrs);
- bool_t (*x_getint32)(void *xdrs, afs_int32 *lp);
- bool_t (*x_putint32)(void *xdrs, afs_int32 *lp);
+ bool_t(*x_control) (void *xdrs);
+ bool_t(*x_getint32) (void *xdrs, afs_int32 * lp);
+ bool_t(*x_putint32) (void *xdrs, afs_int32 * lp);
#endif
- } *x_ops;
- caddr_t x_public; /* users' data */
- caddr_t x_private; /* pointer to private data */
- caddr_t x_base; /* private used for position info */
- int x_handy; /* extra private word */
+ } *x_ops;
+ caddr_t x_public; /* users' data */
+ caddr_t x_private; /* pointer to private data */
+ caddr_t x_base; /* private used for position info */
+ int x_handy; /* extra private word */
} XDR;
/*
* u_int len;
* u_int pos;
*/
-#if defined(AFS_SGI61_ENV) && defined(KERNEL) && (_MIPS_SZLONG != _MIPS_SZINT)
+#if defined(AFS_SGI61_ENV) && defined(KERNEL) && (_MIPS_SZLONG != _MIPS_SZINT) || defined(AFS_HPUX_64BIT_ENV)
#define XDR_GETINT64(xdrs, int64p) \
(*(xdrs)->x_ops->x_getint64)(xdrs, int64p)
#define xdr_getint64(xdrs, int64p) \
(*(xdrs)->x_ops->x_putint64)(xdrs, int64p)
#define xdr_putint64(xdrs, int64p) \
(*(xdrs)->x_ops->x_putint64)(xdrs, int64p)
-#endif /* defined(AFS_SGI61_ENV) && KERNEL && (_MIPS_SZLONG != _MIPS_SZINT) */
+#endif /* defined(KERNEL) && ((defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV)) */
#define XDR_GETINT32(xdrs, int32p) \
(*(xdrs)->x_ops->x_getint32)(xdrs, int32p)
*/
#define NULL_xdrproc_t ((xdrproc_t)0)
struct xdr_discrim {
- int value;
- xdrproc_t proc;
+ int value;
+ xdrproc_t proc;
};
/*