diff options
| author |   guenther <guenther@openbsd.org> | 2013-10-22 16:40:25 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2013-10-22 16:40:25 +0000 |
| commit | cef0bbe1cc5517635356b7faa348b466660ec603 (patch) | |
| tree | 8a975e0739a2b36fd5200d33c430980754b92498 /usr.sbin/pstat | |
| parent | - expand hardware list with iMX boards (diff) | |
| download | wireguard-openbsd-cef0bbe1cc5517635356b7faa348b466660ec603.tar.xz wireguard-openbsd-cef0bbe1cc5517635356b7faa348b466660ec603.zip | |
- add UNIX-domain socket info to struct kinfo_file2
- convert netstat from kvm_getfiles() to kvm_getfile2() using that
- delete kvm_getfiles() and KERN_FILE as no longer used (bump libkvm's major)
- rename kvm_getfile2() to kvm_getfiles(), kinfo_file2 to kinfo_file
and KERN_FILE2 to KERN_FILE.
ok deraadt@, millert@
ports scan sthen@
Diffstat (limited to 'usr.sbin/pstat')
| -rw-r--r-- | usr.sbin/pstat/pstat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index ccfb8652d51..1291e68f58c 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pstat.c,v 1.86 2013/08/22 04:43:41 guenther Exp $ */ +/* $OpenBSD: pstat.c,v 1.87 2013/10/22 16:40:27 guenther Exp $ */ /* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */ /*- @@ -988,7 +988,7 @@ ttyprt(struct itty *tp) void filemode(void) { - struct kinfo_file2 *kf; + struct kinfo_file *kf; char flagbuf[16], *fbp; static char *dtypes[] = { "???", "inode", "socket", "pipe", "kqueue", "crypto", "systrace" }; int mib[2], maxfile, nfile; @@ -1019,9 +1019,9 @@ filemode(void) } if (!totalflag) { - kf = kvm_getfile2(kd, KERN_FILE_BYFILE, 0, sizeof *kf, &nfile); + kf = kvm_getfiles(kd, KERN_FILE_BYFILE, 0, sizeof *kf, &nfile); if (kf == NULL) { - warnx("kvm_getfile2: %s", kvm_geterr(kd)); + warnx("kvm_getfiles: %s", kvm_geterr(kd)); return; } } |