summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.bin/systat/mbufs.c6
-rw-r--r--usr.bin/systat/netstat.c8
-rw-r--r--usr.bin/systat/vmstat.c14
-rw-r--r--usr.bin/vmstat/dkstats.c28
-rw-r--r--usr.bin/vmstat/vmstat.c46
-rw-r--r--usr.sbin/pstat/pstat.c21
-rw-r--r--usr.sbin/trpt/trpt.c6
-rw-r--r--usr.sbin/trsp/trsp.c6
8 files changed, 67 insertions, 68 deletions
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 08a62120035..c1d386e638f 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbufs.c,v 1.11 2002/06/18 00:46:47 deraadt Exp $ */
+/* $OpenBSD: mbufs.c,v 1.12 2002/06/19 08:45:52 deraadt Exp $ */
/* $NetBSD: mbufs.c,v 1.2 1995/01/20 08:52:02 jtc Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: mbufs.c,v 1.11 2002/06/18 00:46:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mbufs.c,v 1.12 2002/06/19 08:45:52 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -139,7 +139,7 @@ showmbufs(void)
static struct nlist namelist[] = {
#define X_MBSTAT 0
- { "_mbstat" },
+ { "_mbstat" }, /* sysctl */
{ "" }
};
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 27fdb109d58..904383e530e 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netstat.c,v 1.22 2002/06/18 00:46:47 deraadt Exp $ */
+/* $OpenBSD: netstat.c,v 1.23 2002/06/19 08:45:52 deraadt Exp $ */
/* $NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: netstat.c,v 1.22 2002/06/18 00:46:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: netstat.c,v 1.23 2002/06/19 08:45:52 deraadt Exp $";
#endif /* not lint */
/*
@@ -152,9 +152,9 @@ closenetstat(WINDOW *w)
}
static struct nlist namelist[] = {
-#define X_TCBTABLE 0
+#define X_TCBTABLE 0 /* no sysctl */
{ "_tcbtable" },
-#define X_UDBTABLE 1
+#define X_UDBTABLE 1 /* no sysctl */
{ "_udbtable" },
{ "" },
};
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index d2fbeae3b9f..30f6f11264d 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmstat.c,v 1.35 2002/06/18 00:46:48 deraadt Exp $ */
+/* $OpenBSD: vmstat.c,v 1.36 2002/06/19 08:45:52 deraadt Exp $ */
/* $NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
#endif
-static char rcsid[] = "$OpenBSD: vmstat.c,v 1.35 2002/06/18 00:46:48 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vmstat.c,v 1.36 2002/06/19 08:45:52 deraadt Exp $";
#endif /* not lint */
/*
@@ -140,16 +140,16 @@ closekre(WINDOW *w)
static struct nlist namelist[] = {
-#define X_INTRNAMES 0
+#define X_INTRNAMES 0 /* no sysctl */
{ "_intrnames" },
-#define X_EINTRNAMES 1
+#define X_EINTRNAMES 1 /* no sysctl */
{ "_eintrnames" },
-#define X_INTRCNT 2
+#define X_INTRCNT 2 /* no sysctl */
{ "_intrcnt" },
-#define X_EINTRCNT 3
+#define X_EINTRCNT 3 /* no sysctl */
{ "_eintrcnt" },
#if defined(__i386__)
-#define X_INTRHAND 4
+#define X_INTRHAND 4 /* no sysctl */
{ "_intrhand" },
#endif
{ "" },
diff --git a/usr.bin/vmstat/dkstats.c b/usr.bin/vmstat/dkstats.c
index 3cd4214c23e..9d4e42f1086 100644
--- a/usr.bin/vmstat/dkstats.c
+++ b/usr.bin/vmstat/dkstats.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dkstats.c,v 1.17 2002/06/08 02:33:32 drahn Exp $ */
+/* $OpenBSD: dkstats.c,v 1.18 2002/06/19 08:45:52 deraadt Exp $ */
/* $NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $ */
/*
@@ -53,20 +53,20 @@
#if !defined(NOKVM)
static struct nlist namelist[] = {
-#define X_TK_NIN 0
- { "_tk_nin" }, /* tty characters in */
-#define X_TK_NOUT 1
- { "_tk_nout" }, /* tty characters out */
-#define X_CP_TIME 2
- { "_cp_time" }, /* system timer ticks */
-#define X_HZ 3
- { "_hz" }, /* ticks per second */
-#define X_STATHZ 4
+#define X_TK_NIN 0 /* sysctl */
+ { "_tk_nin" },
+#define X_TK_NOUT 1 /* sysctl */
+ { "_tk_nout" },
+#define X_CP_TIME 2 /* sysctl */
+ { "_cp_time" },
+#define X_HZ 3 /* sysctl */
+ { "_hz" },
+#define X_STATHZ 4 /* sysctl */
{ "_stathz" },
-#define X_DISK_COUNT 5
- { "_disk_count" }, /* number of disks */
-#define X_DISKLIST 6
- { "_disklist" }, /* TAILQ of disks */
+#define X_DISK_COUNT 5 /* sysctl */
+ { "_disk_count" },
+#define X_DISKLIST 6 /* sysctl */
+ { "_disklist" },
{ NULL },
};
#define KVM_ERROR(_string) { \
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 91e419fc837..f1256581066 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
/* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */
-/* $OpenBSD: vmstat.c,v 1.69 2002/05/29 09:23:25 deraadt Exp $ */
+/* $OpenBSD: vmstat.c,v 1.70 2002/06/19 08:45:52 deraadt Exp $ */
/*
* Copyright (c) 1980, 1986, 1991, 1993
@@ -80,37 +80,37 @@ static char rcsid[] = "$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp
#include <uvm/uvm_extern.h>
struct nlist namelist[] = {
-#define X_UVMEXP 0
+#define X_UVMEXP 0 /* sysctl */
{ "_uvmexp" },
-#define X_BOOTTIME 1
+#define X_BOOTTIME 1 /* sysctl */
{ "_boottime" },
-#define X_NCHSTATS 2
+#define X_NCHSTATS 2 /* sysctl */
{ "_nchstats" },
-#define X_INTRNAMES 3
- { "_intrnames" },
-#define X_EINTRNAMES 4
- { "_eintrnames" },
-#define X_INTRCNT 5
- { "_intrcnt" },
-#define X_EINTRCNT 6
- { "_eintrcnt" },
-#define X_KMEMSTAT 7
+#define X_KMEMSTAT 3 /* sysctl */
{ "_kmemstats" },
-#define X_KMEMBUCKETS 8
+#define X_KMEMBUCKETS 4 /* sysctl */
{ "_bucket" },
-#define X_ALLEVENTS 9
- { "_allevents" },
-#define X_FORKSTAT 10
+#define X_FORKSTAT 5 /* sysctl */
{ "_forkstat" },
-#define X_POOLHEAD 11
- { "_pool_head" },
-#define X_NSELCOLL 12
+#define X_NSELCOLL 6 /* sysctl */
{ "_nselcoll" },
-#define X_END 13
+#define X_POOLHEAD 7 /* sysctl */
+ { "_pool_head" },
+#define X_ALLEVENTS 8 /* no sysctl */
+ { "_allevents" },
+#define X_INTRNAMES 9 /* no sysctl */
+ { "_intrnames" },
+#define X_EINTRNAMES 10 /* no sysctl */
+ { "_eintrnames" },
+#define X_INTRCNT 11 /* no sysctl */
+ { "_intrcnt" },
+#define X_EINTRCNT 12 /* no sysctl */
+ { "_eintrcnt" },
+#define X_END 13 /* no sysctl */
#if defined(__i386__)
-#define X_INTRHAND (X_END)
+#define X_INTRHAND (X_END) /* no sysctl */
{ "_intrhand" },
-#define X_INTRSTRAY (X_END+1)
+#define X_INTRSTRAY (X_END+1) /* no sysctl */
{ "_intrstray" },
#endif
{ "" },
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index b04d69d08fb..a44d102bdc4 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pstat.c,v 1.35 2002/06/18 23:41:32 deraadt Exp $ */
+/* $OpenBSD: pstat.c,v 1.36 2002/06/19 08:45:52 deraadt Exp $ */
/* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */
/*-
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94";
#else
-static char *rcsid = "$OpenBSD: pstat.c,v 1.35 2002/06/18 23:41:32 deraadt Exp $";
+static char *rcsid = "$OpenBSD: pstat.c,v 1.36 2002/06/19 08:45:52 deraadt Exp $";
#endif
#endif /* not lint */
@@ -84,19 +84,18 @@ static char *rcsid = "$OpenBSD: pstat.c,v 1.35 2002/06/18 23:41:32 deraadt Exp $
#include <unistd.h>
struct nlist nl[] = {
-#define V_MOUNTLIST 0
- { "_mountlist" }, /* address of head of mount list. */
-#define V_NUMV 1
- { "_numvnodes" },
-#define FNL_NFILE 2
+#define FNL_NFILE 0 /* sysctl */
{"_nfiles"},
-#define FNL_MAXFILE 3
+#define FNL_MAXFILE 1 /* sysctl */
{"_maxfiles"},
-#define TTY_NTTY 4
+#define TTY_NTTY 2 /* sysctl */
{"_tty_count"},
-#define TTY_TTYLIST 5
+#define V_NUMV 3 /* sysctl */
+ { "_numvnodes" },
+#define V_MOUNTLIST 4 /* no sysctl */
+ { "_mountlist" },
+#define TTY_TTYLIST 5 /* no sysctl */
{"_ttylist"},
-#define NLMANDATORY TTY_TTYLIST /* names up to here are mandatory */
{ "" }
};
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index 77a2fc8af95..833aec7cc45 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trpt.c,v 1.12 2002/03/14 16:44:25 mpech Exp $ */
+/* $OpenBSD: trpt.c,v 1.13 2002/06/19 08:45:52 deraadt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -120,9 +120,9 @@ static char sccsid[] = "@(#)trpt.c 8.1 (Berkeley) 6/6/93";
#include <unistd.h>
struct nlist nl[] = {
-#define N_TCP_DEBUG 0
+#define N_TCP_DEBUG 0 /* no sysctl */
{ "_tcp_debug" },
-#define N_TCP_DEBX 1
+#define N_TCP_DEBX 1 /* no sysctl */
{ "_tcp_debx" },
{ NULL },
};
diff --git a/usr.sbin/trsp/trsp.c b/usr.sbin/trsp/trsp.c
index b17ce3c2f2c..98ac6fe6e03 100644
--- a/usr.sbin/trsp/trsp.c
+++ b/usr.sbin/trsp/trsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trsp.c,v 1.9 2002/02/17 19:42:40 millert Exp $ */
+/* $OpenBSD: trsp.c,v 1.10 2002/06/19 08:45:52 deraadt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -125,9 +125,9 @@ int jflag;
int aflag;
int zflag;
struct nlist nl[] = {
-#define N_SPP_DEBUG 0
+#define N_SPP_DEBUG 0 /* no sysctl */
{ "_spp_debug" },
-#define N_SPP_DEBX 1
+#define N_SPP_DEBX 1 /* no sysctl */
{ "_spp_debx" },
{ NULL },
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-02 03:41:01 +0000