remove-int64-conversion-warnings-20031207

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

diff --git a/src/rx/xdr_int64.c b/src/rx/xdr_int64.c
index 27317db..7ee0072 100644 (file)
--- a/src/rx/xdr_int64.c
+++ b/src/rx/xdr_int64.c
@@ -3,15 +3,15 @@
  *  XDR routine for int64 (long long or struct)
  */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header$");
+RCSID
+    ("$Header$");
 
 #if defined(KERNEL) && !defined(UKERNEL)
 #ifdef AFS_LINUX20_ENV
-#include "../h/string.h"
-#define bzero(A,C) memset((A), 0, (C))
+#include "h/string.h"
 #else
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -31,101 +31,128 @@ RCSID("$Header$");
  * XDR afs_int64 integers
  */
 bool_t
-xdr_int64(xdrs, ulp)
-        register XDR *xdrs;
-        afs_int64 *ulp;
+xdr_int64(register XDR * xdrs, afs_int64 * ulp)
+{
+    return xdr_afs_int64(xdrs, ulp);
+}
+
+bool_t
+xdr_afs_int64(register XDR * xdrs, afs_int64 * ulp)
 {
-        static afs_int32 high;
-        static afs_uint32 low;
+    afs_int32 high;
+    afs_uint32 low;
 
-        if (xdrs->x_op == XDR_DECODE) {
-                if (!XDR_GETINT32(xdrs, (afs_int32 *) &high)) return (FALSE);
-                if (!XDR_GETINT32(xdrs, (afs_int32 *) &low)) return (FALSE);
-                *ulp = high;
-                *ulp <<= 32;
-                *ulp += low;
-                return (TRUE);
-        }
-        if (xdrs->x_op == XDR_ENCODE) {
-                high = (*ulp >> 32);
-                low = *ulp & 0xFFFFFFFFL;
-                if (!XDR_PUTINT32(xdrs, (afs_int32 *) &high)) return (FALSE);
-                return (XDR_PUTINT32(xdrs, (afs_int32 *) &low));
-        }
-        if (xdrs->x_op == XDR_FREE)
-                return (TRUE);
-        return (FALSE);
+    if (xdrs->x_op == XDR_DECODE) {
+       if (!XDR_GETINT32(xdrs, (afs_int32 *) & high))
+           return (FALSE);
+       if (!XDR_GETINT32(xdrs, (afs_int32 *) & low))
+           return (FALSE);
+       *ulp = high;
+       *ulp <<= 32;
+       *ulp += low;
+       return (TRUE);
+    }
+    if (xdrs->x_op == XDR_ENCODE) {
+       high = (afs_int32)(*ulp >> 32);
+       low = (afs_uint32)(*ulp & 0xFFFFFFFFL);
+       if (!XDR_PUTINT32(xdrs, (afs_int32 *) & high))
+           return (FALSE);
+       return (XDR_PUTINT32(xdrs, (afs_int32 *) & low));
+    }
+    if (xdrs->x_op == XDR_FREE)
+       return (TRUE);
+    return (FALSE);
 }
 
 /*
  * XDR afs_int64 integers
  */
 bool_t
-xdr_uint64(xdrs, ulp)
-        register XDR *xdrs;
-        afs_uint64 *ulp;
+xdr_uint64(register XDR * xdrs, afs_uint64 * ulp)
+{
+    return xdr_afs_uint64(xdrs, ulp);
+}
+
+bool_t
+xdr_afs_uint64(register XDR * xdrs, afs_uint64 * ulp)
 {
-        static afs_uint32 high;
-        static afs_uint32 low;
+    afs_uint32 high;
+    afs_uint32 low;
 
-        if (xdrs->x_op == XDR_DECODE) {
-                if (!XDR_GETINT32(xdrs, (afs_uint32 *) &high)) return (FALSE);
-                if (!XDR_GETINT32(xdrs, (afs_uint32 *) &low)) return (FALSE);
-                *ulp = high;
-                *ulp <<= 32;
-                *ulp += low;
-                return (TRUE);
-        }
-        if (xdrs->x_op == XDR_ENCODE) {
-                high = (*ulp >> 32);
-                low = *ulp & 0xFFFFFFFFL;
-                if (!XDR_PUTINT32(xdrs, (afs_uint32 *) &high)) return (FALSE);
-                return (XDR_PUTINT32(xdrs, (afs_uint32 *) &low));
-        }
-        if (xdrs->x_op == XDR_FREE)
-                return (TRUE);
-        return (FALSE);
+    if (xdrs->x_op == XDR_DECODE) {
+       if (!XDR_GETINT32(xdrs, (afs_uint32 *) & high))
+           return (FALSE);
+       if (!XDR_GETINT32(xdrs, (afs_uint32 *) & low))
+           return (FALSE);
+       *ulp = high;
+       *ulp <<= 32;
+       *ulp += low;
+       return (TRUE);
+    }
+    if (xdrs->x_op == XDR_ENCODE) {
+       high = (afs_uint32)(*ulp >> 32);
+       low = (afs_uint32)(*ulp & 0xFFFFFFFFL);
+       if (!XDR_PUTINT32(xdrs, (afs_uint32 *) & high))
+           return (FALSE);
+       return (XDR_PUTINT32(xdrs, (afs_uint32 *) & low));
+    }
+    if (xdrs->x_op == XDR_FREE)
+       return (TRUE);
+    return (FALSE);
 }
