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

cd9660: replace bcopy/bzero with C standard equivalents

Browse Source 
To reduce diffs against NetBSD.
This commit is contained in:
Ed Maste 2018-07-31 12:36:46 +00:00
parent fb11674d30
commit a6274b81d5
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/fs/cd9660/cd9660_lookup.c
View File

@ -377,7 +377,7 @@ cd9660_lookup(ap)
*/
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);

8
sys/fs/cd9660/cd9660_rrip.c
View File

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

4
sys/fs/cd9660/cd9660_vfsops.c
View File

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

4
sys/fs/cd9660/cd9660_vnops.c
View File

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