**** Merged from HEAD ****

2000-02-13  Martin Baulig  <martin@home-of-linux.org>

	* *.c: kvm_nlist () returns -1 on error, but a positive return value
	does not necessarily mean failure. Fixes #3302 which was reported by
	Matthias Scheler some time ago.

9 files changed, 15 insertions, 9 deletions

diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog
index 44474b48..0b9fdb93 100644
--- a/sysdeps/freebsd/ChangeLog
+++ b/sysdeps/freebsd/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-13  Martin Baulig  <martin@home-of-linux.org>
+
+	* *.c: kvm_nlist () returns -1 on error, but a positive return value
+	does not necessarily mean failure. Fixes #3302 which was reported by
+	Matthias Scheler some time ago.
+
 1999-10-16  Martin Baulig  <martin@home-of-linux.org>
 
 	Applied all patches from the FreeBSD 3.3 ports collection.
diff --git a/sysdeps/freebsd/cpu.c b/sysdeps/freebsd/cpu.c
index a56106c7..5fdce7ad 100644
--- a/sysdeps/freebsd/cpu.c
+++ b/sysdeps/freebsd/cpu.c
@@ -51,7 +51,7 @@ static int mib [] = { CTL_KERN, KERN_CLOCKRATE };
 void
 glibtop_init_cpu_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (cpu)");
 		return;
 	}
diff --git a/sysdeps/freebsd/mem.c b/sysdeps/freebsd/mem.c
index 5480cae9..1b96fe7f 100644
--- a/sysdeps/freebsd/mem.c
+++ b/sysdeps/freebsd/mem.c
@@ -92,7 +92,7 @@ glibtop_init_mem_p (glibtop *server)
 {
 	register int pagesize;
 
-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (mem)");
 		return;
 	}
diff --git a/sysdeps/freebsd/msg_limits.c b/sysdeps/freebsd/msg_limits.c
index 3c4de8d5..e5bf24aa 100644
--- a/sysdeps/freebsd/msg_limits.c
+++ b/sysdeps/freebsd/msg_limits.c
@@ -76,7 +76,7 @@ static struct nlist nlst [] = {
 void
 glibtop_init_msg_limits_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (msg_limits)");
 		return;
 	}
diff --git a/sysdeps/freebsd/netload.c b/sysdeps/freebsd/netload.c
index cc252326..d4e04870 100644
--- a/sysdeps/freebsd/netload.c
+++ b/sysdeps/freebsd/netload.c
@@ -67,7 +67,7 @@ glibtop_init_netload_p (glibtop *server)
 {
     server->sysdeps.netload = _glibtop_sysdeps_netload;
 
-    if (kvm_nlist (server->machine.kd, nlst) != 0)
+    if (kvm_nlist (server->machine.kd, nlst) < 0)
 	glibtop_error_io_r (server, "kvm_nlist");
 }
 
diff --git a/sysdeps/freebsd/ppp.c b/sysdeps/freebsd/ppp.c
index 792a1e7a..41ab1b36 100644
--- a/sysdeps/freebsd/ppp.c
+++ b/sysdeps/freebsd/ppp.c
@@ -82,7 +82,7 @@ glibtop_init_ppp_p (glibtop *server)
 #endif
 #endif /* HAVE_I4B */
 
-	if (kvm_nlist (server->machine.kd, nlst) != 0)
+	if (kvm_nlist (server->machine.kd, nlst) < 0)
 		glibtop_error_io_r (server, "kvm_nlist");
 }
 
diff --git a/sysdeps/freebsd/sem_limits.c b/sysdeps/freebsd/sem_limits.c
index 13b36130..262e5bc1 100644
--- a/sysdeps/freebsd/sem_limits.c
+++ b/sysdeps/freebsd/sem_limits.c
@@ -78,7 +78,7 @@ static struct nlist nlst [] = {
 void
 glibtop_init_sem_limits_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (sem_limits)");
 		return;
 	}
diff --git a/sysdeps/freebsd/shm_limits.c b/sysdeps/freebsd/shm_limits.c
index f8ab72c1..280a53bd 100644
--- a/sysdeps/freebsd/shm_limits.c
+++ b/sysdeps/freebsd/shm_limits.c
@@ -76,7 +76,7 @@ static struct nlist nlst [] = {
 void
 glibtop_init_shm_limits_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (shm_limits)");
 		return;
 	}
diff --git a/sysdeps/freebsd/swap.c b/sysdeps/freebsd/swap.c
index da63f19f..d9669fa6 100644
--- a/sysdeps/freebsd/swap.c
+++ b/sysdeps/freebsd/swap.c
@@ -97,7 +97,7 @@ glibtop_init_swap_p (glibtop *server)
 {
 #if defined(__FreeBSD__) || defined(__bsdi__)
 #if __FreeBSD__ < 4 || defined(__bsdi__)
-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (swap)");
 		return;
 	}
@@ -112,7 +112,7 @@ glibtop_init_swap_p (glibtop *server)
 #endif
 
 #if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
-	if (kvm_nlist (server->machine.kd, nlst2) != 0) {
+	if (kvm_nlist (server->machine.kd, nlst2) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (cnt)");
 		return;
 	}