zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-13 04:34:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Drop usage of formatted error messages from <err.h>

Browse Source 
They do not clean up the ncurses environment, leaving the terminal in a
broken state.

Also drop bare usage of exit(3).
This commit is contained in:
Christian Göttsche
2021-01-07 16:08:43 +01:00
parent 27db9297b7
commit d800d7a3ce
5 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
openbsd/OpenBSDProcessList.c
View File

@ -8,7 +8,6 @@ in the source distribution for its full text.
#include "OpenBSDProcessList.h"
#include <err.h>
#include <kvm.h>
#include <limits.h>
#include <stdlib.h>
@ -57,11 +56,11 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
size = sizeof(fscale);
if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0) {
err(1, "fscale sysctl call failed");
CRT_fatalError("fscale sysctl call failed");
}
if ((pageSize = sysconf(_SC_PAGESIZE)) == -1)
err(1, "pagesize sysconf call failed");
CRT_fatalError("pagesize sysconf call failed");
pageSizeKB = pageSize / ONE_K;
for (int i = 0; i <= pl->cpuCount; i++) {
@ -72,7 +71,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
opl->kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
if (opl->kd == NULL) {
errx(1, "kvm_open: %s", errbuf);
CRT_fatalError("kvm_openfiles() failed");
}
return pl;
@ -97,7 +96,7 @@ static void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) {
size_t size_uvmexp = sizeof(uvmexp);
if (sysctl(uvmexp_mib, 2, &uvmexp, &size_uvmexp, NULL, 0) < 0) {
err(1, "uvmexp sysctl call failed");
CRT_fatalError("uvmexp sysctl call failed");
}
pl->totalMem = uvmexp.npages * pageSizeKB;
@ -109,7 +108,7 @@ static void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) {
size_t size_bcstats = sizeof(bcstats);
if (sysctl(bcache_mib, 3, &bcstats, &size_bcstats, NULL, 0) < 0) {
err(1, "cannot get vfs.bcachestat");
CRT_fatalError("cannot get vfs.bcachestat");
}
pl->cachedMem = bcstats.numbufpages * pageSizeKB;