diff options
Diffstat (limited to 'sunrpc')
| -rw-r--r-- | sunrpc/clnt_gen.c | 2 | ||||
| -rw-r--r-- | sunrpc/clnt_simp.c | 2 | ||||
| -rw-r--r-- | sunrpc/getrpcport.c | 2 | ||||
| -rw-r--r-- | sunrpc/rpc_cmsg.c | 10 | ||||
| -rw-r--r-- | sunrpc/svc_authux.c | 2 | ||||
| -rw-r--r-- | sunrpc/svcauth_des.c | 2 | ||||
| -rw-r--r-- | sunrpc/xdr_mem.c | 4 | ||||
| -rw-r--r-- | sunrpc/xdr_rec.c | 4 |
8 files changed, 13 insertions, 15 deletions
diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c index 27e027242b..251ad88ee5 100644 --- a/sunrpc/clnt_gen.c +++ b/sunrpc/clnt_gen.c @@ -110,7 +110,7 @@ clnt_create (const char *hostname, u_long prog, u_long vers, sin.sin_family = h->h_addrtype; sin.sin_port = 0; __bzero (sin.sin_zero, sizeof (sin.sin_zero)); - bcopy (h->h_addr, (char *) &sin.sin_addr, h->h_length); + memcpy ((char *) &sin.sin_addr, h->h_addr, h->h_length); prtbuflen = 1024; prttmpbuf = __alloca (prtbuflen); diff --git a/sunrpc/clnt_simp.c b/sunrpc/clnt_simp.c index 735f2edb9a..5c11b479b2 100644 --- a/sunrpc/clnt_simp.c +++ b/sunrpc/clnt_simp.c @@ -122,7 +122,7 @@ callrpc (const char *host, u_long prognum, u_long versnum, u_long procnum, timeout.tv_usec = 0; timeout.tv_sec = 5; - bcopy (hp->h_addr, (char *) &server_addr.sin_addr, hp->h_length); + memcpy ((char *) &server_addr.sin_addr, hp->h_addr, hp->h_length); server_addr.sin_family = AF_INET; server_addr.sin_port = 0; if ((crp->client = clntudp_create (&server_addr, (u_long) prognum, diff --git a/sunrpc/getrpcport.c b/sunrpc/getrpcport.c index 2e12482abc..a8f1326f08 100644 --- a/sunrpc/getrpcport.c +++ b/sunrpc/getrpcport.c @@ -67,7 +67,7 @@ getrpcport (const char *host, u_long prognum, u_long versnum, u_int proto) buffer = __alloca (buflen); } - bcopy (hp->h_addr, (char *) &addr.sin_addr, hp->h_length); + memcpy ((char *) &addr.sin_addr, hp->h_addr, hp->h_length); addr.sin_family = AF_INET; addr.sin_port = 0; return pmap_getport (&addr, prognum, versnum, proto); diff --git a/sunrpc/rpc_cmsg.c b/sunrpc/rpc_cmsg.c index 3930de3e93..8916504a39 100644 --- a/sunrpc/rpc_cmsg.c +++ b/sunrpc/rpc_cmsg.c @@ -82,7 +82,7 @@ xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg) IXDR_PUT_INT32 (buf, oa->oa_length); if (oa->oa_length) { - bcopy (oa->oa_base, (caddr_t) buf, oa->oa_length); + memcpy ((caddr_t) buf, oa->oa_base, oa->oa_length); buf = (int32_t *) ((char *) buf + RNDUP (oa->oa_length)); } oa = &cmsg->rm_call.cb_verf; @@ -90,7 +90,7 @@ xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg) IXDR_PUT_INT32 (buf, oa->oa_length); if (oa->oa_length) { - bcopy (oa->oa_base, (caddr_t) buf, oa->oa_length); + memcpy ((caddr_t) buf, oa->oa_base, oa->oa_length); /* no real need.... buf = (long *) ((char *) buf + RNDUP(oa->oa_length)); */ @@ -138,8 +138,7 @@ xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg) } else { - bcopy ((caddr_t) buf, oa->oa_base, - oa->oa_length); + memcpy (oa->oa_base, (caddr_t) buf, oa->oa_length); /* no real need.... buf = (long *) ((char *) buf + RNDUP(oa->oa_length)); @@ -179,8 +178,7 @@ xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg) } else { - bcopy ((caddr_t) buf, oa->oa_base, - oa->oa_length); + memcpy (oa->oa_base, (caddr_t) buf, oa->oa_length); /* no real need... buf = (long *) ((char *) buf + RNDUP(oa->oa_length)); diff --git a/sunrpc/svc_authux.c b/sunrpc/svc_authux.c index 08065b4184..bf533a573c 100644 --- a/sunrpc/svc_authux.c +++ b/sunrpc/svc_authux.c @@ -80,7 +80,7 @@ _svcauth_unix (struct svc_req *rqst, struct rpc_msg *msg) stat = AUTH_BADCRED; goto done; } - bcopy ((caddr_t) buf, aup->aup_machname, (u_int) str_len); + memcpy (aup->aup_machname, (caddr_t) buf, (u_int) str_len); aup->aup_machname[str_len] = 0; str_len = RNDUP (str_len); buf = (int32_t *) ((char *) buf + str_len); diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c index 4530066a45..6a550af8e9 100644 --- a/sunrpc/svcauth_des.c +++ b/sunrpc/svcauth_des.c @@ -150,7 +150,7 @@ _svcauth_des (register struct svc_req *rqst, register struct rpc_msg *msg) return AUTH_BADCRED; } cred->adc_fullname.name = area->area_netname; - bcopy ((char *) ixdr, cred->adc_fullname.name, namelen); + memcpy (cred->adc_fullname.name, (char *) ixdr, namelen); cred->adc_fullname.name[namelen] = 0; ixdr += (RNDUP (namelen) / BYTES_PER_XDR_UNIT); cred->adc_fullname.key.key.high = *ixdr++; diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c index 9cc3890427..b328d59829 100644 --- a/sunrpc/xdr_mem.c +++ b/sunrpc/xdr_mem.c @@ -132,7 +132,7 @@ xdrmem_getbytes (XDR *xdrs, caddr_t addr, u_int len) { if ((xdrs->x_handy -= len) < 0) return FALSE; - bcopy (xdrs->x_private, addr, len); + memcpy (addr, xdrs->x_private, len); xdrs->x_private += len; return TRUE; } @@ -146,7 +146,7 @@ xdrmem_putbytes (XDR *xdrs, const char *addr, u_int len) { if ((xdrs->x_handy -= len) < 0) return FALSE; - bcopy (addr, xdrs->x_private, len); + memcpy (xdrs->x_private, addr, len); xdrs->x_private += len; return TRUE; } diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c index 17c9b35575..65ffa3799e 100644 --- a/sunrpc/xdr_rec.c +++ b/sunrpc/xdr_rec.c @@ -286,7 +286,7 @@ xdrrec_putbytes (XDR *xdrs, const char *addr, u_int len) { current = rstrm->out_boundry - rstrm->out_finger; current = (len < current) ? len : current; - bcopy (addr, rstrm->out_finger, current); + memcpy (rstrm->out_finger, addr, current); rstrm->out_finger += current; addr += current; len -= current; @@ -588,7 +588,7 @@ get_input_bytes (RECSTREAM *rstrm, caddr_t addr, int len) continue; } current = (len < current) ? len : current; - bcopy (rstrm->in_finger, addr, current); + memcpy (addr, rstrm->in_finger, current); rstrm->in_finger += current; addr += current; len -= current; |