1 files changed, 19 insertions, 17 deletions

diff --git a/mdk-stage1/dietlibc/librpc/xdr_mem.c b/mdk-stage1/dietlibc/librpc/xdr_mem.c
index 755f6abf1..5bc54cd4a 100644
--- a/mdk-stage1/dietlibc/librpc/xdr_mem.c
+++ b/mdk-stage1/dietlibc/librpc/xdr_mem.c
@@ -52,7 +52,7 @@ static bool_t xdrmem_getlong();
 static bool_t xdrmem_putlong();
 static bool_t xdrmem_getbytes();
 static bool_t xdrmem_putbytes();
-static u_int xdrmem_getpos();
+static unsigned int xdrmem_getpos();
 static bool_t xdrmem_setpos();
 static int32_t *xdrmem_inline();
 static void xdrmem_destroy();
@@ -68,20 +68,21 @@ static struct xdr_ops xdrmem_ops = {
 	xdrmem_destroy
 };
 
+
 /*
  * The procedure xdrmem_create initializes a stream descriptor for a
  * memory buffer.  
  */
 void xdrmem_create(xdrs, addr, size, op)
 register XDR *xdrs;
-caddr_t addr;
-u_int size;
+const char* addr;
+unsigned int size;
 enum xdr_op op;
 {
 
 	xdrs->x_op = op;
 	xdrs->x_ops = &xdrmem_ops;
-	xdrs->x_private = xdrs->x_base = addr;
+	xdrs->x_private = xdrs->x_base = (char*)addr;
 	xdrs->x_handy = size;
 }
 
@@ -98,7 +99,7 @@ long *lp;
 	if ((xdrs->x_handy -= sizeof(long)) < 0)
 		return (FALSE);
 
-	*lp = (long) ntohl((u_long) (*((long *) (xdrs->x_private))));
+	*lp = (long) ntohl((unsigned long) (*((long *) (xdrs->x_private))));
 	xdrs->x_private += sizeof(long);
 
 	return (TRUE);
@@ -112,7 +113,7 @@ long *lp;
 	if ((xdrs->x_handy -= sizeof(long)) < 0)
 		return (FALSE);
 
-	*(long *) xdrs->x_private = (long) htonl((u_long) (*lp));
+	*(long *) xdrs->x_private = (long) htonl((unsigned long) (*lp));
 	xdrs->x_private += sizeof(long);
 
 	return (TRUE);
@@ -120,43 +121,43 @@ long *lp;
 
 static bool_t xdrmem_getbytes(xdrs, addr, len)
 register XDR *xdrs;
-caddr_t addr;
-register u_int len;
+char* addr;
+register unsigned int len;
 {
 
 	if ((xdrs->x_handy -= len) < 0)
 		return (FALSE);
-	bcopy(xdrs->x_private, addr, len);
+	memmove(addr, xdrs->x_private, len);
 	xdrs->x_private += len;
 	return (TRUE);
 }
 
 static bool_t xdrmem_putbytes(xdrs, addr, len)
 register XDR *xdrs;
-caddr_t addr;
-register u_int len;
+char* addr;
+register unsigned int len;
 {
 
 	if ((xdrs->x_handy -= len) < 0)
 		return (FALSE);
-	bcopy(addr, xdrs->x_private, len);
+	memmove(xdrs->x_private, addr, len);
 	xdrs->x_private += len;
 	return (TRUE);
 }
 
-static u_int xdrmem_getpos(xdrs)
+static unsigned int xdrmem_getpos(xdrs)
 register XDR *xdrs;
 {
 
-	return ((u_int) xdrs->x_private - (u_int) xdrs->x_base);
+	return ((unsigned int) xdrs->x_private - (unsigned int) xdrs->x_base);
 }
 
 static bool_t xdrmem_setpos(xdrs, pos)
 register XDR *xdrs;
-u_int pos;
+unsigned int pos;
 {
-	register caddr_t newaddr = xdrs->x_base + pos;
-	register caddr_t lastaddr = xdrs->x_private + xdrs->x_handy;
+	register char* newaddr = xdrs->x_base + pos;
+	register char* lastaddr = xdrs->x_private + xdrs->x_handy;
 
 	if ((long) newaddr > (long) lastaddr)
 		return (FALSE);
@@ -178,3 +179,4 @@ int len;
 	}
 	return (buf);
 }
+