From owner-svn-src-all@freebsd.org  Thu Jan 25 08:36:20 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C3A8EC9A7C;
 Thu, 25 Jan 2018 08:36:20 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C47B471E85;
 Thu, 25 Jan 2018 08:36:19 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BF7C222F0;
 Thu, 25 Jan 2018 08:36:19 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0P8aJZj006909;
 Thu, 25 Jan 2018 08:36:19 GMT (envelope-from lwhsu@FreeBSD.org)
Received: (from lwhsu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0P8aJFu006908;
 Thu, 25 Jan 2018 08:36:19 GMT (envelope-from lwhsu@FreeBSD.org)
Message-Id: <201801250836.w0P8aJFu006908@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to
 lwhsu@FreeBSD.org using -f
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Thu, 25 Jan 2018 08:36:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r328393 - head/sbin/fsck_ffs
X-SVN-Group: head
X-SVN-Commit-Author: lwhsu
X-SVN-Commit-Paths: head/sbin/fsck_ffs
X-SVN-Commit-Revision: 328393
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jan 2018 08:36:20 -0000

Author: lwhsu (ports committer)
Date: Thu Jan 25 08:36:19 2018
New Revision: 328393
URL: https://svnweb.freebsd.org/changeset/base/328393

Log:
  Fix architectures where pointer and u_int have different sizes
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D14049

Modified:
  head/sbin/fsck_ffs/fsutil.c

Modified: head/sbin/fsck_ffs/fsutil.c
==============================================================================
--- head/sbin/fsck_ffs/fsutil.c	Thu Jan 25 07:27:03 2018	(r328392)
+++ head/sbin/fsck_ffs/fsutil.c	Thu Jan 25 08:36:19 2018	(r328393)
@@ -368,8 +368,8 @@ flush(int fd, struct bufarea *bp)
 	switch (bp->b_type) {
 	case BT_SUPERBLK:
 		if (bp != &sblk)
-			pfatal("BUFFER 0x%x DOES NOT MATCH SBLK 0x%x\n",
-			    (u_int)bp, (u_int)&sblk);
+			pfatal("BUFFER %p DOES NOT MATCH SBLK %p\n",
+			    bp, &sblk);
 		blwrite(fd, bp->b_un.b_buf, bp->b_bno, bp->b_size);
 		for (i = 0, j = 0; i < sblock.fs_cssize; i += sblock.fs_bsize,
 		   j++) {