diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2015-03-12 00:30:39 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2015-03-12 00:30:39 +0000 |
| commit | 326d9eabceb5a47747e1fbd7f53c971c26eac012 (patch) | |
| tree | 5b20edbb971dd14c810cf68cecf1bbefc22cf0be /sbin | |
| parent | c9f48085fde2dbcdf7a5068125ce5669d8ec0813 (diff) | |
replace bcopy with memcpy
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ping6/ping6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 4b9fe1f07b3..f2fc09f054a 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping6.c,v 1.102 2015/03/11 03:38:56 dlg Exp $ */ +/* $OpenBSD: ping6.c,v 1.103 2015/03/12 00:30:38 dlg Exp $ */ /* $KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $ */ /* @@ -1081,7 +1081,7 @@ pinger(void) TIMESPEC_TO_TIMEVAL(&tv, &ts); tv32.tv32_sec = htonl(tv.tv_sec); /* XXX 2038 */ tv32.tv32_usec = htonl(tv.tv_usec); - bcopy(&tv32, &outpack[ICMP6ECHOLEN], sizeof(tv32)); + memcpy(&outpack[ICMP6ECHOLEN], &tv32, sizeof(tv32)); } cc = ICMP6ECHOLEN + datalen; } @@ -1255,7 +1255,7 @@ pr_pack(u_char *buf, int cc, struct msghdr *mhdr) seq = ntohs(icp->icmp6_seq); ++nreceived; if (timing) { - bcopy(icp + 1, &tv32, sizeof(tv32)); + memcpy(&tv32, icp + 1, sizeof(tv32)); tp.tv_sec = ntohl(tv32.tv32_sec); tp.tv_usec = ntohl(tv32.tv32_usec); tvsub(&tv, &tp); @@ -2389,7 +2389,7 @@ nigroup(char *name) if (inet_pton(AF_INET6, "ff02::2:0000:0000", &in6) != 1) return NULL; /*XXX*/ - bcopy(digest, &in6.s6_addr[12], 4); + memcpy(&in6.s6_addr[12], digest, 4); if (inet_ntop(AF_INET6, &in6, hbuf, sizeof(hbuf)) == NULL) return NULL; |