From owner-svn-src-all@FreeBSD.ORG  Mon Jan 11 23:33:30 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A4149106568D;
	Mon, 11 Jan 2010 23:33:30 +0000 (UTC)
	(envelope-from mckusick@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 942418FC16;
	Mon, 11 Jan 2010 23:33:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BNXUjR009763;
	Mon, 11 Jan 2010 23:33:30 GMT
	(envelope-from mckusick@svn.freebsd.org)
Received: (from mckusick@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0BNXUGn009761;
	Mon, 11 Jan 2010 23:33:30 GMT
	(envelope-from mckusick@svn.freebsd.org)
Message-Id: <201001112333.o0BNXUGn009761@svn.freebsd.org>
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Mon, 11 Jan 2010 23:33:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202131 - head/sbin/fsck_ffs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jan 2010 23:33:30 -0000

Author: mckusick
Date: Mon Jan 11 23:33:30 2010
New Revision: 202131
URL: http://svn.freebsd.org/changeset/base/202131

Log:
  Cast 64-bit quantity to intptr_t rather than int so as to work properly
  with 64-bit architectures (such as amd64).
  
  Reported by:  Xin LI and Josh Paetzel

Modified:
  head/sbin/fsck_ffs/pass2.c

Modified: head/sbin/fsck_ffs/pass2.c
==============================================================================
--- head/sbin/fsck_ffs/pass2.c	Mon Jan 11 23:32:36 2010	(r202130)
+++ head/sbin/fsck_ffs/pass2.c	Mon Jan 11 23:33:30 2010	(r202131)
@@ -547,7 +547,7 @@ fix_extraneous(struct inoinfo *inp, stru
 				printf(" (IGNORED)\n");
 				return (0);
 			}
-			cmd.value = (int)idesc->id_dirp->d_name;
+			cmd.value = (intptr_t)idesc->id_dirp->d_name;
 			cmd.size = inp->i_number; /* verify same name */
 			if (sysctlbyname("vfs.ffs.unlink", 0, 0,
 			    &cmd, sizeof cmd) == -1) {
@@ -588,7 +588,7 @@ fix_extraneous(struct inoinfo *inp, stru
 			printf(" (IGNORED)\n");
 			return (0);
 		}
-		cmd.value = (int)(cp + 1);
+		cmd.value = (intptr_t)(cp + 1);
 		cmd.size = inp->i_number; /* verify same name */
 		if (sysctlbyname("vfs.ffs.unlink", 0, 0,
 		    &cmd, sizeof cmd) == -1) {