mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-04 09:09:56 +00:00
Code Issues Releases Activity

Get the declaration of `struct dirent' from <sys/dirent.h>, not from

Browse Source 
<sys/dir.h>, and use the new macro GENERIC_DIRSIZ() instead of DIRSIZ().

Removed unused #includes.
This commit is contained in:
Bruce Evans 1997-04-10 15:05:38 +00:00
parent 3bea22184e
commit c90607ba7f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=24788
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

12
sys/isofs/cd9660/cd9660_vnops.c
View File

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

11
sys/miscfs/devfs/devfs_vnops.c
View File

@ -1,7 +1,7 @@
/*
* Written by Julian Elischer (julian@DIALix.oz.au)
*
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.34 1997/02/12 16:19:11 mpp Exp $
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.35 1997/02/24 17:08:49 bde Exp $
*
* symlinks can wait 'til later.
*/
@ -9,17 +9,14 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
#include <sys/resourcevar.h> /* defines plimit structure in proc struct */
#include <sys/kernel.h>
#include <sys/stat.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/mount.h>
#include <sys/time.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
#include <miscfs/specfs/specdev.h>/* definitions of spec functions we use */
#include <sys/malloc.h>
#include <sys/dir.h> /* defines dirent structure */
#include <sys/dirent.h>
#include <miscfs/devfs/devfsdefs.h>
/*
@ -1447,7 +1444,7 @@ DBPRINT(("readdir\n"));
}
}
reclen = dirent.d_reclen = DIRSIZ (&dirent);
reclen = dirent.d_reclen = GENERIC_DIRSIZ(&dirent);
if(pos >= startpos) /* made it to the offset yet? */
{