diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-12-02 00:20:51 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-12-10 16:09:53 +0100 |
| commit | 82a87d043498eeacb7e4f3edc85d1b7c424ea853 (patch) | |
| tree | 60d3978b0722d23f01da47eb534ec6fa271b3ed8 /pfinet | |
| parent | 0a4ada8d40fb687a659161ff7e0d1d0994264402 (diff) | |
Replace `bcopy' with `memcpy' or `memmove' as appropriate
* ext2fs/inode.c: Replace `bcopy' with `memcpy' or `memmove' as
appropriate.
* ext2fs/pager.c: Likewise.
* isofs/lookup.c: Likewise.
* isofs/main.c: Likewise.
* isofs/rr.c: Likewise.
* libdiskfs/file-get-trans.c: Likewise.
* libiohelp/return-buffer.c: Likewise.
* libpager/pagemap.c: Likewise.
* libpipe/pq.c: Likewise.
* libpipe/pq.h: Likewise.
* libstore/unzipstore.c: Likewise.
* mach-defpager/default_pager.c: Likewise.
* pfinet/ethernet.c: Likewise.
* pfinet/tunnel.c: Likewise.
* storeio/dev.c: Likewise.
Diffstat (limited to 'pfinet')
| -rw-r--r-- | pfinet/ethernet.c | 10 | ||||
| -rw-r--r-- | pfinet/tunnel.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pfinet/ethernet.c b/pfinet/ethernet.c index 16782435..e6ae53ce 100644 --- a/pfinet/ethernet.c +++ b/pfinet/ethernet.c @@ -158,10 +158,10 @@ ethernet_demuxer (mach_msg_header_t *inp, skb->dev = dev; /* Copy the two parts of the frame into the buffer. */ - bcopy (msg->header, skb->data, ETH_HLEN); - bcopy (msg->packet + sizeof (struct packet_header), - skb->data + ETH_HLEN, - datalen - ETH_HLEN); + memcpy (skb->data, msg->header, ETH_HLEN); + memcpy (skb->data + ETH_HLEN, + msg->packet + sizeof (struct packet_header), + datalen - ETH_HLEN); /* Drop it on the queue. */ skb->protocol = eth_type_trans (skb, dev); @@ -389,7 +389,7 @@ setup_ethernet_device (char *name, struct device **device) error (2, err, "%s: Cannot get hardware Ethernet address", name); net_address[0] = ntohl (net_address[0]); net_address[1] = ntohl (net_address[1]); - bcopy (net_address, dev->dev_addr, ETH_ALEN); + memcpy (dev->dev_addr, net_address, ETH_ALEN); /* That should be enough. */ diff --git a/pfinet/tunnel.c b/pfinet/tunnel.c index 6a7f355d..02e9ee81 100644 --- a/pfinet/tunnel.c +++ b/pfinet/tunnel.c @@ -395,7 +395,7 @@ trivfs_S_io_write (struct trivfs_protid *cred, skb->len = datalen; skb->dev = &tdev->dev; - bcopy (data, skb->data, datalen); + memcpy (skb->data, data, datalen); /* Drop it on the queue. */ skb->mac.raw = skb->data; |