diff options
author | Ed Maste <emaste@FreeBSD.org> | 2018-07-31 12:36:46 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2018-07-31 12:36:46 +0000 |
commit | a6274b81d5b94ed4deda7e8d91e4ef865f2ce874 (patch) | |
tree | a5cba6619779e549ade3af1077c3a9ad86e6e859 /sys/fs/cd9660 | |
parent | fb11674d306173803df7595f677ae8c020fda6f3 (diff) | |
download | src-a6274b81d5b94ed4deda7e8d91e4ef865f2ce874.tar.gz src-a6274b81d5b94ed4deda7e8d91e4ef865f2ce874.zip |
cd9660: replace bcopy/bzero with C standard equivalents
To reduce diffs against NetBSD.
Notes
Notes:
svn path=/head/; revision=336965
Diffstat (limited to 'sys/fs/cd9660')
-rw-r--r-- | sys/fs/cd9660/cd9660_lookup.c | 2 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_rrip.c | 8 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 4 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_vnops.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index bafdf7b63d3e..deb2453636f1 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -377,7 +377,7 @@ found: */ if (dp->i_number != i_ino) { ep2 = malloc(reclen, M_TEMP, M_WAITOK); - bcopy(ep, ep2, reclen); + memcpy(ep2, ep, reclen); ep = ep2; } brelse(bp); diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 85181431de9e..55833ea73dd5 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -204,7 +204,7 @@ cd9660_rrip_slink(p,ana) return 0; } - bcopy(inbuf,outbuf,wlen); + memcpy(outbuf, inbuf, wlen); outbuf += wlen; len += wlen; @@ -278,7 +278,7 @@ cd9660_rrip_altname(p,ana) return 0; } - bcopy(inbuf,ana->outbuf,wlen); + memcpy(ana->outbuf, inbuf, wlen); ana->outbuf += wlen; if (!cont) { @@ -356,7 +356,7 @@ cd9660_rrip_tstamp(p,ana) ISO_FTYPE_RRIP); ptime += 7; } else - bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec)); + memset(&ana->inop->inode.iso_mtime, 0, sizeof(struct timespec)); if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) { cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_atime, @@ -379,7 +379,7 @@ cd9660_rrip_tstamp(p,ana) cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_mtime); ptime += 17; } else - bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec)); + memset(&ana->inop->inode.iso_mtime, 0, sizeof(struct timespec)); if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) { cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_atime); diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index a5a2ec65659d..d1fbd0100668 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -363,7 +363,7 @@ iso_mountfs(devvp, mp) * filehandle validation. */ isomp->volume_space_size += ssector; - bcopy (rootp, isomp->root, sizeof isomp->root); + memcpy(isomp->root, rootp, sizeof isomp->root); isomp->root_extent = isonum_733 (rootp->extent); isomp->root_size = isonum_733 (rootp->size); @@ -465,7 +465,7 @@ iso_mountfs(devvp, mp) joliet_level); rootp = (struct iso_directory_record *) sup->root_directory_record; - bcopy (rootp, isomp->root, sizeof isomp->root); + memcpy(isomp->root, rootp, sizeof isomp->root); isomp->root_extent = isonum_733 (rootp->extent); isomp->root_size = isonum_733 (rootp->size); isomp->joliet_level = joliet_level; diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 4e82e5845603..84cee260d066 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -446,10 +446,10 @@ iso_shipdir(idp) idp->current.d_reclen = GENERIC_DIRSIZ(&idp->current); if (assoc) { idp->assocoff = idp->curroff; - bcopy(&idp->current,&idp->assocent,idp->current.d_reclen); + memcpy(&idp->assocent, &idp->current, idp->current.d_reclen); } else { idp->saveoff = idp->curroff; - bcopy(&idp->current,&idp->saveent,idp->current.d_reclen); + memcpy(&idp->saveent, &idp->current, idp->current.d_reclen); } return (0); } |