Module Name: src
Committed By: justin
Date: Sat Apr 5 12:32:27 UTC 2014
Modified Files:
src/sbin/fsck_ffs: inode.c
src/sbin/newfs: mkfs.c
Log Message:
Iterate over fields of struct seperately to avoid warnings from pedantic
compilers
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sbin/fsck_ffs/inode.c
cvs rdiff -u -r1.120 -r1.121 src/sbin/newfs/mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/inode.c
diff -u src/sbin/fsck_ffs/inode.c:1.70 src/sbin/fsck_ffs/inode.c:1.71
--- src/sbin/fsck_ffs/inode.c:1.70 Mon Dec 2 18:46:52 2013
+++ src/sbin/fsck_ffs/inode.c Sat Apr 5 12:32:27 2014
@@ -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]);
}
}
}
Index: src/sbin/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.120 src/sbin/newfs/mkfs.c:1.121
--- src/sbin/newfs/mkfs.c:1.120 Sun Jun 23 22:03:34 2013
+++ src/sbin/newfs/mkfs.c Sat Apr 5 12:32:27 2014
@@ -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;
