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