From owner-svn-src-projects@FreeBSD.ORG Sun Jul 26 08:14:01 2009 Return-Path: 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 8FCBA1065673; Sun, 26 Jul 2009 08:14:01 +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 7DBE48FC0A; Sun, 26 Jul 2009 08:14:01 +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 n6Q8E1Vi064031; Sun, 26 Jul 2009 08:14:01 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6Q8E1lH064027; Sun, 26 Jul 2009 08:14:01 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200907260814.n6Q8E1lH064027@svn.freebsd.org> From: Stanislav Sedov Date: Sun, 26 Jul 2009 08:14:01 +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: r195885 - projects/libprocstat/usr.bin/fstat X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jul 2009 08:14:01 -0000 Author: stas Date: Sun Jul 26 08:14:01 2009 New Revision: 195885 URL: http://svn.freebsd.org/changeset/base/195885 Log: - Style(9) nitpicking. Modified: projects/libprocstat/usr.bin/fstat/fstat.c projects/libprocstat/usr.bin/fstat/fuser.c projects/libprocstat/usr.bin/fstat/libprocstat.c Modified: projects/libprocstat/usr.bin/fstat/fstat.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/fstat.c Sun Jul 26 08:06:38 2009 (r195884) +++ projects/libprocstat/usr.bin/fstat/fstat.c Sun Jul 26 08:14:01 2009 (r195885) @@ -209,11 +209,11 @@ do_fstat(int argc, char **argv) static void dofiles(struct procstat *procstat, struct kinfo_proc *kp) { - struct filestat_list *head; const char *cmd; const char *uname; - int pid; struct filestat *fst; + struct filestat_list *head; + int pid; uname = user_from_uid(kp->ki_uid, 0); pid = kp->ki_pid; @@ -231,11 +231,10 @@ static void print_file_info(struct procstat *procstat, struct filestat *fst, const char *uname, const char *cmd, int pid) { - const char *filename; struct vnstat vn; - int error; - int fsmatch = 0; DEVS *d; + const char *filename; + int error, fsmatch = 0; filename = NULL; if (checkfile != 0) { @@ -318,10 +317,10 @@ print_socket_info(struct procstat *procs }; #define STYPEMAX 5 struct sockstat sock; - char errbuf[_POSIX2_LINE_MAX]; - static int isopen; struct protoent *pe; + char errbuf[_POSIX2_LINE_MAX]; int error; + static int isopen; error = procstat_get_socket_info(procstat, fst, &sock, errbuf); if (error != 0) { @@ -427,9 +426,9 @@ static void print_vnode_info(struct procstat *procstat, struct filestat *fst) { struct vnstat vn; - const char *badtype; char errbuf[_POSIX2_LINE_MAX]; char mode[15]; + const char *badtype; int error; badtype = NULL; Modified: projects/libprocstat/usr.bin/fstat/fuser.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/fuser.c Sun Jul 26 08:06:38 2009 (r195884) +++ projects/libprocstat/usr.bin/fstat/fuser.c Sun Jul 26 08:14:01 2009 (r195885) @@ -166,9 +166,9 @@ do_fuser(int argc, char *argv[]) struct kinfo_proc *p; struct procstat *procstat; struct reqfile *reqfiles; + char *ep, *nlistf, *memf; int ch, cnt, sig; unsigned int i, nfiles; - char *ep, *nlistf, *memf; sig = SIGKILL; /* Default to kill. */ nlistf = NULL; @@ -288,10 +288,10 @@ static void dofiles(struct procstat *procstat, struct kinfo_proc *kp, struct reqfile *reqfiles, size_t nfiles) { + struct vnstat vn; struct consumer *cons; struct filestat *fst; struct filestat_list *head; - struct vnstat vn; int error, match; unsigned int i; Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/libprocstat.c Sun Jul 26 08:06:38 2009 (r195884) +++ projects/libprocstat/usr.bin/fstat/libprocstat.c Sun Jul 26 08:14:01 2009 (r195885) @@ -136,9 +136,9 @@ procstat_close(struct procstat *procstat struct procstat * procstat_open(const char *nlistf, const char *memf) { + struct procstat *procstat; kvm_t *kd; char buf[_POSIX2_LINE_MAX]; - struct procstat *procstat; procstat = calloc(1, sizeof(*procstat)); if (procstat == NULL) { @@ -259,25 +259,23 @@ filestat_new_entry(void *typedep, int ty static struct filestat_list * procstat_getfiles_kvm(kvm_t *kd, struct kinfo_proc *kp, int mmapped) { - int i; struct file file; struct filedesc filed; - unsigned int nfiles; + struct vm_map_entry vmentry; + struct vm_object object; + struct vmspace vmspace; + vm_map_entry_t entryp; + vm_map_t map; + vm_object_t objp; struct file **ofiles; struct filestat *entry; struct filestat_list *head; - int type; void *data; - vm_map_t map; - struct vmspace vmspace; - struct vm_map_entry vmentry; - vm_map_entry_t entryp; - struct vm_object object; - vm_object_t objp; - int prot, fflags; + int i, fflags; + int prot, type; + unsigned int nfiles; assert(kd); - if (kp->ki_fd == NULL) return (NULL); if (!kvm_read_all(kd, (unsigned long)kp->ki_fd, &filed, @@ -513,6 +511,7 @@ kinfo_fflags2fst(int kfflags) static int kinfo_uflags2fst(int fd) { + switch (fd) { case KF_FD_TYPE_CWD: return (PS_FST_UFLAG_CDIR); @@ -533,12 +532,11 @@ procstat_getfiles_sysctl(struct kinfo_pr { struct kinfo_file *kif, *files; struct filestat_list *head; - int fd, fflags, uflags, type; struct filestat *entry; - int cnt, i; + int cnt, fd, fflags; + int i, type, uflags; assert(kp); - if (kp->ki_fd == NULL) return (NULL); @@ -837,8 +835,8 @@ static int procstat_get_vnode_info_sysctl(struct filestat *fst, struct vnstat *vn, char *errbuf __unused) { - struct kinfo_file *kif; struct statfs stbuf; + struct kinfo_file *kif; char *name; assert(fst); @@ -895,10 +893,10 @@ static int procstat_get_socket_info_kvm(kvm_t *kd, struct filestat *fst, struct sockstat *sock, char *errbuf) { - struct socket s; - struct protosw proto; struct domain dom; struct inpcb inpcb; + struct protosw proto; + struct socket s; struct unpcb unpcb; ssize_t len; void *so;