diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2020-10-21 19:11:19 +0200 |
|---|---|---|
| committer | cgzones <cgzones@googlemail.com> | 2020-10-29 22:21:42 +0100 |
| commit | 97ea45ca9a4ee639681e3048be4813b56c969bdd (patch) | |
| tree | 456f1945722e253b04c8c9c21a3336b5b748c763 /freebsd | |
| parent | c2fdfd99eb5bffee0f6d1e1838fb4708eac18425 (diff) | |
FreeBSD: update ProcessList
Diffstat (limited to 'freebsd')
| -rw-r--r-- | freebsd/FreeBSDProcessList.c | 12 | ||||
| -rw-r--r-- | freebsd/FreeBSDProcessList.h | 8 |
2 files changed, 8 insertions, 12 deletions
diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index 69b4aba2..caa04ccd 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -16,19 +16,19 @@ in the source distribution for its full text. #include <string.h> #include <time.h> #include <unistd.h> -#include <sys/types.h> +#include <unistd.h> #include <sys/stat.h> #include <sys/sysctl.h> +#include <sys/types.h> #include <sys/user.h> -#include <unistd.h> #include "CRT.h" #include "FreeBSDProcess.h" #include "Macros.h" #include "ProcessList.h" +#include "XUtils.h" #include "zfs/ZfsArcStats.h" #include "zfs/openzfs_sysctl.h" -#include "XUtils.h" char jail_errmsg[JAIL_ERRMSGLEN]; @@ -383,7 +383,7 @@ err2: } } -char* FreeBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd) { +static char* FreeBSDProcessList_readProcessName(kvm_t* kd, const struct kinfo_proc* kproc, int* basenameEnd) { char** argv = kvm_getargv(kd, kproc, 0); if (!argv) { return xStrdup(kproc->ki_comm); @@ -408,7 +408,7 @@ char* FreeBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, in return comm; } -char* FreeBSDProcessList_readJailName(struct kinfo_proc* kproc) { +static char* FreeBSDProcessList_readJailName(const struct kinfo_proc* kproc) { int jid; struct iovec jiov[6]; char* jname; @@ -419,7 +419,7 @@ char* FreeBSDProcessList_readJailName(struct kinfo_proc* kproc) { IGNORE_WCASTQUAL_BEGIN *(const void **)&jiov[0].iov_base = "jid"; jiov[0].iov_len = sizeof("jid"); - jiov[1].iov_base = &kproc->ki_jid; + jiov[1].iov_base = (void*) &kproc->ki_jid; jiov[1].iov_len = sizeof(kproc->ki_jid); *(const void **)&jiov[2].iov_base = "name"; jiov[2].iov_len = sizeof("name"); diff --git a/freebsd/FreeBSDProcessList.h b/freebsd/FreeBSDProcessList.h index 81980415..e97444bd 100644 --- a/freebsd/FreeBSDProcessList.h +++ b/freebsd/FreeBSDProcessList.h @@ -8,10 +8,10 @@ in the source distribution for its full text. */ #include <kvm.h> -#include <sys/param.h> +#include <sys/param.h> // needs to be included before <sys/jail.h> for MAXPATHLEN #include <sys/jail.h> -#include <sys/uio.h> #include <sys/resource.h> +#include <sys/uio.h> #include "FreeBSDProcess.h" #include "Hashtable.h" @@ -60,10 +60,6 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui void ProcessList_delete(ProcessList* this); -char* FreeBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd); - -char* FreeBSDProcessList_readJailName(struct kinfo_proc* kproc); - void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate); #endif |