change log for rtems (2010-05-25)

[rtems-vc at rtems.org]

 *ralf*:
2010-05-26	Ralf Corsépius <ralf.corsepius at rtems.org>

	* librpc/src/rpc/clnt_raw.c: Partial merger from freebsd
	(Improved 16 bit compatibility; Fix strict-aliasing).

M 1.2304  cpukit/ChangeLog
M    1.8  cpukit/librpc/src/rpc/clnt_raw.c

diff -u rtems/cpukit/ChangeLog:1.2303 rtems/cpukit/ChangeLog:1.2304
--- rtems/cpukit/ChangeLog:1.2303	Tue May 25 09:12:53 2010
+++ rtems/cpukit/ChangeLog	Tue May 25 22:41:49 2010
@@ -1,3 +1,8 @@
+2010-05-26	Ralf Corsépius <ralf.corsepius at rtems.org>
+
+	* librpc/src/rpc/clnt_raw.c: Partial merger from freebsd
+	(Improved 16 bit compatibility; Fix strict-aliasing).
+
 2010-05-25	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* librpc/src/rpc/rpc_prot.c: Partial merger from freebsd

diff -u rtems/cpukit/librpc/src/rpc/clnt_raw.c:1.7 rtems/cpukit/librpc/src/rpc/clnt_raw.c:1.8
--- rtems/cpukit/librpc/src/rpc/clnt_raw.c:1.7	Sat Mar 27 21:35:23 2010
+++ rtems/cpukit/librpc/src/rpc/clnt_raw.c	Tue May 25 22:41:49 2010
@@ -41,7 +41,7 @@
  * Memory based rpc for simple testing and timing.
  * Interface to create an rpc client and server in the same process.
  * This lets us similate rpc and get round trip overhead, without
- * any interference from the kernal.
+ * any interference from the kernel.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -61,7 +61,10 @@
 	CLIENT	client_object;
 	XDR	xdr_stream;
 	char	_raw_buf[UDPMSGSIZE];
-	char	mashl_callmsg[MCALL_MSG_SIZE];
+	union {
+	    struct rpc_msg	mashl_rpcmsg;
+	    char 		mashl_callmsg[MCALL_MSG_SIZE];
+	} u;
 	u_int	mcnt;
 };
 #define clntraw_private (rtems_rpc_task_variables->clnt_raw_private)
@@ -90,7 +93,7 @@
 	u_long prog,
 	u_long vers )
 {
-	register struct clnt_raw_private *clp = clntraw_private;
+	struct clnt_raw_private *clp = clntraw_private;
 	struct rpc_msg call_msg;
 	XDR *xdrs = &clp->xdr_stream;
 	CLIENT	*client = &clp->client_object;
@@ -108,7 +111,7 @@
 	call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
 	call_msg.rm_call.cb_prog = prog;
 	call_msg.rm_call.cb_vers = vers;
-	xdrmem_create(xdrs, clp->mashl_callmsg, MCALL_MSG_SIZE, XDR_ENCODE);
+	xdrmem_create(xdrs, clp->u.mashl_callmsg, MCALL_MSG_SIZE, XDR_ENCODE);
 	if (! xdr_callhdr(xdrs, &call_msg)) {
 		perror("clnt_raw.c - Fatal header serialization error.");
 	}
@@ -138,8 +141,8 @@
 	caddr_t resultsp,
 	struct timeval timeout )
 {
-	register struct clnt_raw_private *clp = clntraw_private;
-	register XDR *xdrs = &clp->xdr_stream;
+	struct clnt_raw_private *clp = clntraw_private;
+	XDR *xdrs = &clp->xdr_stream;
 	struct rpc_msg msg;
 	enum clnt_stat status;
 	struct rpc_err error;
@@ -152,8 +155,8 @@
 	 */
 	xdrs->x_op = XDR_ENCODE;
 	XDR_SETPOS(xdrs, 0);
-	((struct rpc_msg *)clp->mashl_callmsg)->rm_xid ++ ;
-	if ((! XDR_PUTBYTES(xdrs, clp->mashl_callmsg, clp->mcnt)) ||
+	clp->u.mashl_rpcmsg.rm_xid ++ ;
+	if ((! XDR_PUTBYTES(xdrs, clp->u.mashl_callmsg, clp->mcnt)) ||
 	    (! XDR_PUTLONG(xdrs, (long *)&proc)) ||
 	    (! AUTH_MARSHALL(h->cl_auth, xdrs)) ||
 	    (! (*xargs)(xdrs, argsp))) {
@@ -215,8 +218,8 @@
 	xdrproc_t xdr_res,
 	caddr_t res_ptr )
 {
-	register struct clnt_raw_private *clp = clntraw_private;
-	register XDR *xdrs = &clp->xdr_stream;
+	struct clnt_raw_private *clp = clntraw_private;
+	XDR *xdrs = &clp->xdr_stream;
 	bool_t rval;
 
 	if (clp == 0)



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100525/4036bb53/attachment.html>