From 90d2585a07eac08511ea92bf333930971c8e6374 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 14 Sep 2006 19:09:06 +0000 Subject: 2006-09-14 Joel Sherrill * libnetworking/net/route.c, librpc/src/rpc/auth_none.c, librpc/src/rpc/auth_unix.c, librpc/src/rpc/authunix_prot.c, librpc/src/rpc/rpc_callmsg.c, librpc/src/rpc/rpc_prot.c, librpc/src/rpc/rtems_portmapper.c: Removed warnings. --- cpukit/ChangeLog | 7 +++++++ cpukit/libnetworking/net/route.c | 11 ++++++----- cpukit/librpc/src/rpc/auth_none.c | 12 ++++++------ cpukit/librpc/src/rpc/auth_unix.c | 12 ++++++------ cpukit/librpc/src/rpc/authunix_prot.c | 2 +- cpukit/librpc/src/rpc/rpc_callmsg.c | 2 +- cpukit/librpc/src/rpc/rpc_prot.c | 12 ++++++------ cpukit/librpc/src/rpc/rtems_portmapper.c | 3 ++- 8 files changed, 35 insertions(+), 26 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 408b61741e..f74a6c5f58 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2006-09-14 Joel Sherrill + + * libnetworking/net/route.c, librpc/src/rpc/auth_none.c, + librpc/src/rpc/auth_unix.c, librpc/src/rpc/authunix_prot.c, + librpc/src/rpc/rpc_callmsg.c, librpc/src/rpc/rpc_prot.c, + librpc/src/rpc/rtems_portmapper.c: Removed warnings. + 2006-09-14 Joel Sherrill * libmisc/cpuuse/cpuuse.c, libmisc/cpuuse/cpuuse.h: Promote CPU Usage diff --git a/cpukit/libnetworking/net/route.c b/cpukit/libnetworking/net/route.c index e9a6eabe8d..d80d659aeb 100644 --- a/cpukit/libnetworking/net/route.c +++ b/cpukit/libnetworking/net/route.c @@ -66,16 +66,17 @@ static int rttrash; /* routes not in table but not freed */ static void rt_maskedcopy __P((struct sockaddr *, struct sockaddr *, struct sockaddr *)); -static void rtable_init __P((void **)); +static void rtable_init __P((struct radix_node_head **)); static void -rtable_init(table) - void **table; +rtable_init( + struct radix_node_head **table +) { struct domain *dom; for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_rtattach) - dom->dom_rtattach(&table[dom->dom_family], + dom->dom_rtattach((void *)&table[dom->dom_family], dom->dom_rtoffset); } @@ -83,7 +84,7 @@ void route_init() { rn_init(); /* initialize all zeroes, all ones, mask table */ - rtable_init((void **)rt_tables); + rtable_init(rt_tables); } /* diff --git a/cpukit/librpc/src/rpc/auth_none.c b/cpukit/librpc/src/rpc/auth_none.c index 3dc05e81c3..61bf7d47fe 100644 --- a/cpukit/librpc/src/rpc/auth_none.c +++ b/cpukit/librpc/src/rpc/auth_none.c @@ -52,9 +52,9 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.9 1999/08/28 00 */ static void authnone_verf(AUTH*); static void authnone_destroy(AUTH*); -static bool_t authnone_marshal(AUTH*, XDR*); -static bool_t authnone_validate(AUTH*, struct opaque_auth *); -static bool_t authnone_refresh(AUTH*); +static int authnone_marshal(AUTH*, XDR*); +static int authnone_validate(AUTH*, struct opaque_auth *); +static int authnone_refresh(AUTH*); static struct auth_ops ops = { authnone_verf, @@ -98,7 +98,7 @@ authnone_create() } /*ARGSUSED*/ -static bool_t +static int authnone_marshal(AUTH *client, XDR *xdrs) { struct authnone_private *ap = authnone_private; @@ -114,14 +114,14 @@ authnone_verf(AUTH *client) { } -static bool_t +static int authnone_validate(AUTH *client, struct opaque_auth *opaque) { return (TRUE); } -static bool_t +static int authnone_refresh(AUTH *client) { diff --git a/cpukit/librpc/src/rpc/auth_unix.c b/cpukit/librpc/src/rpc/auth_unix.c index 279822942a..8703a70ac3 100644 --- a/cpukit/librpc/src/rpc/auth_unix.c +++ b/cpukit/librpc/src/rpc/auth_unix.c @@ -60,9 +60,9 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.12 1999/12/29 0 * Unix authenticator operations vector */ static void authunix_nextverf(AUTH*); -static bool_t authunix_marshal(AUTH*, XDR*); -static bool_t authunix_validate(AUTH*, struct opaque_auth *); -static bool_t authunix_refresh(AUTH*); +static int authunix_marshal(AUTH*, XDR*); +static int authunix_validate(AUTH*, struct opaque_auth *); +static int authunix_refresh(AUTH*); static void authunix_destroy(AUTH*); static struct auth_ops auth_unix_ops = { @@ -223,7 +223,7 @@ authunix_nextverf(AUTH *auth) /* no action necessary */ } -static bool_t +static int authunix_marshal(AUTH *auth, XDR *xdrs) { struct audata *au = AUTH_PRIVATE(auth); @@ -231,7 +231,7 @@ authunix_marshal(AUTH *auth, XDR *xdrs) return (XDR_PUTBYTES(xdrs, au->au_marshed, au->au_mpos)); } -static bool_t +static int authunix_validate( AUTH *auth, struct opaque_auth *verf ) { register struct audata *au; @@ -259,7 +259,7 @@ authunix_validate( AUTH *auth, struct opaque_auth *verf ) return (TRUE); } -static bool_t +static int authunix_refresh(AUTH *auth) { struct audata *au = AUTH_PRIVATE(auth); diff --git a/cpukit/librpc/src/rpc/authunix_prot.c b/cpukit/librpc/src/rpc/authunix_prot.c index e6e91f5396..5791e9e1f9 100644 --- a/cpukit/librpc/src/rpc/authunix_prot.c +++ b/cpukit/librpc/src/rpc/authunix_prot.c @@ -59,7 +59,7 @@ xdr_authunix_parms(xdrs, p) && xdr_string(xdrs, &(p->aup_machname), MAX_MACHINE_NAME) && xdr_int(xdrs, &(p->aup_uid)) && xdr_int(xdrs, &(p->aup_gid)) - && xdr_array(xdrs, (caddr_t *)&(p->aup_gids), + && xdr_array(xdrs, (caddr_t *)(void *)&(p->aup_gids), &(p->aup_len), NGRPS, sizeof(int), (xdrproc_t) xdr_int) ) { return (TRUE); } diff --git a/cpukit/librpc/src/rpc/rpc_callmsg.c b/cpukit/librpc/src/rpc/rpc_callmsg.c index 495ddca819..7cba797e85 100644 --- a/cpukit/librpc/src/rpc/rpc_callmsg.c +++ b/cpukit/librpc/src/rpc/rpc_callmsg.c @@ -179,7 +179,7 @@ xdr_callmsg(xdrs, cmsg) } if ( xdr_u_int32_t(xdrs, &(cmsg->rm_xid)) && - xdr_enum(xdrs, (enum_t *)&(cmsg->rm_direction)) && + xdr_enum(xdrs, (enum_t *)(void *)&(cmsg->rm_direction)) && (cmsg->rm_direction == CALL) && xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && (cmsg->rm_call.cb_rpcvers == RPC_MSG_VERSION) && diff --git a/cpukit/librpc/src/rpc/rpc_prot.c b/cpukit/librpc/src/rpc/rpc_prot.c index 11a1ad2dcd..e96c172f54 100644 --- a/cpukit/librpc/src/rpc/rpc_prot.c +++ b/cpukit/librpc/src/rpc/rpc_prot.c @@ -98,7 +98,7 @@ xdr_accepted_reply(xdrs, ar) /* personalized union, rather than calling xdr_union */ if (! xdr_opaque_auth(xdrs, &(ar->ar_verf))) return (FALSE); - if (! xdr_enum(xdrs, (enum_t *)&(ar->ar_stat))) + if (! xdr_enum(xdrs, (enum_t *)(void *)&(ar->ar_stat))) return (FALSE); switch (ar->ar_stat) { @@ -130,7 +130,7 @@ xdr_rejected_reply(xdrs, rr) { /* personalized union, rather than calling xdr_union */ - if (! xdr_enum(xdrs, (enum_t *)&(rr->rj_stat))) + if (! xdr_enum(xdrs, (enum_t *)(void *)&(rr->rj_stat))) return (FALSE); switch (rr->rj_stat) { @@ -140,7 +140,7 @@ xdr_rejected_reply(xdrs, rr) return (xdr_u_int32_t(xdrs, &(rr->rj_vers.high))); case AUTH_ERROR: - return (xdr_enum(xdrs, (enum_t *)&(rr->rj_why))); + return (xdr_enum(xdrs, (enum_t *)(void *)&(rr->rj_why))); } return (FALSE); } @@ -160,9 +160,9 @@ xdr_replymsg(xdrs, rmsg) { if ( xdr_u_int32_t(xdrs, &(rmsg->rm_xid)) && - xdr_enum(xdrs, (enum_t *)&(rmsg->rm_direction)) && + xdr_enum(xdrs, (enum_t *)(void *)&(rmsg->rm_direction)) && (rmsg->rm_direction == REPLY) ) - return (xdr_union(xdrs, (enum_t *)&(rmsg->rm_reply.rp_stat), + return (xdr_union(xdrs, (enum_t *)(void *)&(rmsg->rm_reply.rp_stat), (caddr_t)&(rmsg->rm_reply.ru), reply_dscrm, NULL_xdrproc_t)); return (FALSE); } @@ -184,7 +184,7 @@ xdr_callhdr(xdrs, cmsg) if ( (xdrs->x_op == XDR_ENCODE) && xdr_u_int32_t(xdrs, &(cmsg->rm_xid)) && - xdr_enum(xdrs, (enum_t *)&(cmsg->rm_direction)) && + xdr_enum(xdrs, (enum_t *)(void *)&(cmsg->rm_direction)) && xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_prog)) ) return (xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_vers))); diff --git a/cpukit/librpc/src/rpc/rtems_portmapper.c b/cpukit/librpc/src/rpc/rtems_portmapper.c index 41e0e3a724..b24b36ba00 100644 --- a/cpukit/librpc/src/rpc/rtems_portmapper.c +++ b/cpukit/librpc/src/rpc/rtems_portmapper.c @@ -316,7 +316,8 @@ xdr_encap_parms( struct encap_parms *epp ) { - return (xdr_bytes(xdrs, &(epp->args), (u_int*)&(epp->arglen), ARGSIZE)); + u_int temp_epp_arglen = epp->arglen; + return (xdr_bytes(xdrs, &(epp->args), &temp_epp_arglen, ARGSIZE)); } struct rmtcallargs { -- cgit v1.2.3