diff options
Diffstat (limited to 'usr.sbin/amd/amd/srvr_nfs.c')
| -rw-r--r-- | usr.sbin/amd/amd/srvr_nfs.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/usr.sbin/amd/amd/srvr_nfs.c b/usr.sbin/amd/amd/srvr_nfs.c index 4b65725f105..b76d0674e44 100644 --- a/usr.sbin/amd/amd/srvr_nfs.c +++ b/usr.sbin/amd/amd/srvr_nfs.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)srvr_nfs.c 8.1 (Berkeley) 6/6/93 - * $Id: srvr_nfs.c,v 1.9 2014/10/26 03:03:34 guenther Exp $ + * $Id: srvr_nfs.c,v 1.10 2014/10/26 03:28:41 guenther Exp $ */ /* @@ -156,7 +156,7 @@ got_portmap(void *pkt, int len, struct sockaddr_in *sa, if (fs == fs2) { u_long port = 0; /* XXX - should be short but protocol is naff */ - int error = done ? pickup_rpc_reply(pkt, len, (void *)&port, xdr_u_long) : -1; + int error = done ? pickup_rpc_reply(pkt, len, &port, xdr_u_long) : -1; nfs_private *np = (nfs_private *) fs->fs_private; if (!error && port) { #ifdef DEBUG @@ -212,14 +212,14 @@ call_portmap(fserver *fs, AUTH *auth, unsigned long prog, pmap.pm_prot = prot; pmap.pm_port = 0; len = make_rpc_packet(iobuf, sizeof(iobuf), PMAPPROC_GETPORT, - &pmap_msg, (void *)&pmap, xdr_pmap, auth); + &pmap_msg, &pmap, xdr_pmap, auth); if (len > 0) { struct sockaddr_in sin; - bzero((void *)&sin, sizeof(sin)); + bzero(&sin, sizeof(sin)); sin = *fs->fs_ip; sin.sin_port = htons(PMAPPORT); - error = fwd_packet(RPC_XID_PORTMAP, (void *)iobuf, len, - &sin, &sin, (void *)fs, got_portmap); + error = fwd_packet(RPC_XID_PORTMAP, iobuf, len, + &sin, &sin, fs, got_portmap); } else { error = -len; } @@ -449,8 +449,9 @@ nfs_keepalive(void *arg) * XXX EVIL! We cast xid to a pointer, then back to an int when * XXX we get the reply. */ - error = fwd_packet(MK_RPC_XID(RPC_XID_NFSPING, np->np_xid), (void *)ping_buf, - ping_len, fs->fs_ip, (struct sockaddr_in *) 0, (void *)((long)np->np_xid), nfs_pinged); + error = fwd_packet(MK_RPC_XID(RPC_XID_NFSPING, np->np_xid), ping_buf, + ping_len, fs->fs_ip, NULL, (void *)((long)np->np_xid), + nfs_pinged); /* * See if a hard error occured @@ -546,7 +547,7 @@ nfs_srvr_port(fserver *fs, u_short *port, void *wchan) * come back here and new, better things to happen. */ fs->fs_flags |= FSF_WANT; - sched_task(wakeup_task, wchan, (void *)fs); + sched_task(wakeup_task, wchan, fs); } return error; } @@ -634,9 +635,9 @@ find_nfs_srvr(mntfs *mf) switch (hp->h_addrtype) { case AF_INET: ip = ALLOC(sockaddr_in); - bzero((void *)ip, sizeof(*ip)); + bzero(ip, sizeof(*ip)); ip->sin_family = AF_INET; - bcopy((void *)hp->h_addr, (void *)&ip->sin_addr, sizeof(ip->sin_addr)); + bcopy(hp->h_addr, &ip->sin_addr, sizeof(ip->sin_addr)); ip->sin_port = htons(NFS_PORT); break; @@ -669,7 +670,7 @@ find_nfs_srvr(mntfs *mf) fs->fs_type = "nfs"; fs->fs_pinger = AM_PINGER; np = ALLOC(nfs_private); - bzero((void *)np, sizeof(*np)); + bzero(np, sizeof(*np)); np->np_mountd_inval = TRUE; np->np_xid = NPXID_ALLOC(); np->np_error = -1; |