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.
---
 libstore/unzipstore.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libstore/unzipstore.c')

diff --git a/libstore/unzipstore.c b/libstore/unzipstore.c
index 8d500c1b..cc86887e 100644
--- a/libstore/unzipstore.c
+++ b/libstore/unzipstore.c
@@ -81,7 +81,7 @@ unzip_store (struct store *from, void **buf, size_t *buf_len)
 	    {
 	      if (left > maxread)
 		left = maxread;
-	      bcopy (in_buf + in_buf_offs, buf, left);
+	      memcpy (buf, in_buf + in_buf_offs, left);
 	      in_buf_offs += left;
 	      buf += left;
 	      maxread -= left;
@@ -150,7 +150,7 @@ unzip_store (struct store *from, void **buf, size_t *buf_len)
 
 	      if (out_buf_offs > 0)
 		/* Copy the old buffer into the start of the new & free it. */
-		bcopy (old_buf, new_buf, out_buf_offs);
+		memcpy (new_buf, old_buf, out_buf_offs);
 
 	      munmap (old_buf, old_buf_len);
 
@@ -160,7 +160,7 @@ unzip_store (struct store *from, void **buf, size_t *buf_len)
 	  *buf_len = new_buf_len;
 	}
 
-      bcopy (wbuf, *buf + out_buf_offs, nwrite);
+      memcpy (*buf + out_buf_offs, wbuf, nwrite);
       out_buf_offs += nwrite;
     }
 
-- 
cgit v1.2.3