1 files changed, 26 insertions, 25 deletions

diff --git a/mdk-stage1/dietlibc/librpc/clnt_tcp.c b/mdk-stage1/dietlibc/librpc/clnt_tcp.c
index 8c39e8933..f2ebed677 100644
--- a/mdk-stage1/dietlibc/librpc/clnt_tcp.c
+++ b/mdk-stage1/dietlibc/librpc/clnt_tcp.c
@@ -57,11 +57,10 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 #include <errno.h>
 #include <rpc/pmap_clnt.h>
 #include <unistd.h>
+#include "dietfeatures.h"
 
 #define MCALL_MSG_SIZE 24
 
-extern int errno;
-
 static int readtcp();
 static int writetcp();
 
@@ -89,7 +88,7 @@ struct ct_data {
 	struct sockaddr_in ct_addr;
 	struct rpc_err ct_error;
 	char ct_mcall[MCALL_MSG_SIZE];	/* marshalled callmsg */
-	u_int ct_mpos;				/* pos after marshal */
+	unsigned int ct_mpos;				/* pos after marshal */
 	XDR ct_xdrs;
 };
 
@@ -109,11 +108,11 @@ struct ct_data {
  */
 CLIENT *clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
 struct sockaddr_in *raddr;
-u_long prog;
-u_long vers;
+unsigned long prog;
+unsigned long vers;
 register int *sockp;
-u_int sendsz;
-u_int recvsz;
+unsigned int sendsz;
+unsigned int recvsz;
 {
 	CLIENT *h;
 	register struct ct_data *ct;
@@ -139,12 +138,12 @@ u_int recvsz;
 	 * If no port number given ask the pmap for one
 	 */
 	if (raddr->sin_port == 0) {
-		u_short port;
+		unsigned short port;
 
 		if ((port = pmap_getport(raddr, prog, vers, IPPROTO_TCP)) == 0) {
-			mem_free((caddr_t) ct, sizeof(struct ct_data));
+			mem_free((char*) ct, sizeof(struct ct_data));
 
-			mem_free((caddr_t) h, sizeof(CLIENT));
+			mem_free((char*) h, sizeof(CLIENT));
 			return ((CLIENT *) NULL);
 		}
 		raddr->sin_port = htons(port);
@@ -161,6 +160,7 @@ u_int recvsz;
 						sizeof(*raddr)) < 0)) {
 			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
 			rpc_createerr.cf_error.re_errno = errno;
+			if (*sockp >= 0)
 			(void) close(*sockp);
 			goto fooy;
 		}
@@ -206,9 +206,9 @@ u_int recvsz;
 	 * and authnone for authentication.
 	 */
 	xdrrec_create(&(ct->ct_xdrs), sendsz, recvsz,
-				  (caddr_t) ct, readtcp, writetcp);
+				  (char*) ct, readtcp, writetcp);
 	h->cl_ops = &tcp_ops;
-	h->cl_private = (caddr_t) ct;
+	h->cl_private = (char*) ct;
 	h->cl_auth = authnone_create();
 	return (h);
 
@@ -216,9 +216,9 @@ u_int recvsz;
 	/*
 	 * Something goofed, free stuff and barf
 	 */
-	mem_free((caddr_t) ct, sizeof(struct ct_data));
+	mem_free((char*) ct, sizeof(struct ct_data));
 
-	mem_free((caddr_t) h, sizeof(CLIENT));
+	mem_free((char*) h, sizeof(CLIENT));
 	return ((CLIENT *) NULL);
 }
 
@@ -226,18 +226,18 @@ static enum clnt_stat
 clnttcp_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr,
 			 timeout)
 register CLIENT *h;
-u_long proc;
+unsigned long proc;
 xdrproc_t xdr_args;
-caddr_t args_ptr;
+char* args_ptr;
 xdrproc_t xdr_results;
-caddr_t results_ptr;
+char* results_ptr;
 struct timeval timeout;
 {
 	register struct ct_data *ct = (struct ct_data *) h->cl_private;
 	register XDR *xdrs = &(ct->ct_xdrs);
 	struct rpc_msg reply_msg;
-	u_long x_id;
-	u_long *msg_x_id = (u_long *) (ct->ct_mcall);	/* yuk */
+	unsigned long x_id;
+	uint32_t *msg_x_id = (uint32_t *) (ct->ct_mcall);	/* yuk */
 	register bool_t shipnow;
 	int refreshes = 2;
 
@@ -290,7 +290,7 @@ struct timeval timeout;
 				continue;
 			return (ct->ct_error.re_status);
 		}
-		if (reply_msg.rm_xid == x_id)
+		if ((uint32_t)reply_msg.rm_xid == (uint32_t)x_id)
 			break;
 	}
 
@@ -332,7 +332,7 @@ struct rpc_err *errp;
 static bool_t clnttcp_freeres(cl, xdr_res, res_ptr)
 CLIENT *cl;
 xdrproc_t xdr_res;
-caddr_t res_ptr;
+char* res_ptr;
 {
 	register struct ct_data *ct = (struct ct_data *) cl->cl_private;
 	register XDR *xdrs = &(ct->ct_xdrs);
@@ -379,9 +379,9 @@ CLIENT *h;
 		(void) close(ct->ct_sock);
 	}
 	XDR_DESTROY(&(ct->ct_xdrs));
-	mem_free((caddr_t) ct, sizeof(struct ct_data));
+	mem_free((char*) ct, sizeof(struct ct_data));
 
-	mem_free((caddr_t) h, sizeof(CLIENT));
+	mem_free((char*) h, sizeof(CLIENT));
 }
 
 /*
@@ -391,7 +391,7 @@ CLIENT *h;
  */
 static int readtcp(ct, buf, len)
 register struct ct_data *ct;
-caddr_t buf;
+char* buf;
 register int len;
 {
 #ifdef FD_SETSIZE
@@ -447,7 +447,7 @@ register int len;
 
 static int writetcp(ct, buf, len)
 struct ct_data *ct;
-caddr_t buf;
+char* buf;
 int len;
 {
 	register int i, cnt;
@@ -461,3 +461,4 @@ int len;
 	}
 	return (len);
 }
+