Date: Wed, 10 Jun 2009 13:04:07 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r193912 - stable/7/sbin/clri Message-ID: <200906101304.n5AD47T1013987@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Wed Jun 10 13:04:07 2009 New Revision: 193912 URL: http://svn.freebsd.org/changeset/base/193912 Log: merge r173764: fix aliasing violations. Modified: stable/7/sbin/clri/ (props changed) stable/7/sbin/clri/clri.c Modified: stable/7/sbin/clri/clri.c ============================================================================== --- stable/7/sbin/clri/clri.c Wed Jun 10 12:54:36 2009 (r193911) +++ stable/7/sbin/clri/clri.c Wed Jun 10 13:04:07 2009 (r193912) @@ -81,6 +81,7 @@ main(int argc, char *argv[]) off_t offset; int i, fd, inonum; char *fs, sblock[SBLOCKSIZE]; + void *v = ibuf; if (argc < 3) usage(); @@ -128,7 +129,7 @@ main(int argc, char *argv[]) if (sbp->fs_magic == FS_UFS2_MAGIC) { /* get the inode within the block. */ - dp2 = &(((struct ufs2_dinode *)ibuf) + dp2 = &(((struct ufs2_dinode *)v) [ino_to_fsbo(sbp, inonum)]); /* clear the inode, and bump the generation count. */ @@ -137,7 +138,7 @@ main(int argc, char *argv[]) dp2->di_gen = generation; } else { /* get the inode within the block. */ - dp1 = &(((struct ufs1_dinode *)ibuf) + dp1 = &(((struct ufs1_dinode *)v) [ino_to_fsbo(sbp, inonum)]); /* clear the inode, and bump the generation count. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906101304.n5AD47T1013987>