DEVEL15-death-to-longc-procs-20060804

[openafs.git] / src / rx / xdr_rx.c

diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c
index 514c3ed..7016ade 100644 (file)
--- a/src/rx/xdr_rx.c
+++ b/src/rx/xdr_rx.c
@@ -22,6 +22,7 @@ RCSID
     ("$Header$");
 
 #ifdef KERNEL
+#include "afs/sysincludes.h"
 #ifndef UKERNEL
 #include "h/types.h"
 #include "h/uio.h"
@@ -33,13 +34,13 @@ RCSID
 #else
 #include "rpc/types.h"
 #endif
-#ifdef  AFS_ALPHA_ENV
+#ifdef  AFS_OSF_ENV
 #undef kmem_alloc
 #undef kmem_free
 #undef mem_alloc
 #undef mem_free
 #undef register
-#endif /* AFS_ALPHA_ENV */
+#endif /* AFS_OSF_ENV */
 #ifdef AFS_LINUX22_ENV
 #ifndef quad_t
 #define quad_t __quad_t
@@ -49,14 +50,11 @@ RCSID
 #include "rx/xdr.h"
 #include "netinet/in.h"
 #else /* !UKERNEL */
-#include "afs/sysincludes.h"
 #include "rpc/types.h"
 #include "rpc/xdr.h"
 #endif /* !UKERNEL */
 #include "rx/rx.h"
 
-#include "afs/longc_procs.h"
-
 #else /* KERNEL */
 #include <sys/types.h>
 #include <stdio.h>
@@ -106,12 +104,12 @@ static bool_t xdrrx_putint64(AFS_XDRS_T axdrs, long *lp);
 #endif /* (defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV) */
 
 static bool_t xdrrx_getint32(AFS_XDRS_T axdrs, afs_int32 * lp);
-static bool_t xdrrx_putint32(AFS_XDRS_T axdrs, register afs_int32 * lp);
-static bool_t xdrrx_getbytes(AFS_XDRS_T axdrs, register caddr_t addr,
-                            register u_int len);
-static bool_t xdrrx_putbytes(AFS_XDRS_T axdrs, register caddr_t addr,
-                            register u_int len);
-static AFS_RPC_INLINE_T *xdrrx_inline(AFS_XDRS_T axdrs, register u_int len);
+static bool_t xdrrx_putint32(AFS_XDRS_T axdrs, afs_int32 * lp);
+static bool_t xdrrx_getbytes(AFS_XDRS_T axdrs, caddr_t addr,
+                            u_int len);
+static bool_t xdrrx_putbytes(AFS_XDRS_T axdrs, caddr_t addr,
+                            u_int len);
+static AFS_RPC_INLINE_T *xdrrx_inline(AFS_XDRS_T axdrs, u_int len);
 
 
 /*
@@ -141,11 +139,11 @@ static struct xdr_ops xdrrx_ops = {
 
 /*
  * Initialize an rx xdr handle, for a given rx call.  op must be XDR_ENCODE or XDR_DECODE.
- * Call must have been returned by rx_MakeCall or rx_GetCall.  Stream should be a pointer to a local rx_stream structure.
+ * Call must have been returned by rx_MakeCall or rx_GetCall.
  */
 void
-xdrrx_create(register XDR * xdrs, register struct rx_call *call,
-            register enum xdr_op op)
+xdrrx_create(XDR * xdrs, struct rx_call *call,
+            enum xdr_op op)
 {
     xdrs->x_op = op;
     xdrs->x_ops = &xdrrx_ops;
@@ -162,7 +160,7 @@ static bool_t
 xdrrx_getint64(AFS_XDRS_T axdrs, long *lp)
 {
     XDR * xdrs = (XDR *)axdrs;
-    register struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
+    struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
     afs_int32 i;
 
     if (rx_Read32(call, &i) == sizeof(i)) {
@@ -177,7 +175,7 @@ xdrrx_putint64(AFS_XDRS_T axdrs, long *lp)
 {
     XDR * xdrs = (XDR *)axdrs;
     afs_int32 code, i = htonl(*lp);
-    register struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
+    struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
 
     code = (rx_Write32(call, &i) == sizeof(i));
     return code;
@@ -189,7 +187,7 @@ xdrrx_getint32(AFS_XDRS_T axdrs, afs_int32 * lp)
 {
     afs_int32 l;
     XDR * xdrs = (XDR *)axdrs;
-    register struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
+    struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
 #if    defined(KERNEL) && defined(AFS_AIX32_ENV)
     char *saddr = (char *)&l;
     saddr -= STACK_TO_PIN;
@@ -224,11 +222,11 @@ xdrrx_getint32(AFS_XDRS_T axdrs, afs_int32 * lp)
 }
 
 static bool_t
-xdrrx_putint32(register AFS_XDRS_T axdrs, register afs_int32 * lp)
+xdrrx_putint32(AFS_XDRS_T axdrs, afs_int32 * lp)
 {
     afs_int32 code, l = htonl(*lp);
     XDR * xdrs = (XDR *)axdrs;
-    register struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
+    struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
 #if    defined(KERNEL) && defined(AFS_AIX32_ENV)
     char *saddr = (char *)&code;
     saddr -= STACK_TO_PIN;
@@ -255,11 +253,11 @@ xdrrx_putint32(register AFS_XDRS_T axdrs, register afs_int32 * lp)
 }
 
 static bool_t
-xdrrx_getbytes(register AFS_XDRS_T axdrs, register caddr_t addr, register u_int len)
+xdrrx_getbytes(AFS_XDRS_T axdrs, caddr_t addr, u_int len)
 {
     afs_int32 code;
     XDR * xdrs = (XDR *)axdrs;
-    register struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
+    struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
 #if    defined(KERNEL) && defined(AFS_AIX32_ENV)
     char *saddr = (char *)&code;
     saddr -= STACK_TO_PIN;
@@ -287,11 +285,11 @@ xdrrx_getbytes(register AFS_XDRS_T axdrs, register caddr_t addr, register u_int
 }
 
 static bool_t
-xdrrx_putbytes(register AFS_XDRS_T axdrs, register caddr_t addr, register u_int len)
+xdrrx_putbytes(AFS_XDRS_T axdrs, caddr_t addr, u_int len)
 {
     afs_int32 code;
     XDR * xdrs = (XDR *)axdrs;
-    register struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
+    struct rx_call *call = ((struct rx_call *)(xdrs)->x_private);
 #if    defined(KERNEL) && defined(AFS_AIX32_ENV)
     char *saddr = (char *)&code;
     saddr -= STACK_TO_PIN;
@@ -320,14 +318,14 @@ xdrrx_putbytes(register AFS_XDRS_T axdrs, register caddr_t addr, register u_int
 
 #ifdef undef                   /* not used */
 static u_int
-xdrrx_getpos(register XDR * xdrs)
+xdrrx_getpos(XDR * xdrs)
 {
     /* Not supported.  What error code should we return? (It doesn't matter:  it will never be called, anyway!) */
     return -1;
 }
 
 static bool_t
-xdrrx_setpos(register XDR * xdrs, u_int pos)
+xdrrx_setpos(XDR * xdrs, u_int pos)
 {
     /* Not supported */
     return FALSE;
@@ -335,7 +333,7 @@ xdrrx_setpos(register XDR * xdrs, u_int pos)
 #endif
 
 static AFS_RPC_INLINE_T *
-xdrrx_inline(AFS_XDRS_T axdrs, register u_int len)
+xdrrx_inline(AFS_XDRS_T axdrs, u_int len)
 {
     /* I don't know what this routine is supposed to do, but the stdio module returns null, so we will, too */
     return (0);