4 files changed, 9 insertions, 9 deletions

diff --git a/sys/boot/pc98/boot2/boot.h b/sys/boot/pc98/boot2/boot.h
index 6f5bca1ffc3ce..6fd1e99cb1ae2 100644
--- a/sys/boot/pc98/boot2/boot.h
+++ b/sys/boot/pc98/boot2/boot.h
@@ -87,7 +87,7 @@ int strcmp(const char *s1, const char *s2);
 #ifdef CDBOOT
 int strcasecmp(const char *s1, const char *s2);
 #endif /* !CDBOOT */
-void bcopy(const void *from, void *to, size_t len);
+void memcpy(const void *from, void *to, size_t len);
 void twiddle(void);
 #ifdef PC98
 void machine_check(void);
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c
index 9d56936d72e42..f892c276ce92e 100644
--- a/sys/boot/pc98/boot2/disk.c
+++ b/sys/boot/pc98/boot2/disk.c
@@ -163,7 +163,7 @@ devread(char *iodest, int sector, int cnt)
 	{
 		dosdev_copy = dosdev;
 		p = Bread(dosdev_copy, sector++);
-		bcopy(p, iodest+offset, BPS);
+		memcpy(p, iodest+offset, BPS);
 	}
 }
 
diff --git a/sys/boot/pc98/boot2/io.c b/sys/boot/pc98/boot2/io.c
index 84086272e0b89..88dc8ba429f14 100644
--- a/sys/boot/pc98/boot2/io.c
+++ b/sys/boot/pc98/boot2/io.c
@@ -54,7 +54,7 @@ gateA20(void)
 void
 printf(const char *format, ...)
 {
-	int *dataptr = (int *)&format;
+	int *dataptr = (void *)&format;
 	char c;
 
 	dataptr++;
@@ -289,7 +289,7 @@ strcasecmp(const char *s1, const char *s2)
 #endif /* !CDBOOT */
 
 void
-bcopy(const void *from, void *to, size_t len)
+memcpy(const void *from, void *to, size_t len)
 {
 	const char *fp = (const char *)from;
 	char *tp = (char *)to;
@@ -358,7 +358,7 @@ void putc(int c)
 	if (crtat >= Crtat + col * row) {
 		cp = Crtat;
 		for (i = 1; i < row; i++) {
-			bcopy((void *)(cp+col), (void *)cp, col*2);
+			memcpy((void *)(cp+col), (void *)cp, col*2);
 			cp += col;
 		}
 		for (i = 0; i < col; i++) {
diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c
index c0617cad1e0b7..d924624f08804 100644
--- a/sys/boot/pc98/boot2/sys.c
+++ b/sys/boot/pc98/boot2/sys.c
@@ -95,7 +95,7 @@ read(char *buffer, int count)
 			if (size > count)
 				size = count;
 			devread(iobuf, bnum2, cnt2);
-			bcopy(iobuf+off, buffer, size);
+			memcpy(iobuf+off, buffer, size);
 		}
 		buffer += size;
 		count -= size;
@@ -118,7 +118,7 @@ read(char *buffer, int count)
 		if (count < size)
 			size = count;
 		devread(iobuf, off >> 9, 512);
-		bcopy(iobuf+cnt, buffer, size);
+		memcpy(iobuf+cnt, buffer, size);
 		count -= size;
 		off += size;
 		buffer += size;
@@ -132,7 +132,7 @@ read(char *buffer, int count)
 	}
 	if (count) {
 		devread(iobuf, off >> 9, 512);
-		bcopy(iobuf, buffer, count);
+		memcpy(iobuf, buffer, count);
 	}
 }
 #endif
@@ -148,7 +148,7 @@ find(char *path)
 	list_only = (path[0] == '?' && path[1] == '\0');
 loop:
 	devread(iobuf, fsbtodb(fs, ino_to_fsba(fs, ino)) + boff, fs->fs_bsize);
-	bcopy((void *)&((struct dinode *)iobuf)[ino % fs->fs_inopb],
+	memcpy((void *)&((struct dinode *)iobuf)[ino % fs->fs_inopb],
 	      (void *)&inode.i_din,
 	      sizeof (struct dinode));
 	if (!*path)