+
 #else /* AFS_64BIT_ENV */
 /*
  * XDR afs_int64 integers
  */
 bool_t
-xdr_int64(xdrs, ulp)
-        register XDR *xdrs;
-        afs_int64 *ulp;
+xdr_int64(register XDR * xdrs, afs_int64 * ulp)
+{
+    return xdr_afs_int64(xdrs, ulp);
+}
+
+bool_t
+xdr_afs_int64(register XDR * xdrs, afs_int64 * ulp)
 {
-        if (xdrs->x_op == XDR_DECODE) {
-                if (!XDR_GETINT32(xdrs, (afs_int32 *) &ulp->high)) return (FALSE);
-                return (XDR_GETINT32(xdrs, (afs_int32 *) &ulp->low));
-        }
-        if (xdrs->x_op == XDR_ENCODE) {
-                if (!XDR_PUTINT32(xdrs, (afs_int32 *) &ulp->high)) return (FALSE);
-                return (XDR_PUTINT32(xdrs, (afs_int32 *) &ulp->low));
-        }
-        if (xdrs->x_op == XDR_FREE)
-                return (TRUE);
-        return (FALSE);
+    if (xdrs->x_op == XDR_DECODE) {
+       if (!XDR_GETINT32(xdrs, (afs_int32 *) & ulp->high))
+           return (FALSE);
+       return (XDR_GETINT32(xdrs, (afs_int32 *) & ulp->low));
+    }
+    if (xdrs->x_op == XDR_ENCODE) {
+       if (!XDR_PUTINT32(xdrs, (afs_int32 *) & ulp->high))
+           return (FALSE);
+       return (XDR_PUTINT32(xdrs, (afs_int32 *) & ulp->low));
+    }
+    if (xdrs->x_op == XDR_FREE)
+       return (TRUE);
+    return (FALSE);
 }
 
 /*
  * XDR afs_uint64 integers
  */
 bool_t
-xdr_uint64(xdrs, ulp)
-        register XDR *xdrs;
-        afs_uint64 *ulp;
+xdr_uint64(register XDR * xdrs, afs_uint64 * ulp)
+{
+    return xdr_afs_uint64(xdrs, ulp);
+}
+
+bool_t
+xdr_afs_uint64(register XDR * xdrs, afs_uint64 * ulp)
 {
-        if (xdrs->x_op == XDR_DECODE) {
-                if (!XDR_GETINT32(xdrs, (afs_uint32 *) &ulp->high)) return (FALSE);
-                return (XDR_GETINT32(xdrs, (afs_uint32 *) &ulp->low));
-        }
-        if (xdrs->x_op == XDR_ENCODE) {
-                if (!XDR_PUTINT32(xdrs, (afs_uint32 *) &ulp->high)) return (FALSE);
-                return (XDR_PUTINT32(xdrs, (afs_uint32 *) &ulp->low));
-        }
-        if (xdrs->x_op == XDR_FREE)
-                return (TRUE);
-        return (FALSE);
+    if (xdrs->x_op == XDR_DECODE) {
+       if (!XDR_GETINT32(xdrs, (afs_uint32 *) & ulp->high))
+           return (FALSE);
+       return (XDR_GETINT32(xdrs, (afs_uint32 *) & ulp->low));
+    }
+    if (xdrs->x_op == XDR_ENCODE) {
+       if (!XDR_PUTINT32(xdrs, (afs_uint32 *) & ulp->high))
+           return (FALSE);
+       return (XDR_PUTINT32(xdrs, (afs_uint32 *) & ulp->low));
+    }
+    if (xdrs->x_op == XDR_FREE)
+       return (TRUE);
+    return (FALSE);
 }
 #endif /* AFS_64BIT_ENV */