From ed09d045383ad8ecf3e3cb7c0f17888b6da967a4 Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 27 Mar 2017 18:23:45 +0000 Subject: [PATCH] MFC r315595,r315603: r315595: Remove a commented out line before kvm_getprocs(3) The commented out return value for kvm_getprocs(3) was misleading -- the uncommented line is correct. No content change r315603: kvm_close(3): return `error` instead of blindly returning `0` `error` is the accumulated error from previous close(2) calls. This bug has been present since the libcall's import from 4.4BSD Lite (r1573). Noticed by: vangyzen (D10022) Relnotes: yes git-svn-id: svn://svn.freebsd.org/base/stable/10@316040 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- lib/libkvm/kvm.c | 2 +- lib/libkvm/kvm_getprocs.3 | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c index 75abcd223..d5a33aa20 100644 --- a/lib/libkvm/kvm.c +++ b/lib/libkvm/kvm.c @@ -280,7 +280,7 @@ kvm_close(kvm_t *kd) free((void *)kd->argv); free((void *)kd); - return (0); + return (error); } /* diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3 index 013da08e7..eb2af98a0 100644 --- a/lib/libkvm/kvm_getprocs.3 +++ b/lib/libkvm/kvm_getprocs.3 @@ -47,7 +47,6 @@ .In sys/param.h .In sys/sysctl.h .In sys/user.h -.\" .Fa kvm_t *kd .Ft struct kinfo_proc * .Fn kvm_getprocs "kvm_t *kd" "int op" "int arg" "int *cnt" .Ft char ** -- 2.45.0