From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 24 15:00:46 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 197D5106564A;
	Wed, 24 Jun 2009 15:00:46 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 084928FC1C;
	Wed, 24 Jun 2009 15:00:46 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5OF0j4C017768;
	Wed, 24 Jun 2009 15:00:45 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5OF0jTG017766;
	Wed, 24 Jun 2009 15:00:45 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200906241500.n5OF0jTG017766@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Wed, 24 Jun 2009 15:00:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194838 - projects/libprocstat/sys/sys
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jun 2009 15:00:46 -0000

Author: lulf
Date: Wed Jun 24 15:00:45 2009
New Revision: 194838
URL: http://svn.freebsd.org/changeset/base/194838

Log:
  - Use the spare fields instead of expanding the struct.
  - Use types with known size.

Modified:
  projects/libprocstat/sys/sys/user.h

Modified: projects/libprocstat/sys/sys/user.h
==============================================================================
--- projects/libprocstat/sys/sys/user.h	Wed Jun 24 14:49:26 2009	(r194837)
+++ projects/libprocstat/sys/sys/user.h	Wed Jun 24 15:00:45 2009	(r194838)
@@ -307,7 +307,7 @@ struct kinfo_ofile {
 };
 
 #if defined(__amd64__) || defined(__i386__)
-#define	KINFO_FILE_SIZE	1412
+#define	KINFO_FILE_SIZE	1392
 #endif
 
 struct kinfo_file {
@@ -324,12 +324,12 @@ struct kinfo_file {
 	int	kf_sock_protocol;		/* Socket protocol. */
 	struct sockaddr_storage kf_sa_local;	/* Socket address. */
 	struct sockaddr_storage	kf_sa_peer;	/* Peer address. */
-	long	kf_fsid;			/* Vnode filesystem id. */
-	long	kf_fileid;			/* Global file id. */
-	mode_t	kf_mode;			/* File mode. */
-	u_long	kf_size;			/* File size. */
-	dev_t	kf_rdev;			/* File device. */
-	int	_kf_ispare[16];			/* Space for more stuff. */
+	uint32_t	kf_fsid;		/* Vnode filesystem id. */
+	uint64_t	kf_fileid;		/* Global file id. */
+	uint32_t	kf_mode;		/* File mode. */
+	int64_t		kf_size;		/* File size. */
+	uint32_t	kf_rdev;		/* File device. */
+	int	_kf_ispare[9];			/* Space for more stuff. */
 	/* Truncated before copyout in sysctl */
 	char	kf_path[PATH_MAX];		/* Path to file, if any. */
 };