diff options
| author | bde <bde@FreeBSD.org> | 1997-04-10 15:05:38 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-04-10 15:05:38 +0000 |
| commit | 5b0d745f8b3e7b469fbdea89b0ef0a4f4c1f204b (patch) | |
| tree | e0576db03c2032d1ca24cfcf3f54cbd953976300 /sys/fs/cd9660/cd9660_vnops.c | |
| parent | bdb8ad15bdbe97ead929ed5a2b8469cde38101e3 (diff) | |
| download | FreeBSD-src-5b0d745f8b3e7b469fbdea89b0ef0a4f4c1f204b.zip FreeBSD-src-5b0d745f8b3e7b469fbdea89b0ef0a4f4c1f204b.tar.gz | |
Get the declaration of `struct dirent' from <sys/dirent.h>, not from
<sys/dir.h>, and use the new macro GENERIC_DIRSIZ() instead of DIRSIZ().
Removed unused #includes.
Diffstat (limited to 'sys/fs/cd9660/cd9660_vnops.c')
| -rw-r--r-- | sys/fs/cd9660/cd9660_vnops.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index de9d2be..8afa906 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -36,25 +36,21 @@ * SUCH DAMAGE. * * @(#)cd9660_vnops.c 8.19 (Berkeley) 5/27/95 - * $Id$ + * $Id: cd9660_vnops.c,v 1.32 1997/02/22 09:38:51 peter Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/namei.h> -#include <sys/resourcevar.h> #include <sys/kernel.h> -#include <sys/file.h> #include <sys/stat.h> #include <sys/buf.h> -#include <sys/proc.h> -#include <sys/conf.h> #include <sys/mount.h> #include <sys/vnode.h> #include <miscfs/specfs/specdev.h> #include <miscfs/fifofs/fifo.h> #include <sys/malloc.h> -#include <sys/dir.h> +#include <sys/dirent.h> #include <sys/unistd.h> #include <isofs/cd9660/iso.h> @@ -531,7 +527,7 @@ iso_uiodir(idp,dp,off) int error; dp->d_name[dp->d_namlen] = 0; - dp->d_reclen = DIRSIZ(dp); + dp->d_reclen = GENERIC_DIRSIZ(dp); if (idp->uio->uio_resid < dp->d_reclen) { idp->eofflag = 0; @@ -593,7 +589,7 @@ assoc = (cl > 1) && (*cname == ASSOCCHAR); } } } - idp->current.d_reclen = DIRSIZ(&idp->current); + idp->current.d_reclen = GENERIC_DIRSIZ(&idp->current); if (assoc) { idp->assocoff = idp->curroff; bcopy(&idp->current,&idp->assocent,idp->current.d_reclen); |
