d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix new compiler error (s/bcopy/memcpy/).

Browse Source
This commit is contained in:
Yoshihiro Takahashi 2004-07-30 09:42:04 +00:00
parent 12c649749c
commit c80f54d479
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/pc98/boot2/boot.h
View File

@ -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);

2
sys/boot/pc98/boot2/disk.c
View File

@ -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);
}
}

6
sys/boot/pc98/boot2/io.c
View File

@ -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++) {

8
sys/boot/pc98/boot2/sys.c
View File

@ -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)