Author: ngie
Date: Fri Jun 10 14:13:24 2016
New Revision: 301784
URL: https://svnweb.freebsd.org/changeset/base/301784
Log:
MFC r299461:
r299461 (by cem):
ffs_bswap: Copy one UFS dinode member at a time
No functional change.
CIDs: 974635, 974636, 977396, 977397, 977398, 977399
Modified:
stable/10/usr.sbin/makefs/ffs/ffs_bswap.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/makefs/ffs/ffs_bswap.c
==============================================================================
--- stable/10/usr.sbin/makefs/ffs/ffs_bswap.c Fri Jun 10 14:10:51 2016
(r301783)
+++ stable/10/usr.sbin/makefs/ffs/ffs_bswap.c Fri Jun 10 14:13:24 2016
(r301784)
@@ -135,7 +135,8 @@ ffs_dinode1_swap(struct ufs1_dinode *o,
n->di_mtimensec = bswap32(o->di_mtimensec);
n->di_ctime = bswap32(o->di_ctime);
n->di_ctimensec = bswap32(o->di_ctimensec);
- memcpy(n->di_db, o->di_db, (NDADDR + NIADDR) * sizeof(u_int32_t));
+ memcpy(n->di_db, o->di_db, sizeof(n->di_db));
+ memcpy(n->di_ib, o->di_ib, sizeof(n->di_ib));
n->di_flags = bswap32(o->di_flags);
n->di_blocks = bswap32(o->di_blocks);
n->di_gen = bswap32(o->di_gen);
@@ -165,7 +166,9 @@ ffs_dinode2_swap(struct ufs2_dinode *o,
n->di_kernflags = bswap32(o->di_kernflags);
n->di_flags = bswap32(o->di_flags);
n->di_extsize = bswap32(o->di_extsize);
- memcpy(n->di_extb, o->di_extb, (NXADDR + NDADDR + NIADDR) * 8);
+ memcpy(n->di_extb, o->di_extb, sizeof(n->di_extb));
+ memcpy(n->di_db, o->di_db, sizeof(n->di_db));
+ memcpy(n->di_ib, o->di_ib, sizeof(n->di_ib));
}
void
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
