From owner-svn-src-projects@FreeBSD.ORG Thu Jul 16 22:33:21 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 D82C3106566B; Thu, 16 Jul 2009 22:33:21 +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 AB7DC8FC14; Thu, 16 Jul 2009 22:33:21 +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 n6GMXLjP044874; Thu, 16 Jul 2009 22:33:21 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6GMXLAn044872; Thu, 16 Jul 2009 22:33:21 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200907162233.n6GMXLAn044872@svn.freebsd.org> From: Stanislav Sedov Date: Thu, 16 Jul 2009 22:33:21 +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: r195731 - 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: Thu, 16 Jul 2009 22:33:22 -0000 Author: stas Date: Thu Jul 16 22:33:21 2009 New Revision: 195731 URL: http://svn.freebsd.org/changeset/base/195731 Log: - Cleanup. - Do not report about unknow file types. Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/libprocstat.c Thu Jul 16 22:30:11 2009 (r195730) +++ projects/libprocstat/usr.bin/fstat/libprocstat.c Thu Jul 16 22:33:21 2009 (r195731) @@ -360,36 +360,36 @@ procstat_getfiles_kvm(kvm_t *kd, struct /* root directory vnode, if one. */ if (filed.fd_rdir) { - entry = filestat_new_entry(filed.fd_rdir, PS_FST_TYPE_VNODE, PS_FST_FD_RDIR, - PS_FST_FFLAG_READ); + entry = filestat_new_entry(filed.fd_rdir, PS_FST_TYPE_VNODE, + PS_FST_FD_RDIR, PS_FST_FFLAG_READ); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } /* current working directory vnode. */ if (filed.fd_cdir) { - entry = filestat_new_entry(filed.fd_cdir, PS_FST_TYPE_VNODE, PS_FST_FD_CDIR, - PS_FST_FFLAG_READ); + entry = filestat_new_entry(filed.fd_cdir, PS_FST_TYPE_VNODE, + PS_FST_FD_CDIR, PS_FST_FFLAG_READ); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } /* jail root, if any. */ if (filed.fd_jdir) { - entry = filestat_new_entry(filed.fd_jdir, PS_FST_TYPE_VNODE, PS_FST_FD_JAIL, - PS_FST_FFLAG_READ); + entry = filestat_new_entry(filed.fd_jdir, PS_FST_TYPE_VNODE, + PS_FST_FD_JAIL, PS_FST_FFLAG_READ); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } /* ktrace vnode, if one */ if (kp->ki_tracep) { - entry = filestat_new_entry(kp->ki_tracep, PS_FST_TYPE_VNODE, PS_FST_FD_TRACE, - PS_FST_FFLAG_READ | PS_FST_FFLAG_WRITE); + entry = filestat_new_entry(kp->ki_tracep, PS_FST_TYPE_VNODE, + PS_FST_FD_TRACE, PS_FST_FFLAG_READ | PS_FST_FFLAG_WRITE); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } /* text vnode, if one */ if (kp->ki_textvp) { - entry = filestat_new_entry(kp->ki_textvp, PS_FST_TYPE_VNODE, PS_FST_FD_TEXT, - PS_FST_FFLAG_READ); + entry = filestat_new_entry(kp->ki_textvp, PS_FST_TYPE_VNODE, + PS_FST_FD_TEXT, PS_FST_FFLAG_READ); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } @@ -440,8 +440,6 @@ procstat_getfiles_kvm(kvm_t *kd, struct break; #endif default: - warnx("unknown file type %d for file %d", - file.f_type, i); continue; } entry = filestat_new_entry(data, type, i, @@ -672,7 +670,8 @@ procstat_get_vnode_info_kvm(kvm_t *kd, s vn->vn_type = vntype2psfsttype(vnode.v_type); if (vnode.v_type == VNON || vnode.v_type == VBAD) return (0); - error = kvm_read_all(kd, (unsigned long)vnode.v_tag, tagstr, sizeof(tagstr)); + error = kvm_read_all(kd, (unsigned long)vnode.v_tag, tagstr, + sizeof(tagstr)); if (error == 0) { warnx("can't read v_tag at %p", (void *)vp); goto fail;