From owner-svn-src-projects@FreeBSD.ORG  Fri Jul 24 14:57:03 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 4DD73106564A;
	Fri, 24 Jul 2009 14:57:03 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BDC88FC1A;
	Fri, 24 Jul 2009 14:57:03 +0000 (UTC)
	(envelope-from stas@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 n6OEv2qQ013036;
	Fri, 24 Jul 2009 14:57:02 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6OEv2kN013034;
	Fri, 24 Jul 2009 14:57:02 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200907241457.n6OEv2kN013034@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Fri, 24 Jul 2009 14:57:02 +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: r195842 - projects/libprocstat/sys/kern
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: Fri, 24 Jul 2009 14:57:03 -0000

Author: stas
Date: Fri Jul 24 14:57:02 2009
New Revision: 195842
URL: http://svn.freebsd.org/changeset/base/195842

Log:
  - Cleanup.

Modified:
  projects/libprocstat/sys/kern/kern_descrip.c

Modified: projects/libprocstat/sys/kern/kern_descrip.c
==============================================================================
--- projects/libprocstat/sys/kern/kern_descrip.c	Fri Jul 24 14:48:59 2009	(r195841)
+++ projects/libprocstat/sys/kern/kern_descrip.c	Fri Jul 24 14:57:02 2009	(r195842)
@@ -2911,10 +2911,9 @@ export_fd_for_sysctl(void *data, int typ
 		{ FHASLOCK , KF_FLAG_HASLOCK }
 	};
 #define	NFFLAGS	(sizeof(fflags_table) / sizeof(*fflags_table))
-	int error;
-	int vfslocked;
 	struct vnode *vp;
-	int i;
+	int error, vfslocked;
+	unsigned int i;
 
 	bzero(kif, sizeof(*kif));
 	switch (type) {
@@ -2965,17 +2964,15 @@ export_fd_for_sysctl(void *data, int typ
 static int
 sysctl_kern_proc_filedesc(SYSCTL_HANDLER_ARGS)
 {
-	struct kinfo_file *kif;
-	struct filedesc *fdp;
-	int error, i, *name;
 	struct file *fp;
+	struct filedesc *fdp;
+	struct kinfo_file *kif;
 	struct proc *p;
 	size_t oldidx;
-	void *data;
-	int type;
-	int refcnt;
 	int64_t offset;
-	int fflags;
+	void *data;
+	int error, i, *name;
+	int type, refcnt, fflags;
 
 	name = (int *)arg1;
 	if ((p = pfind((pid_t)name[0])) == NULL)
@@ -3146,11 +3143,11 @@ fill_vnode_info(struct vnode *vp, struct
 		{ VFIFO, },
 		{ VBAD,  },
 	};
-	char *fullpath, *freepath;
-	struct vattr va;
 #define	NVTYPES	(sizeof(vtypes_table) / sizeof(*vtypes_table))
-	unsigned int i;
+	struct vattr va;
+	char *fullpath, *freepath;
 	int error;
+	unsigned int i;
 
 	if (vp == NULL)
 		return (1);
@@ -3199,7 +3196,6 @@ fill_socket_info(struct socket *so, stru
 
 	if (so == NULL)
 		return (1);
-
 	kif->kf_sock_domain = so->so_proto->pr_domain->dom_family;
 	kif->kf_sock_type = so->so_type;
 	kif->kf_sock_protocol = so->so_proto->pr_protocol;