Wed Feb 14 00:21:17 1996 David Mosberger-Tang <davidm@azstarnet.com>

	* sunrpc/xdr_mem.c, sunrpc/xdr_stdio.c: Use 4 instead of sizeof(long)
	where 32 bit quantities are consumed/stored.  Various other minor
	64-bit cleanups (casting).

diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c
index 558d369..fb15f11 100644 (file)
--- a/sunrpc/xdr_mem.c
+++ b/sunrpc/xdr_mem.c
@@ -97,10 +97,10 @@ xdrmem_getlong(xdrs, lp)
        long *lp;
 {
 
-       if ((xdrs->x_handy -= sizeof(long)) < 0)
+       if ((xdrs->x_handy -= 4) < 0)
                return (FALSE);
-       *lp = (long)ntohl((u_long)(*((long *)(xdrs->x_private))));
-       xdrs->x_private += sizeof(long);
+       *lp = (long)ntohl((u_long)(*((int32_t *)(xdrs->x_private))));
+       xdrs->x_private += 4;
        return (TRUE);
 }
 
@@ -110,10 +110,10 @@ xdrmem_putlong(xdrs, lp)
        long *lp;
 {
 
-       if ((xdrs->x_handy -= sizeof(long)) < 0)
+       if ((xdrs->x_handy -= 4) < 0)
                return (FALSE);
-       *(long *)xdrs->x_private = (long)htonl((u_long)(*lp));
-       xdrs->x_private += sizeof(long);
+       *(int32_t *)xdrs->x_private = (long)htonl((u_long)(*(int32_t*)lp));
+       xdrs->x_private += 4;
        return (TRUE);
 }
 
@@ -150,7 +150,7 @@ xdrmem_getpos(xdrs)
        register XDR *xdrs;
 {
 
-       return ((u_int)xdrs->x_private - (u_int)xdrs->x_base);
+       return ((u_long)xdrs->x_private - (u_long)xdrs->x_base);
 }
 
 static bool_t
@@ -164,7 +164,7 @@ xdrmem_setpos(xdrs, pos)
        if ((long)newaddr > (long)lastaddr)
                return (FALSE);
        xdrs->x_private = newaddr;
-       xdrs->x_handy = (int)lastaddr - (int)newaddr;
+       xdrs->x_handy = (long)lastaddr - (long)newaddr;
        return (TRUE);
 }
 

diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
index 694774f..da4877a 100644 (file)
--- a/sunrpc/xdr_stdio.c
+++ b/sunrpc/xdr_stdio.c
@@ -104,12 +104,11 @@ xdrstdio_getlong(xdrs, lp)
        XDR *xdrs;
        register long *lp;
 {
+       int32_t mycopy;
 
-       if (fread((caddr_t)lp, sizeof(long), 1, (FILE *)xdrs->x_private) != 1)
+       if (fread((caddr_t)&mycopy, 4, 1, (FILE *)xdrs->x_private) != 1)
                return (FALSE);
-#ifndef mc68000
-       *lp = ntohl(*lp);
-#endif
+       *(int32_t*)lp = ntohl(mycopy);
        return (TRUE);
 }
 
@@ -119,11 +118,9 @@ xdrstdio_putlong(xdrs, lp)
        long *lp;
 {
 
-#ifndef mc68000
-       long mycopy = htonl(*lp);
+       int32_t  mycopy = htonl(*(int32_t*)lp);
        lp = &mycopy;
-#endif
-       if (fwrite((caddr_t)lp, sizeof(long), 1, (FILE *)xdrs->x_private) != 1)
+       if (fwrite((caddr_t)lp, 4, 1, (FILE *)xdrs->x_private) != 1)
                return (FALSE);
        return (TRUE);
 }