Use C99-style initialization for struct dirent in preparation for
changing the structure. Sponsored by: Google Summer of Code 2011
This commit is contained in:
parent
6aca1fbc91
commit
fb2a3e6ea1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=235984
@ -797,10 +797,21 @@ hpfs_de_uiomove (
|
||||
}
|
||||
|
||||
|
||||
static struct dirent hpfs_de_dot =
|
||||
{ 0, sizeof(struct dirent), DT_DIR, 1, "." };
|
||||
static struct dirent hpfs_de_dotdot =
|
||||
{ 0, sizeof(struct dirent), DT_DIR, 2, ".." };
|
||||
static struct dirent hpfs_de_dot = {
|
||||
.d_fileno = 0,
|
||||
.d_reclen = sizeof(struct dirent),
|
||||
.d_type = DT_DIR,
|
||||
.d_namlen = 1,
|
||||
.d_name = "."
|
||||
};
|
||||
static struct dirent hpfs_de_dotdot = {
|
||||
.d_fileno = 0,
|
||||
.d_reclen = sizeof(struct dirent),
|
||||
.d_type = DT_DIR,
|
||||
.d_namlen = 2,
|
||||
.d_name = ".."
|
||||
};
|
||||
|
||||
int
|
||||
hpfs_readdir(ap)
|
||||
struct vop_readdir_args /* {
|
||||
|
@ -493,8 +493,13 @@ ntfs_readdir(ap)
|
||||
|
||||
/* Simulate . in every dir except ROOT */
|
||||
if( ip->i_number != NTFS_ROOTINO ) {
|
||||
struct dirent dot = { NTFS_ROOTINO,
|
||||
sizeof(struct dirent), DT_DIR, 1, "." };
|
||||
struct dirent dot = {
|
||||
.d_fileno = NTFS_ROOTINO,
|
||||
.d_reclen = sizeof(struct dirent),
|
||||
.d_type = DT_DIR,
|
||||
.d_namlen = 1,
|
||||
.d_name = "."
|
||||
};
|
||||
|
||||
if( uio->uio_offset < sizeof(struct dirent) ) {
|
||||
dot.d_fileno = ip->i_number;
|
||||
@ -508,8 +513,13 @@ ntfs_readdir(ap)
|
||||
|
||||
/* Simulate .. in every dir including ROOT */
|
||||
if( uio->uio_offset < 2 * sizeof(struct dirent) ) {
|
||||
struct dirent dotdot = { NTFS_ROOTINO,
|
||||
sizeof(struct dirent), DT_DIR, 2, ".." };
|
||||
struct dirent dotdot = {
|
||||
.d_fileno = NTFS_ROOTINO,
|
||||
.d_reclen = sizeof(struct dirent),
|
||||
.d_type = DT_DIR,
|
||||
.d_namlen = 2,
|
||||
.d_name = ".."
|
||||
};
|
||||
|
||||
error = uiomove((char *)&dotdot,sizeof(struct dirent),uio);
|
||||
if(error)
|
||||
|
Loading…
Reference in New Issue
Block a user