<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-05-26)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-26 Ralf Corsépius <ralf.corsepius@rtems.org>
* librpc/src/rpc/clnt_udp.c: Cosmetics from freebsd.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2305&r2=text&tr2=1.2306&diff_format=h">M</a></td><td width='1%'>1.2306</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/librpc/src/rpc/clnt_udp.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</td><td width='100%'>cpukit/librpc/src/rpc/clnt_udp.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2305 rtems/cpukit/ChangeLog:1.2306
--- rtems/cpukit/ChangeLog:1.2305 Tue May 25 23:15:02 2010
+++ rtems/cpukit/ChangeLog Wed May 26 01:23:58 2010
</font><font color='#997700'>@@ -1,5 +1,9 @@
</font> 2010-05-26 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * librpc/src/rpc/clnt_udp.c: Cosmetics from freebsd.
+
+2010-05-26 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * librpc/src/rpc/clnt_tcp.c: Partial merger from freebsd
(Fix strict-aliasing).
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/clnt_udp.c:1.9 rtems/cpukit/librpc/src/rpc/clnt_udp.c:1.10
--- rtems/cpukit/librpc/src/rpc/clnt_udp.c:1.9 Thu Apr 29 04:42:52 2010
+++ rtems/cpukit/librpc/src/rpc/clnt_udp.c Wed May 26 01:23:58 2010
</font><font color='#997700'>@@ -79,17 +79,17 @@
</font> */
struct cu_data {
int cu_sock;
<font color='#880000'>- bool_t cu_closeit;
</font><font color='#000088'>+ bool_t cu_closeit; /* opened by library */
</font> struct sockaddr_in cu_raddr;
int cu_rlen;
<font color='#880000'>- struct timeval cu_wait;
- struct timeval cu_total;
</font><font color='#000088'>+ struct timeval cu_wait; /* retransmit interval */
+ struct timeval cu_total; /* total time for the call */
</font> struct rpc_err cu_error;
XDR cu_outxdrs;
u_int cu_xdrpos;
<font color='#880000'>- u_int cu_sendsz;
</font><font color='#000088'>+ u_int cu_sendsz; /* send size */
</font> char *cu_outbuf;
<font color='#880000'>- u_int cu_recvsz;
</font><font color='#000088'>+ u_int cu_recvsz; /* recv size */
</font> char cu_inbuf[1];
};
<font color='#997700'>@@ -119,8 +119,8 @@
</font> u_int sendsz,
u_int recvsz)
{
<font color='#880000'>- CLIENT *cl;
- register struct cu_data *cu = NULL;
</font><font color='#000088'>+ CLIENT *cl = NULL; /* client handle */
+ struct cu_data *cu = NULL; /* private data */
</font> struct timeval now;
struct rpc_msg call_msg;
static uintptr_t disrupt;
<font color='#997700'>@@ -137,7 +137,7 @@
</font> }
sendsz = ((sendsz + 3) / 4) * 4;
recvsz = ((recvsz + 3) / 4) * 4;
<font color='#880000'>- cu = (struct cu_data *)mem_alloc(sizeof(*cu) + sendsz + recvsz);
</font><font color='#000088'>+ cu = mem_alloc(sizeof (*cu) + sendsz + recvsz);
</font> if (cu == NULL) {
(void) fprintf(stderr, "clntudp_create: out of memory\n");
rpc_createerr.cf_stat = RPC_SYSTEMERROR;
<font color='#997700'>@@ -226,10 +226,10 @@
</font> caddr_t resultsp, /* pointer to results */
struct timeval utimeout ) /* seconds to wait before giving up */
{
<font color='#880000'>- register struct cu_data *cu = (struct cu_data *)cl->cl_private;
- register XDR *xdrs;
- register int outlen;
- register int inlen;
</font><font color='#000088'>+ struct cu_data *cu = (struct cu_data *)cl->cl_private;
+ XDR *xdrs;
+ size_t outlen = 0;
+ int inlen;
</font> socklen_t fromlen;
fd_set *fds, readfds;
struct sockaddr_in from;
<font color='#997700'>@@ -273,7 +273,7 @@
</font> free(fds);
return (cu->cu_error.re_status = RPC_CANTENCODEARGS);
}
<font color='#880000'>- outlen = (int)XDR_GETPOS(xdrs);
</font><font color='#000088'>+ outlen = (size_t)XDR_GETPOS(xdrs);
</font>
send_again:
if (sendto(cu->cu_sock, cu->cu_outbuf, outlen, 0,
<font color='#997700'>@@ -413,7 +413,7 @@
</font> CLIENT *cl,
struct rpc_err *errp)
{
<font color='#880000'>- register struct cu_data *cu = (struct cu_data *)cl->cl_private;
</font><font color='#000088'>+ struct cu_data *cu = (struct cu_data *)cl->cl_private;
</font>
*errp = cu->cu_error;
}
<font color='#997700'>@@ -425,8 +425,8 @@
</font> xdrproc_t xdr_res,
caddr_t res_ptr)
{
<font color='#880000'>- register struct cu_data *cu = (struct cu_data *)cl->cl_private;
- register XDR *xdrs = &(cu->cu_outxdrs);
</font><font color='#000088'>+ struct cu_data *cu = (struct cu_data *)cl->cl_private;
+ XDR *xdrs = &(cu->cu_outxdrs);
</font>
xdrs->x_op = XDR_FREE;
return ((*xdr_res)(xdrs, res_ptr));
<font color='#997700'>@@ -444,8 +444,8 @@
</font> int request,
char *info)
{
<font color='#880000'>- register struct cu_data *cu = (struct cu_data *)cl->cl_private;
- register struct timeval *tv;
</font><font color='#000088'>+ struct cu_data *cu = (struct cu_data *)cl->cl_private;
+ struct timeval *tv;
</font> socklen_t len;
switch (request) {
<font color='#997700'>@@ -526,7 +526,7 @@
</font> case CLGET_PROG:
/*
* This RELIES on the information that, in the call body,
<font color='#880000'>- * the program number field is the field from the
</font><font color='#000088'>+ * the program number field is the fourth field from the
</font> * begining of the RPC header. MUST be changed if the
* call_struct is changed
*/
<font color='#997700'>@@ -560,12 +560,12 @@
</font> clntudp_destroy(
CLIENT *cl)
{
<font color='#880000'>- register struct cu_data *cu = (struct cu_data *)cl->cl_private;
</font><font color='#000088'>+ struct cu_data *cu = (struct cu_data *)cl->cl_private;
</font>
if (cu->cu_closeit) {
(void)_RPC_close(cu->cu_sock);
}
XDR_DESTROY(&(cu->cu_outxdrs));
<font color='#880000'>- mem_free((caddr_t)cu, (sizeof(*cu) + cu->cu_sendsz + cu->cu_recvsz));
- mem_free((caddr_t)cl, sizeof(CLIENT));
</font><font color='#000088'>+ mem_free(cu, (sizeof (*cu) + cu->cu_sendsz + cu->cu_recvsz));
+ mem_free(cl, sizeof (CLIENT));
</font> }
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>