<!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-25)</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-25 Ralf Corsépius <ralf.corsepius@rtems.org>
* librpc/src/rpc/rpc_prot.c: Partial merger from freebsd
(Improved 64 bit compatibility; bug fix).
</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.2302&r2=text&tr2=1.2303&diff_format=h">M</a></td><td width='1%'>1.2303</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/rpc_prot.c.diff?r1=text&tr1=1.6&r2=text&tr2=1.7&diff_format=h">M</a></td><td width='1%'>1.7</td><td width='100%'>cpukit/librpc/src/rpc/rpc_prot.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2302 rtems/cpukit/ChangeLog:1.2303
--- rtems/cpukit/ChangeLog:1.2302 Sun May 23 01:30:22 2010
+++ rtems/cpukit/ChangeLog Tue May 25 09:12:53 2010
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2010-05-25 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * librpc/src/rpc/rpc_prot.c: Partial merger from freebsd
+ (Improved 64 bit compatibility; bug fix).
+
</font> 2010-05-23 Ralf Corsépius <ralf.corsepius@rtems.org>
PR 1528/cpukit
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/rpc_prot.c:1.6 rtems/cpukit/librpc/src/rpc/rpc_prot.c:1.7
--- rtems/cpukit/librpc/src/rpc/rpc_prot.c:1.6 Sat Mar 27 21:35:23 2010
+++ rtems/cpukit/librpc/src/rpc/rpc_prot.c Tue May 25 09:12:53 2010
</font><font color='#997700'>@@ -50,6 +50,7 @@
</font> #include "config.h"
#endif
<font color='#000088'>+#include <assert.h>
</font> #include <sys/param.h>
#include <rpc/rpc.h>
<font color='#997700'>@@ -71,6 +72,9 @@
</font> struct opaque_auth *ap)
{
<font color='#000088'>+ assert(xdrs != NULL);
+ assert(ap != NULL);
+
</font> if (xdr_enum(xdrs, &(ap->oa_flavor)))
return (xdr_bytes(xdrs, &ap->oa_base,
&ap->oa_length, MAX_AUTH_BYTES));
<font color='#997700'>@@ -85,6 +89,10 @@
</font> XDR *xdrs,
des_block *blkp)
{
<font color='#000088'>+
+ assert(xdrs != NULL);
+ assert(blkp != NULL);
+
</font> return (xdr_opaque(xdrs, (caddr_t)blkp, sizeof(des_block)));
}
<font color='#997700'>@@ -118,7 +126,6 @@
</font> case SYSTEM_ERR:
case PROC_UNAVAIL:
case PROG_UNAVAIL:
<font color='#880000'>-/* default: */
</font> break;
}
return (TRUE); /* TRUE => open ended set of problems */
<font color='#997700'>@@ -203,6 +210,8 @@
</font> struct rpc_err *error)
{
<font color='#000088'>+ assert(error != NULL);
+
</font> switch (acpt_stat) {
case PROG_UNAVAIL:
<font color='#997700'>@@ -231,8 +240,8 @@
</font> }
/* something's wrong, but we don't know what ... */
error->re_status = RPC_FAILED;
<font color='#880000'>- error->re_lb.s1 = (long)MSG_ACCEPTED;
- error->re_lb.s2 = (long)acpt_stat;
</font><font color='#000088'>+ error->re_lb.s1 = (int32_t)MSG_ACCEPTED;
+ error->re_lb.s2 = (int32_t)acpt_stat;
</font> }
static void
<font color='#997700'>@@ -241,22 +250,21 @@
</font> struct rpc_err *error)
{
<font color='#880000'>- switch (rjct_stat) {
</font><font color='#000088'>+ assert(error != NULL);
</font>
<font color='#880000'>- case RPC_VERSMISMATCH:
</font><font color='#000088'>+ switch (rjct_stat) {
+ case RPC_MISMATCH:
</font> error->re_status = RPC_VERSMISMATCH;
return;
case AUTH_ERROR:
error->re_status = RPC_AUTHERROR;
return;
<font color='#880000'>- default:
- break;
</font> }
/* something's wrong, but we don't know what ... */
error->re_status = RPC_FAILED;
<font color='#880000'>- error->re_lb.s1 = (long)MSG_DENIED;
- error->re_lb.s2 = (long)rjct_stat;
</font><font color='#000088'>+ error->re_lb.s1 = (int32_t)MSG_DENIED;
+ error->re_lb.s2 = (int32_t)rjct_stat;
</font> }
/*
<font color='#997700'>@@ -268,6 +276,9 @@
</font> struct rpc_err *error)
{
<font color='#000088'>+ assert(msg != NULL);
+ assert(error != NULL);
+
</font> /* optimized for normal, SUCCESSful case */
switch (msg->rm_reply.rp_stat) {
<font color='#997700'>@@ -285,7 +296,7 @@
</font>
default:
error->re_status = RPC_FAILED;
<font color='#880000'>- error->re_lb.s1 = (long)(msg->rm_reply.rp_stat);
</font><font color='#000088'>+ error->re_lb.s1 = (int32_t)(msg->rm_reply.rp_stat);
</font> break;
}
switch (error->re_status) {
</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>