summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
authorkleink <kleink@NetBSD.org>1999-11-30 15:55:25 +0000
committerkleink <kleink@NetBSD.org>1999-11-30 15:55:25 +0000
commitd574ffc67383c19eabc6134f4d3f3039248ff8b1 (patch)
tree7de3d48c1949485fd110b6888e0c008703112b91 /lib/libc
parent671919edee3ef1eeb5a36b3e55c8da9ef93cbecc (diff)
(bcopy, bzero) -> (memcpy, memset)
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/net/ifname.c4
-rw-r--r--lib/libc/net/rthdr.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/net/ifname.c b/lib/libc/net/ifname.c
index 9e745df31ae..fe699c558c8 100644
--- a/lib/libc/net/ifname.c
+++ b/lib/libc/net/ifname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ifname.c,v 1.5 1999/09/20 04:39:13 lukem Exp $ */
+/* $NetBSD: ifname.c,v 1.6 1999/11/30 15:55:25 kleink Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -195,7 +195,7 @@ if_nameindex()
errno = ENOMEM;
goto end;
}
- bcopy(ifbuf, cp + hlen, off);
+ (void)memcpy(cp + hlen, ifbuf, off);
ret = (struct if_nameindex *)cp;
for (i = 0; i < ifn; i++) {
ret[i].if_index = ifx[i].if_index;
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index dddb6cb8443..c1cc8ae258b 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rthdr.c,v 1.4 1999/09/20 04:39:18 lukem Exp $ */
+/* $NetBSD: rthdr.c,v 1.5 1999/11/30 15:55:25 kleink Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -77,7 +77,7 @@ inet6_rthdr_init(bp, type)
switch(type) {
case IPV6_RTHDR_TYPE_0:
ch->cmsg_len = CMSG_LEN(sizeof(struct ip6_rthdr0) - sizeof(struct in6_addr));
- bzero(rthdr, sizeof(struct ip6_rthdr0));
+ (void)memset(rthdr, 0, sizeof(struct ip6_rthdr0));
rthdr->ip6r_type = IPV6_RTHDR_TYPE_0;
return(ch);
default:
@@ -124,7 +124,7 @@ inet6_rthdr_add(cmsg, addr, flags)
rt0->ip6r0_slmap[c] |= (1 << (7 - b));
}
rt0->ip6r0_segleft++;
- bcopy(addr, (caddr_t)rt0 + ((rt0->ip6r0_len + 1) << 3),
+ (void)memcpy((caddr_t)rt0 + ((rt0->ip6r0_len + 1) << 3), addr,
sizeof(struct in6_addr));
rt0->ip6r0_len += sizeof(struct in6_addr) >> 3;
cmsg->cmsg_len = CMSG_LEN((rt0->ip6r0_len + 1) << 3);