Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Iterate over fields of struct seperately to avoid warnings from pedantic compilers

Browse Source
This commit is contained in:
justin 2014-04-05 12:32:27 +00:00
parent e9e441ae11
commit 802f624689
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbin/fsck_ffs/inode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inode.c,v 1.70 2013/12/02 18:46:52 bouyer Exp $ */
/* $NetBSD: inode.c,v 1.71 2014/04/05 12:32:27 justin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: inode.c,v 1.70 2013/12/02 18:46:52 bouyer Exp $");
__RCSID("$NetBSD: inode.c,v 1.71 2014/04/05 12:32:27 justin Exp $");
#endif
#endif /* not lint */
@ -358,8 +358,10 @@ swap_dinode1(union dinode *dp, int n)
doinglevel2 ||
(maxsymlinklen < 0) ||
(iswap64(dp1->di_size) > (uint64_t)maxsymlinklen)) {
for (j = 0; j < (UFS_NDADDR + UFS_NIADDR); j++)
for (j = 0; j < UFS_NDADDR; j++)
dp1->di_db[j] = bswap32(dp1->di_db[j]);
for (j = 0; j < UFS_NIADDR; j++)
dp1->di_ib[j] = bswap32(dp1->di_ib[j]);
}
}
}
@ -374,8 +376,12 @@ swap_dinode2(union dinode *dp, int n)
for (i = 0; i < n; i++, dp2++) {
ffs_dinode2_swap(dp2, dp2);
if ((iswap16(dp2->di_mode) & IFMT) != IFLNK) {
for (j = 0; j < (UFS_NDADDR + UFS_NIADDR + UFS_NXADDR); j++)
for (j = 0; j < UFS_NXADDR; j++)
dp2->di_extb[j] = bswap64(dp2->di_extb[j]);
for (j = 0; j < UFS_NDADDR; j++)
dp2->di_db[j] = bswap64(dp2->di_db[j]);
for (j = 0; j < UFS_NIADDR; j++)
dp2->di_ib[j] = bswap64(dp2->di_ib[j]);
}
}
}

12
sbin/newfs/mkfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mkfs.c,v 1.120 2013/06/23 22:03:34 dholland Exp $ */
/* $NetBSD: mkfs.c,v 1.121 2014/04/05 12:32:27 justin Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@ -73,7 +73,7 @@
#if 0
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else
__RCSID("$NetBSD: mkfs.c,v 1.120 2013/06/23 22:03:34 dholland Exp $");
__RCSID("$NetBSD: mkfs.c,v 1.121 2014/04/05 12:32:27 justin Exp $");
#endif
#endif /* not lint */
@ -1372,8 +1372,10 @@ iput(union dinode *ip, ino_t ino)
if (needswap) {
ffs_dinode1_swap(&ip->dp1, dp1);
/* ffs_dinode1_swap() doesn't swap blocks addrs */
for (i=0; i<UFS_NDADDR + UFS_NIADDR; i++)
for (i=0; i<UFS_NDADDR; i++)
dp1->di_db[i] = bswap32(ip->dp1.di_db[i]);
for (i=0; i<UFS_NIADDR; i++)
dp1->di_ib[i] = bswap32(ip->dp1.di_ib[i]);
} else
*dp1 = ip->dp1;
dp1->di_gen = arc4random() & INT32_MAX;
@ -1382,8 +1384,10 @@ iput(union dinode *ip, ino_t ino)
dp2 += ino_to_fsbo(&sblock, ino);
if (needswap) {
ffs_dinode2_swap(&ip->dp2, dp2);
for (i=0; i<UFS_NDADDR + UFS_NIADDR; i++)
for (i=0; i<UFS_NDADDR; i++)
dp2->di_db[i] = bswap64(ip->dp2.di_db[i]);
for (i=0; i<UFS_NIADDR; i++)
dp2->di_ib[i] = bswap64(ip->dp2.di_ib[i]);
} else
*dp2 = ip->dp2;
dp2->di_gen = arc4random() & INT32_MAX;