<!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-27)</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-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/sys/socketvar.h (struct sockbuf):
Use void* instead of caddr_t.
</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.2309&r2=text&tr2=1.2310&diff_format=h">M</a></td><td width='1%'>1.2310</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libnetworking/sys/socketvar.h.diff?r1=text&tr1=1.12&r2=text&tr2=1.13&diff_format=h">M</a></td><td width='1%'>1.13</td><td width='100%'>cpukit/libnetworking/sys/socketvar.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2309 rtems/cpukit/ChangeLog:1.2310
--- rtems/cpukit/ChangeLog:1.2309 Wed May 26 23:14:17 2010
+++ rtems/cpukit/ChangeLog Thu May 27 02:31:49 2010
</font><font color='#997700'>@@ -1,5 +1,7 @@
</font> 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libnetworking/sys/socketvar.h (struct sockbuf):
+ Use void* instead of caddr_t.
</font> * libfs/src/nfsclient/src/rpcio.c:<span style="background-color: #FF0000"> </span>
Use address to rpciod in calls to rxWakeupCB.
* libnetworking/sys/socket.h (struct sockwakeup):
<font color='#006600'>diff -u rtems/cpukit/libnetworking/sys/socketvar.h:1.12 rtems/cpukit/libnetworking/sys/socketvar.h:1.13
--- rtems/cpukit/libnetworking/sys/socketvar.h:1.12 Mon Feb 9 16:18:30 2009
+++ rtems/cpukit/libnetworking/sys/socketvar.h Thu May 27 02:31:49 2010
</font><font color='#997700'>@@ -90,8 +90,8 @@
</font> struct selinfo sb_sel; /* process selecting read/write */
short sb_flags; /* flags, see below */
int sb_timeo; /* timeout for read/write */
<font color='#880000'>- void (*sb_wakeup)(struct socket *, caddr_t);
- caddr_t sb_wakeuparg; /* arg for above */
</font><font color='#000088'>+ void (*sb_wakeup)(struct socket *, void *);
+ void<span style="background-color: #FF0000"> </span> *sb_wakeuparg; /* arg for above */
</font> } so_rcv, so_snd;
#define SB_MAX (256L*1024L) /* default for max chars in sockbuf */
#define SB_LOCK 0x01 /* lock on data queue */
</pre>
<p> </p>
<a name='cs2'></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-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* librpc/include/rpc/clnt.h, librpc/include/rpc/rpc_msg.h,
librpc/src/rpc/clnt_generic.c, librpc/src/rpc/clnt_raw.c,
librpc/src/rpc/clnt_tcp.c, librpc/src/rpc/clnt_udp.c,
librpc/src/rpc/pmap_clnt.c, librpc/src/rpc/pmap_getmaps.c
librpc/src/rpc/pmap_getport.c:
Partial merger from freebsd (portability fixes).
</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.2310&r2=text&tr2=1.2311&diff_format=h">M</a></td><td width='1%'>1.2311</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/include/rpc/clnt.h.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>cpukit/librpc/include/rpc/clnt.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/librpc/include/rpc/rpc_msg.h.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>cpukit/librpc/include/rpc/rpc_msg.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/librpc/src/rpc/clnt_generic.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>cpukit/librpc/src/rpc/clnt_generic.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/librpc/src/rpc/clnt_raw.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>cpukit/librpc/src/rpc/clnt_raw.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/librpc/src/rpc/clnt_tcp.c.diff?r1=text&tr1=1.13&r2=text&tr2=1.14&diff_format=h">M</a></td><td width='1%'>1.14</td><td width='100%'>cpukit/librpc/src/rpc/clnt_tcp.c</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.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>cpukit/librpc/src/rpc/clnt_udp.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/librpc/src/rpc/pmap_clnt.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</td><td width='100%'>cpukit/librpc/src/rpc/pmap_clnt.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/librpc/src/rpc/pmap_getmaps.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/pmap_getmaps.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/librpc/src/rpc/pmap_getport.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/pmap_getport.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2310 rtems/cpukit/ChangeLog:1.2311
--- rtems/cpukit/ChangeLog:1.2310 Thu May 27 02:31:49 2010
+++ rtems/cpukit/ChangeLog Thu May 27 02:36:08 2010
</font><font color='#997700'>@@ -1,5 +1,14 @@
</font> 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * librpc/include/rpc/clnt.h, librpc/include/rpc/rpc_msg.h,
+ librpc/src/rpc/clnt_generic.c, librpc/src/rpc/clnt_raw.c,
+ librpc/src/rpc/clnt_tcp.c, librpc/src/rpc/clnt_udp.c,
+ librpc/src/rpc/pmap_clnt.c, librpc/src/rpc/pmap_getmaps.c
+ librpc/src/rpc/pmap_getport.c:
+ Partial merger from freebsd (portability fixes).
+
+2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * libnetworking/sys/socketvar.h (struct sockbuf):
Use void* instead of caddr_t.
* libfs/src/nfsclient/src/rpcio.c:<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u rtems/cpukit/librpc/include/rpc/clnt.h:1.10 rtems/cpukit/librpc/include/rpc/clnt.h:1.11
--- rtems/cpukit/librpc/include/rpc/clnt.h:1.10 Fri Aug 1 11:57:19 2008
+++ rtems/cpukit/librpc/include/rpc/clnt.h Thu May 27 02:36:23 2010
</font><font color='#997700'>@@ -101,8 +101,8 @@
</font> struct clnt_ops {
/* call remote procedure */
enum clnt_stat (*cl_call)(struct __rpc_client *,
<font color='#880000'>- u_long, xdrproc_t, caddr_t, xdrproc_t,
- caddr_t, struct timeval);
</font><font color='#000088'>+ rpcproc_t, xdrproc_t, void *, xdrproc_t,
+ void *, struct timeval);
</font> /* abort a call */
void (*cl_abort)(void);
/* get specific error code */
<font color='#997700'>@@ -110,7 +110,7 @@
</font> struct rpc_err *);
/* frees results */
bool_t (*cl_freeres)(struct __rpc_client *,
<font color='#880000'>- xdrproc_t, caddr_t);
</font><font color='#000088'>+ xdrproc_t, void *);
</font> /* destroy this structure */
void (*cl_destroy)(struct __rpc_client *);
/* the ioctl() of rpc */
<font color='#997700'>@@ -133,19 +133,19 @@
</font> * enum clnt_stat
* CLNT_CALL(rh, proc, xargs, argsp, xres, resp, timeout)
*<span style="background-color: #FF0000"> </span> CLIENT *rh;
<font color='#880000'>- * u_long proc;
</font><font color='#000088'>+ * rpcproc_t proc;
</font> * xdrproc_t xargs;
<font color='#880000'>- * caddr_t argsp;
</font><font color='#000088'>+ * void *argsp;
</font> * xdrproc_t xres;
<font color='#880000'>- * caddr_t resp;
</font><font color='#000088'>+ * void *resp;
</font> * struct timeval timeout;
*/
#define CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs) \
<font color='#880000'>- ((*(rh)->cl_ops->cl_call)(rh, proc, (xdrproc_t)xargs, (caddr_t)argsp, \
- (xdrproc_t) xres, (caddr_t)resp, secs))
</font><font color='#000088'>+ ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \
+ argsp, xres, resp, secs))
</font> #define clnt_call(rh, proc, xargs, argsp, xres, resp, secs) \
<font color='#880000'>- ((*(rh)->cl_ops->cl_call)(rh, proc, (xdrproc_t) xargs, (caddr_t)argsp, \
- (xdrproc_t) xres, (caddr_t)resp, secs))
</font><font color='#000088'>+ ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \
+ argsp, xres, resp, secs))
</font>
/*
* void
<font color='#997700'>@@ -169,10 +169,10 @@
</font> * CLNT_FREERES(rh, xres, resp);
*<span style="background-color: #FF0000"> </span> CLIENT *rh;
* xdrproc_t xres;
<font color='#880000'>- * caddr_t resp;
</font><font color='#000088'>+ * void *resp;
</font> */
<font color='#880000'>-#define CLNT_FREERES(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,(xdrproc_t)xres,resp))
-#define clnt_freeres(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,(xdrproc_t)xres,resp))
</font><font color='#000088'>+#define CLNT_FREERES(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
+#define clnt_freeres(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
</font>
/*
* bool_t
<font color='#997700'>@@ -256,18 +256,12 @@
</font> /*
* Generic client creation routine. Supported protocols are "udp", "tcp"
* and "unix".
<font color='#880000'>- * CLIENT *
- * clnt_create(host, prog, vers, prot);
- * char *host;<span style="background-color: #FF0000"> </span> -- hostname
- * u_long prog; -- program number
- * u_long vers; -- version number
- * char *prot; -- protocol
</font> */
__BEGIN_DECLS
<font color='#880000'>-extern CLIENT *clnt_create(char *, u_long, u_long, char *);
</font><font color='#000088'>+extern CLIENT *clnt_create(const char *, const rpcprog_t, const rpcvers_t,
+ const char *);
</font> __END_DECLS
<font color='#880000'>-
</font> /*
* Added for compatibility to old rpc 4.0. Obsoleted by clnt_vc_create().
*/
<font color='#006600'>diff -u rtems/cpukit/librpc/include/rpc/rpc_msg.h:1.4 rtems/cpukit/librpc/include/rpc/rpc_msg.h:1.5
--- rtems/cpukit/librpc/include/rpc/rpc_msg.h:1.4 Fri Aug 1 00:31:14 2008
+++ rtems/cpukit/librpc/include/rpc/rpc_msg.h Thu May 27 02:36:24 2010
</font><font color='#997700'>@@ -92,8 +92,8 @@
</font> enum accept_stat ar_stat;
union {
struct {
<font color='#880000'>- u_int32_t low;
- u_int32_t high;
</font><font color='#000088'>+ rpcvers_t low;
+ rpcvers_t high;
</font> } AR_versions;
struct {
caddr_t where;
<font color='#997700'>@@ -112,8 +112,8 @@
</font> enum reject_stat rj_stat;
union {
struct {
<font color='#880000'>- u_int32_t low;
- u_int32_t high;
</font><font color='#000088'>+ rpcvers_t low;
+ rpcvers_t high;
</font> } RJ_versions;
enum auth_stat RJ_why; /* why authentication did not work */
} ru;
<font color='#997700'>@@ -138,10 +138,10 @@
</font> * Body of an rpc request call.
*/
struct call_body {
<font color='#880000'>- u_int32_t cb_rpcvers; /* must be equal to two */
- u_int32_t cb_prog;
- u_int32_t cb_vers;
- u_int32_t cb_proc;
</font><font color='#000088'>+ rpcvers_t cb_rpcvers; /* must be equal to two */
+ rpcprog_t cb_prog;
+ rpcvers_t cb_vers;
+ rpcproc_t cb_proc;
</font> struct opaque_auth cb_cred;
struct opaque_auth cb_verf; /* protocol specific - provided by client */
};
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/clnt_generic.c:1.4 rtems/cpukit/librpc/src/rpc/clnt_generic.c:1.5
--- rtems/cpukit/librpc/src/rpc/clnt_generic.c:1.4 Sat Mar 27 21:35:23 2010
+++ rtems/cpukit/librpc/src/rpc/clnt_generic.c Thu May 27 02:36:24 2010
</font><font color='#997700'>@@ -53,10 +53,10 @@
</font> */
CLIENT *
clnt_create(
<font color='#880000'>- char *hostname,
- u_long prog,
- u_long vers,
- char *proto)
</font><font color='#000088'>+ const char *hostname,
+ rpcprog_t prog,
+ rpcvers_t vers,
+ const char *proto)
</font> {
struct hostent *h;
struct protoent *p;
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/clnt_raw.c:1.8 rtems/cpukit/librpc/src/rpc/clnt_raw.c:1.9
--- rtems/cpukit/librpc/src/rpc/clnt_raw.c:1.8 Tue May 25 22:41:49 2010
+++ rtems/cpukit/librpc/src/rpc/clnt_raw.c Thu May 27 02:36:24 2010
</font><font color='#997700'>@@ -69,10 +69,10 @@
</font> };
#define clntraw_private (rtems_rpc_task_variables->clnt_raw_private)
<font color='#880000'>-static enum clnt_stat clntraw_call(CLIENT *h, u_long proc, xdrproc_t xargs, caddr_t argsp, xdrproc_t xresults, caddr_t resultsp, struct timeval timeout);
</font><font color='#000088'>+static enum clnt_stat clntraw_call(CLIENT *h, rpcproc_t proc, xdrproc_t xargs, void *argsp, xdrproc_t xresults, void *resultsp, struct timeval timeout);
</font> static void clntraw_abort(void);
static void clntraw_geterr(CLIENT *h, struct rpc_err*);
<font color='#880000'>-static bool_t clntraw_freeres(CLIENT *, xdrproc_t, caddr_t);
</font><font color='#000088'>+static bool_t clntraw_freeres(CLIENT *, xdrproc_t, void*);
</font> static bool_t clntraw_control(CLIENT *, int, char *);
static void clntraw_destroy(CLIENT *);
<font color='#997700'>@@ -134,11 +134,11 @@
</font> static enum clnt_stat
clntraw_call(
CLIENT *h,
<font color='#880000'>- u_long proc,
</font><font color='#000088'>+ rpcproc_t proc,
</font> xdrproc_t xargs,
<font color='#880000'>- caddr_t argsp,
</font><font color='#000088'>+ void *argsp,
</font> xdrproc_t xresults,
<font color='#880000'>- caddr_t resultsp,
</font><font color='#000088'>+ void *resultsp,
</font> struct timeval timeout )
{
struct clnt_raw_private *clp = clntraw_private;
<font color='#997700'>@@ -216,7 +216,7 @@
</font> clntraw_freeres(
CLIENT *cl,
xdrproc_t xdr_res,
<font color='#880000'>- caddr_t res_ptr )
</font><font color='#000088'>+ void *res_ptr )
</font> {
struct clnt_raw_private *clp = clntraw_private;
XDR *xdrs = &clp->xdr_stream;
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/clnt_tcp.c:1.13 rtems/cpukit/librpc/src/rpc/clnt_tcp.c:1.14
--- rtems/cpukit/librpc/src/rpc/clnt_tcp.c:1.13 Tue May 25 23:15:02 2010
+++ rtems/cpukit/librpc/src/rpc/clnt_tcp.c Thu May 27 02:36:24 2010
</font><font color='#997700'>@@ -72,10 +72,10 @@
</font> static int readtcp(char *, char*, int);
static int writetcp(char *, char*, int);
<font color='#880000'>-static enum clnt_stat clnttcp_call(CLIENT *, u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t, struct timeval);
</font><font color='#000088'>+static enum clnt_stat clnttcp_call(CLIENT *, rpcproc_t, xdrproc_t, void*, xdrproc_t, void*, struct timeval);
</font> static void clnttcp_abort(void);
static void clnttcp_geterr(CLIENT *, struct rpc_err*);
<font color='#880000'>-static bool_t clnttcp_freeres(CLIENT *, xdrproc_t, caddr_t);
</font><font color='#000088'>+static bool_t clnttcp_freeres(CLIENT *, xdrproc_t, void*);
</font> static bool_t clnttcp_control(CLIENT *, int, char *);
static void clnttcp_destroy(CLIENT *);
<font color='#997700'>@@ -120,8 +120,8 @@
</font> CLIENT *
clnttcp_create(
struct sockaddr_in *raddr,
<font color='#880000'>- u_long prog,
- u_long vers,
</font><font color='#000088'>+ rpcprog_t prog, /* program number */
+ rpcvers_t vers, /* version number */
</font> int *sockp,
u_int sendsz,
u_int recvsz)
<font color='#997700'>@@ -240,11 +240,11 @@
</font> static enum clnt_stat
clnttcp_call(
CLIENT *h,
<font color='#880000'>- u_long proc,
</font><font color='#000088'>+ rpcproc_t proc,
</font> xdrproc_t xdr_args,
<font color='#880000'>- caddr_t args_ptr,
</font><font color='#000088'>+ void *args_ptr,
</font> xdrproc_t xdr_results,
<font color='#880000'>- caddr_t results_ptr,
</font><font color='#000088'>+ void *results_ptr,
</font> struct timeval timeout)
{
struct ct_data *ct = (struct ct_data *) h->cl_private;
<font color='#997700'>@@ -351,7 +351,7 @@
</font> clnttcp_freeres(
CLIENT *cl,
xdrproc_t xdr_res,
<font color='#880000'>- caddr_t res_ptr)
</font><font color='#000088'>+ void *res_ptr)
</font> {
struct ct_data *ct;
XDR *xdrs;
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/clnt_udp.c:1.10 rtems/cpukit/librpc/src/rpc/clnt_udp.c:1.11
--- rtems/cpukit/librpc/src/rpc/clnt_udp.c:1.10 Wed May 26 01:23:58 2010
+++ rtems/cpukit/librpc/src/rpc/clnt_udp.c Thu May 27 02:36:24 2010
</font><font color='#997700'>@@ -58,10 +58,10 @@
</font> /*
* UDP bases client side rpc operations
*/
<font color='#880000'>-static enum clnt_stat clntudp_call(CLIENT *, u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t, struct timeval);
</font><font color='#000088'>+static enum clnt_stat clntudp_call(CLIENT *, rpcproc_t, xdrproc_t, void*, xdrproc_t, void*, struct timeval);
</font> static void clntudp_abort(void);
static void clntudp_geterr(CLIENT *, struct rpc_err*);
<font color='#880000'>-static bool_t clntudp_freeres(CLIENT *, xdrproc_t, caddr_t);
</font><font color='#000088'>+static bool_t clntudp_freeres(CLIENT *, xdrproc_t, void*);
</font> static bool_t clntudp_control(CLIENT *, int, char *);
static void clntudp_destroy(CLIENT *);
<font color='#997700'>@@ -112,8 +112,8 @@
</font> CLIENT *
clntudp_bufcreate(
struct sockaddr_in *raddr,
<font color='#880000'>- u_long program,
- u_long version,
</font><font color='#000088'>+ rpcprog_t program, /* program number */
+ rpcvers_t version, /* version number */
</font> struct timeval wait,
int *sockp,
u_int sendsz,
<font color='#997700'>@@ -206,8 +206,8 @@
</font> CLIENT *
clntudp_create(
struct sockaddr_in *raddr,
<font color='#880000'>- u_long program,
- u_long version,
</font><font color='#000088'>+ rpcprog_t program, /* program number */
+ rpcvers_t version, /* version number */
</font> struct timeval wait,
int *sockp)
{
<font color='#997700'>@@ -219,11 +219,11 @@
</font> static enum clnt_stat
clntudp_call(
CLIENT *cl, /* client handle */
<font color='#880000'>- u_long proc, /* procedure number */
</font><font color='#000088'>+ rpcproc_t proc, /* procedure number */
</font> xdrproc_t xargs, /* xdr routine for args */
<font color='#880000'>- caddr_t argsp,<span style="background-color: #FF0000"> </span> /* pointer to args */
</font><font color='#000088'>+ void *argsp, /* pointer to args */
</font> xdrproc_t xresults, /* xdr routine for results */
<font color='#880000'>- caddr_t resultsp, /* pointer to results */
</font><font color='#000088'>+ void *resultsp, /* pointer to results */
</font> struct timeval utimeout ) /* seconds to wait before giving up */
{
struct cu_data *cu = (struct cu_data *)cl->cl_private;
<font color='#997700'>@@ -423,7 +423,7 @@
</font> clntudp_freeres(
CLIENT *cl,
xdrproc_t xdr_res,
<font color='#880000'>- caddr_t res_ptr)
</font><font color='#000088'>+ void *res_ptr)
</font> {
struct cu_data *cu = (struct cu_data *)cl->cl_private;
XDR *xdrs = &(cu->cu_outxdrs);
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/pmap_clnt.c:1.7 rtems/cpukit/librpc/src/rpc/pmap_clnt.c:1.8
--- rtems/cpukit/librpc/src/rpc/pmap_clnt.c:1.7 Sat Mar 27 21:35:23 2010
+++ rtems/cpukit/librpc/src/rpc/pmap_clnt.c Thu May 27 02:36:24 2010
</font><font color='#997700'>@@ -72,7 +72,7 @@
</font> {
struct sockaddr_in myaddress;
int socket = -1;
<font color='#880000'>- register CLIENT *client;
</font><font color='#000088'>+ CLIENT *client;
</font> struct pmap parms;
bool_t rslt;
struct stat st;
<font color='#997700'>@@ -97,7 +97,7 @@
</font> parms.pm_vers = version;
parms.pm_prot = protocol;
parms.pm_port = port;
<font color='#880000'>- if (CLNT_CALL(client, PMAPPROC_SET, xdr_pmap, &parms, xdr_bool, &rslt,
</font><font color='#000088'>+ if (CLNT_CALL(client, PMAPPROC_SET, (xdrproc_t)xdr_pmap, &parms, (xdrproc_t)xdr_bool, &rslt,
</font> tottimeout) != RPC_SUCCESS) {
clnt_perror(client, "Cannot register service");
return (FALSE);
<font color='#997700'>@@ -109,7 +109,7 @@
</font> }
/*
<font color='#880000'>- * Remove the mapping between program,version and port.
</font><font color='#000088'>+ * Remove the mapping between program, version and port.
</font> * Calls the pmap service remotely to do the un-mapping.
*/
bool_t
<font color='#997700'>@@ -142,7 +142,7 @@
</font> parms.pm_prog = program;
parms.pm_vers = version;
parms.pm_port = parms.pm_prot = 0;
<font color='#880000'>- CLNT_CALL(client, PMAPPROC_UNSET, xdr_pmap, &parms, xdr_bool, &rslt,
</font><font color='#000088'>+ CLNT_CALL(client, PMAPPROC_UNSET, (xdrproc_t)xdr_pmap, &parms, (xdrproc_t)xdr_bool, &rslt,
</font> tottimeout);
CLNT_DESTROY(client);
if (socket != -1)
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/pmap_getmaps.c:1.6 rtems/cpukit/librpc/src/rpc/pmap_getmaps.c:1.7
--- rtems/cpukit/librpc/src/rpc/pmap_getmaps.c:1.6 Sat Mar 27 21:35:23 2010
+++ rtems/cpukit/librpc/src/rpc/pmap_getmaps.c Thu May 27 02:36:24 2010
</font><font color='#997700'>@@ -66,19 +66,21 @@
</font> struct pmaplist *
pmap_getmaps(struct sockaddr_in *address)
{
<font color='#880000'>- struct pmaplist *head = (struct pmaplist *)NULL;
</font><font color='#000088'>+ struct pmaplist *head = NULL;
</font> int socket = -1;
struct timeval minutetimeout;
<font color='#880000'>- register CLIENT *client;
</font><font color='#000088'>+ CLIENT *client;
</font>
minutetimeout.tv_sec = 60;
minutetimeout.tv_usec = 0;
address->sin_port = htons(PMAPPORT);
client = clnttcp_create(address, PMAPPROG,
PMAPVERS, &socket, 50, 500);
<font color='#880000'>- if (client != (CLIENT *)NULL) {
- if (CLNT_CALL(client, PMAPPROC_DUMP, xdr_void, NULL, xdr_pmaplist,
- &head, minutetimeout) != RPC_SUCCESS) {
</font><font color='#000088'>+ if (client != NULL) {
+ if (CLNT_CALL(client, (rpcproc_t)PMAPPROC_DUMP,<span style="background-color: #FF0000"> </span>
+ (xdrproc_t)xdr_void, NULL,
+ (xdrproc_t)xdr_pmaplist, &head, minutetimeout) !=
+ RPC_SUCCESS) {
</font> clnt_perror(client, "pmap_getmaps rpc problem");
}
CLNT_DESTROY(client);
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/pmap_getport.c:1.6 rtems/cpukit/librpc/src/rpc/pmap_getport.c:1.7
--- rtems/cpukit/librpc/src/rpc/pmap_getport.c:1.6 Sat Mar 27 21:35:23 2010
+++ rtems/cpukit/librpc/src/rpc/pmap_getport.c Thu May 27 02:36:24 2010
</font><font color='#997700'>@@ -52,8 +52,8 @@
</font> #include <net/if.h>
#include <unistd.h>
<font color='#880000'>-static struct timeval timeout = { 5, 0 };
-static struct timeval tottimeout = { 60, 0 };
</font><font color='#000088'>+static const struct timeval timeout = { 5, 0 };
+static const struct timeval tottimeout = { 60, 0 };
</font>
/*
* Find the mapped port for program,version.
<font color='#997700'>@@ -69,19 +69,21 @@
</font> {
u_short port = 0;
int socket = -1;
<font color='#880000'>- register CLIENT *client;
</font><font color='#000088'>+ CLIENT *client;
</font> struct pmap parms;
address->sin_port = htons(PMAPPORT);
client = clntudp_bufcreate(address, PMAPPROG,
PMAPVERS, timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
<font color='#880000'>- if (client != (CLIENT *)NULL) {
</font><font color='#000088'>+ if (client != NULL) {
</font> parms.pm_prog = program;
parms.pm_vers = version;
parms.pm_prot = protocol;
parms.pm_port = 0; /* not needed or used */
<font color='#880000'>- if (CLNT_CALL(client, PMAPPROC_GETPORT, xdr_pmap, &parms,
- xdr_u_short, &port, tottimeout) != RPC_SUCCESS){
</font><font color='#000088'>+ if (CLNT_CALL(client, (rpcproc_t)PMAPPROC_GETPORT,
+ (xdrproc_t)xdr_pmap,
+ &parms, (xdrproc_t)xdr_u_short, &port, tottimeout) !=
+ RPC_SUCCESS){
</font> rpc_createerr.cf_stat = RPC_PMAPFAILURE;
clnt_geterr(client, &rpc_createerr.cf_error);
} else if (port == 0) {
</pre>
<p> </p>
<a name='cs3'></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-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* librpc/src/rpc/rtems_portmapper.c: Reflect changes to librpc.
</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.2311&r2=text&tr2=1.2312&diff_format=h">M</a></td><td width='1%'>1.2312</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/rtems_portmapper.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>cpukit/librpc/src/rpc/rtems_portmapper.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2311 rtems/cpukit/ChangeLog:1.2312
--- rtems/cpukit/ChangeLog:1.2311 Thu May 27 02:36:08 2010
+++ rtems/cpukit/ChangeLog Thu May 27 02:37:32 2010
</font><font color='#997700'>@@ -1,5 +1,9 @@
</font> 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * librpc/src/rpc/rtems_portmapper.c: Reflect changes to librpc.
+
+2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * librpc/include/rpc/clnt.h, librpc/include/rpc/rpc_msg.h,
librpc/src/rpc/clnt_generic.c, librpc/src/rpc/clnt_raw.c,
librpc/src/rpc/clnt_tcp.c, librpc/src/rpc/clnt_udp.c,
<font color='#006600'>diff -u rtems/cpukit/librpc/src/rpc/rtems_portmapper.c:1.10 rtems/cpukit/librpc/src/rpc/rtems_portmapper.c:1.11
--- rtems/cpukit/librpc/src/rpc/rtems_portmapper.c:1.10 Sat Mar 27 21:35:23 2010
+++ rtems/cpukit/librpc/src/rpc/rtems_portmapper.c Thu May 27 02:37:32 2010
</font><font color='#997700'>@@ -364,8 +364,10 @@
</font> static bool_t
xdr_opaque_parms(
XDR *xdrs,
<font color='#880000'>- struct rmtcallargs *cap )
</font><font color='#000088'>+ void *args,
+ ... )
</font> {
<font color='#000088'>+ struct rmtcallargs *cap = (struct rmtcallargs *) args;
</font>
return (xdr_opaque(xdrs, cap->rmt_args.args, cap->rmt_args.arglen));
}
<font color='#997700'>@@ -376,9 +378,11 @@
</font> */
static bool_t
xdr_len_opaque_parms(
<font color='#880000'>- register XDR *xdrs,
- struct rmtcallargs *cap )
</font><font color='#000088'>+ XDR *xdrs,
+ void *args,<span style="background-color: #FF0000"> </span>
+ ... )
</font> {
<font color='#000088'>+ struct rmtcallargs *cap = (struct rmtcallargs *) args;
</font> register u_int beginpos, lowpos, highpos, currpos, pos;
beginpos = lowpos = pos = xdr_getpos(xdrs);
</pre>
<p> </p>
<a name='cs4'></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-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/nfsclient/src/rpcio.c, libfs/src/nfsclient/src/rpcio.h:
Use rpcprog_t for "program args", use rpcvers_t for "version args".
</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.2312&r2=text&tr2=1.2313&diff_format=h">M</a></td><td width='1%'>1.2313</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/nfsclient/src/rpcio.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>cpukit/libfs/src/nfsclient/src/rpcio.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/nfsclient/src/rpcio.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>cpukit/libfs/src/nfsclient/src/rpcio.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2312 rtems/cpukit/ChangeLog:1.2313
--- rtems/cpukit/ChangeLog:1.2312 Thu May 27 02:37:32 2010
+++ rtems/cpukit/ChangeLog Thu May 27 02:41:51 2010
</font><font color='#997700'>@@ -1,5 +1,10 @@
</font> 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libfs/src/nfsclient/src/rpcio.c, libfs/src/nfsclient/src/rpcio.h:
+ Use rpcprog_t for "program args", use rpcvers_t for "version args".
+
+2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * librpc/src/rpc/rtems_portmapper.c: Reflect changes to librpc.
2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#006600'>diff -u rtems/cpukit/libfs/src/nfsclient/src/rpcio.h:1.2 rtems/cpukit/libfs/src/nfsclient/src/rpcio.h:1.3
--- rtems/cpukit/libfs/src/nfsclient/src/rpcio.h:1.2 Sun Nov 29 07:18:56 2009
+++ rtems/cpukit/libfs/src/nfsclient/src/rpcio.h Thu May 27 02:41:51 2010
</font><font color='#997700'>@@ -73,11 +73,11 @@
</font>
enum clnt_stat
rpcUdpServerCreate(
<font color='#880000'>- struct sockaddr_in *paddr,
- int prog,
- int vers,
- u_long uid, /* RPCIO_DEFAULT_ID picks default */
- u_long gid, /* RPCIO_DEFAULT_ID picks default */
</font><font color='#000088'>+ struct sockaddr_in *paddr,
+ rpcprog_t prog,
+ rpcvers_t vers,
+ u_long uid, /* RPCIO_DEFAULT_ID picks default */
+ u_long gid, /* RPCIO_DEFAULT_ID picks default */
</font> RpcUdpServer *pclnt /* new server is returned here */
);
<font color='#997700'>@@ -94,11 +94,11 @@
</font> enum clnt_stat
rpcUdpClntCreate(
struct sockaddr_in *psaddr,
<font color='#880000'>- int prog,
- int vers,
- u_long uid, /* RPCIO_DEFAULT_ID picks default */
- u_long gid, /* RPCIO_DEFAULT_ID picks default */
- RpcUdpClnt *pclnt /* new client is returned here */
</font><font color='#000088'>+ rpcprog_t prog,
+ rpcvers_t vers,
+ u_long uid, /* RPCIO_DEFAULT_ID picks default */
+ u_long gid, /* RPCIO_DEFAULT_ID picks default */
+ RpcUdpClnt *pclnt /* new client is returned here */
</font> );
void
<font color='#997700'>@@ -188,7 +188,7 @@
</font> */
RpcUdpXactPool
rpcUdpXactPoolCreate(
<font color='#880000'>- int prog,<span style="background-color: #FF0000"> </span> int version,
</font><font color='#000088'>+ rpcprog_t prog, rpcvers_t version,
</font> int xactsize, int poolsize);
void
<font color='#006600'>diff -u rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.10 rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.11
--- rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.10 Wed May 26 23:14:17 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/rpcio.c Thu May 27 02:41:51 2010
</font><font color='#997700'>@@ -485,10 +485,10 @@
</font> enum clnt_stat
rpcUdpServerCreate(
struct sockaddr_in *paddr,
<font color='#880000'>- int prog,
- int vers,
- u_long uid,
- u_long gid,
</font><font color='#000088'>+ rpcprog_t prog,
+ rpcvers_t vers,
+ u_long uid,
+ u_long gid,
</font> RpcUdpServer *psrv
)
{
<font color='#997700'>@@ -1019,12 +1019,12 @@
</font> */
enum clnt_stat
rpcUdpClntCreate(
<font color='#880000'>- struct sockaddr_in *psaddr,
- int prog,
- int vers,
- u_long uid,
- u_long gid,
- RpcUdpClnt *pclnt
</font><font color='#000088'>+ struct sockaddr_in *psaddr,
+ rpcprog_t prog,
+ rpcvers_t vers,
+ u_long uid,
+ u_long gid,
+ RpcUdpClnt *pclnt
</font> )
{
RpcUdpXact x;
<font color='#997700'>@@ -1513,7 +1513,7 @@
</font>
RpcUdpXactPool
rpcUdpXactPoolCreate(
<font color='#880000'>- int prog,<span style="background-color: #FF0000"> </span> int version,
</font><font color='#000088'>+ rpcprog_t prog,<span style="background-color: #FF0000"> </span> rpcvers_t version,
</font> int xactsize, int poolsize)
{
RpcUdpXactPool rval = MY_MALLOC(sizeof(*rval));
</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>