diff options
| author | ngie <ngie@FreeBSD.org> | 2016-06-10 14:13:24 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-06-10 14:13:24 +0000 |
| commit | 2f3d12b6e89ab20364028213ce8d84b46797f3db (patch) | |
| tree | 27887117bbbc2b8f56fb96d0c60d1b6db39c3b2f | |
| parent | f316eb23ef8ccdc71ef76c2ed1f9cf0e8fde1a94 (diff) | |
| download | FreeBSD-src-2f3d12b6e89ab20364028213ce8d84b46797f3db.zip FreeBSD-src-2f3d12b6e89ab20364028213ce8d84b46797f3db.tar.gz | |
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
| -rw-r--r-- | usr.sbin/makefs/ffs/ffs_bswap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/makefs/ffs/ffs_bswap.c b/usr.sbin/makefs/ffs/ffs_bswap.c index e62eb19..d2a3781 100644 --- a/usr.sbin/makefs/ffs/ffs_bswap.c +++ b/usr.sbin/makefs/ffs/ffs_bswap.c @@ -135,7 +135,8 @@ ffs_dinode1_swap(struct ufs1_dinode *o, struct ufs1_dinode *n) 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, struct ufs2_dinode *n) 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 |
