summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb@NetBSD.org>2000-06-16 03:51:00 +0000
committersimonb <simonb@NetBSD.org>2000-06-16 03:51:00 +0000
commit643cb3c341bb006de4946341ffec8e012df0739e (patch)
tree7530d75e8fdb6c36d45a9b813410ff6d5ba6e258
parent9424f6fe54dc9315f6ba711358d7479aec4996ed (diff)
Don't check namelist when choosing to use the sysctl interface.
-rw-r--r--bin/ps/ps.c6
-rw-r--r--sbin/dmesg/dmesg.c6
-rw-r--r--usr.bin/ipcs/ipcs.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 9f7a1b13f99..690ecbc4d59 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ps.c,v 1.40 2000/06/08 13:30:40 simonb Exp $ */
+/* $NetBSD: ps.c,v 1.41 2000/06/16 03:51:00 simonb Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: ps.c,v 1.40 2000/06/08 13:30:40 simonb Exp $");
+__RCSID("$NetBSD: ps.c,v 1.41 2000/06/16 03:51:00 simonb Exp $");
#endif
#endif /* not lint */
@@ -340,7 +340,7 @@ main(argc, argv)
}
#endif
- if (nlistf == NULL && memf == NULL && swapf == NULL) {
+ if (memf == NULL && swapf == NULL) {
kd = kvm_openfiles(nlistf, memf, swapf, KVM_NO_FILES, errbuf);
donlist_sysctl();
} else
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index 467ddcee4fd..b02f855de3b 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmesg.c,v 1.18 2000/06/16 03:42:12 simonb Exp $ */
+/* $NetBSD: dmesg.c,v 1.19 2000/06/16 04:00:44 simonb Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)dmesg.c 8.1 (Berkeley) 6/5/93";
#else
-__RCSID("$NetBSD: dmesg.c,v 1.18 2000/06/16 03:42:12 simonb Exp $");
+__RCSID("$NetBSD: dmesg.c,v 1.19 2000/06/16 04:00:44 simonb Exp $");
#endif
#endif /* not lint */
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
- if (memf == NULL && nlistf == NULL) {
+ if (memf == NULL) {
size_t size;
int mib[2];
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 4158fb245f1..d499f2629ab 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ipcs.c,v 1.24 2000/06/03 04:12:48 simonb Exp $ */
+/* $NetBSD: ipcs.c,v 1.25 2000/06/16 03:58:20 simonb Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -220,7 +220,7 @@ main(int argc, char *argv[])
if (argc - optind > 0)
usage();
- if (namelist == NULL && core == NULL) {
+ if (core == NULL) {
if (display & (MSGINFO | MSGTOTAL))
msg_sysctl();
if (display & (SHMINFO | SHMTOTAL))