zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
darwin/DarwinProcessList.c
View File

@ -7,7 +7,6 @@ in the source distribution for its full text.
#include "DarwinProcessList.h" #include "DarwinProcessList.h"
#include <err.h>
#include <errno.h> #include <errno.h>
#include <libproc.h> #include <libproc.h>
#include <stdbool.h> #include <stdbool.h>

14
dragonflybsd/DragonFlyBSDProcessList.c
View File

@ -15,7 +15,6 @@ in the source distribution for its full text.
#include <sys/types.h> #include <sys/types.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/user.h> #include <sys/user.h>
#include <err.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
@ -112,7 +111,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
dfpl->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf); dfpl->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf);
if (dfpl->kd == NULL) { if (dfpl->kd == NULL) {
errx(1, "kvm_open: %s", errbuf); CRT_fatalError("kvm_openfiles() failed");
} }
return pl; return pl;
@ -294,25 +293,20 @@ static inline void DragonFlyBSDProcessList_scanJails(DragonFlyBSDProcessList* df
char* nextpos; char* nextpos;
if (sysctlbyname("jail.list", NULL, &len, NULL, 0) == -1) { if (sysctlbyname("jail.list", NULL, &len, NULL, 0) == -1) {
fprintf(stderr, "initial sysctlbyname / jail.list failed\n"); CRT_fatalError("initial sysctlbyname / jail.list failed");
exit(3);
} }
retry: retry:
if (len == 0) if (len == 0)
return; return;
jls = xMalloc(len); jls = xMalloc(len);
if (jls == NULL) {
fprintf(stderr, "xMalloc failed\n");
exit(4);
}
if (sysctlbyname("jail.list", jls, &len, NULL, 0) == -1) { if (sysctlbyname("jail.list", jls, &len, NULL, 0) == -1) {
if (errno == ENOMEM) { if (errno == ENOMEM) {
free(jls); free(jls);
goto retry; goto retry;
} }
fprintf(stderr, "sysctlbyname / jail.list failed\n"); CRT_fatalError("sysctlbyname / jail.list failed");
exit(5);
} }
if (dfpl->jails) { if (dfpl->jails) {

3
freebsd/FreeBSDProcessList.c
View File

@ -9,7 +9,6 @@ in the source distribution for its full text.
#include <assert.h> #include <assert.h>
#include <dirent.h> #include <dirent.h>
#include <err.h>
#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -145,7 +144,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
fpl->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf); fpl->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf);
if (fpl->kd == NULL) { if (fpl->kd == NULL) {
errx(1, "kvm_open: %s", errbuf); CRT_fatalError("kvm_openfiles() failed");
} }
fpl->ttys = Hashtable_new(20, true); fpl->ttys = Hashtable_new(20, true);

11
openbsd/OpenBSDProcessList.c
View File

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

1
solaris/SolarisProcessList.c
View File

@ -14,7 +14,6 @@ in the source distribution for its full text.
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/user.h> #include <sys/user.h>
#include <err.h>
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include <procfs.h> #include <procfs.h>