From 82a87d043498eeacb7e4f3edc85d1b7c424ea853 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Tue, 2 Dec 2014 00:20:51 +0100
Subject: 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.
---
 storeio/dev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'storeio')

diff --git a/storeio/dev.c b/storeio/dev.c
index 8f520cd2..614c257f 100644
--- a/storeio/dev.c
+++ b/storeio/dev.c
@@ -336,7 +336,7 @@ dev_write (struct dev *dev, off_t offs, void *buf, size_t len,
 {
   error_t buf_write (size_t buf_offs, size_t io_offs, size_t len)
     {
-      bcopy (buf + io_offs, dev->buf + buf_offs, len);
+      memcpy (dev->buf + buf_offs, buf + io_offs, len);
       dev->buf_dirty = 1;
       return 0;
     }
@@ -398,7 +398,7 @@ dev_read (struct dev *dev, off_t offs, size_t whole_amount,
     {
       error_t err = ensure_buf ();
       if (! err)
-	bcopy (dev->buf + buf_offs, *buf + io_offs, len);
+	memcpy (*buf + io_offs, dev->buf + buf_offs, len);
       return err;
     }
   error_t raw_read (off_t offs, size_t io_offs, size_t len, size_t *amount)
@@ -424,7 +424,7 @@ dev_read (struct dev *dev, off_t offs, size_t whole_amount,
 		  if (req_buf != _req_buf)
 		    /* Copy from wherever the read put it. */
 		    {
-		      bcopy (req_buf, _req_buf, req_len);
+		      memcpy (_req_buf, req_buf, req_len);
 		      munmap (req_buf, req_len);
 		    }
 		  *amount = req_len;
-- 
cgit v1.2.3