From f78f658eedf5594a591a7a993c5af8a1f03f4455 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 10 Apr 2018 10:22:44 -0300 Subject: [PATCH] dragonflybsd, freebsd, openbsd: fixes for htop 3.0 branch --- dragonflybsd/DragonFlyBSDProcess.c | 4 ++-- freebsd/FreeBSDProcess.c | 4 ++-- openbsd/OpenBSDProcess.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dragonflybsd/DragonFlyBSDProcess.c b/dragonflybsd/DragonFlyBSDProcess.c index dade106d..e2bfb7a9 100644 --- a/dragonflybsd/DragonFlyBSDProcess.c +++ b/dragonflybsd/DragonFlyBSDProcess.c @@ -138,14 +138,14 @@ void DragonFlyBSDProcess_writeField(Process* this, RichString* str, ProcessField long DragonFlyBSDProcess_compare(const void* v1, const void* v2) { DragonFlyBSDProcess *p1, *p2; Settings *settings = ((Process*)v1)->settings; - if (settings->direction == 1) { + if (settings->ss->direction == 1) { p1 = (DragonFlyBSDProcess*)v1; p2 = (DragonFlyBSDProcess*)v2; } else { p2 = (DragonFlyBSDProcess*)v1; p1 = (DragonFlyBSDProcess*)v2; } - switch ((int) settings->sortKey) { + switch ((int) settings->ss->sortKey) { // add Platform-specific fields here case JID: return (p1->jid - p2->jid); diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c index f81fadf5..d9e76d74 100644 --- a/freebsd/FreeBSDProcess.c +++ b/freebsd/FreeBSDProcess.c @@ -136,14 +136,14 @@ void FreeBSDProcess_writeField(Process* this, RichString* str, ProcessField fiel long FreeBSDProcess_compare(const void* v1, const void* v2) { FreeBSDProcess *p1, *p2; Settings *settings = ((Process*)v1)->settings; - if (settings->direction == 1) { + if (settings->ss->direction == 1) { p1 = (FreeBSDProcess*)v1; p2 = (FreeBSDProcess*)v2; } else { p2 = (FreeBSDProcess*)v1; p1 = (FreeBSDProcess*)v2; } - switch ((int) settings->sortKey) { + switch ((int) settings->ss->sortKey) { // add FreeBSD-specific fields here case JID: return (p1->jid - p2->jid); diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c index 70f9653b..9f25714a 100644 --- a/openbsd/OpenBSDProcess.c +++ b/openbsd/OpenBSDProcess.c @@ -215,14 +215,14 @@ void OpenBSDProcess_writeField(Process* this, RichString* str, ProcessField fiel long OpenBSDProcess_compare(const void* v1, const void* v2) { OpenBSDProcess *p1, *p2; Settings *settings = ((Process*)v1)->settings; - if (settings->direction == 1) { + if (settings->ss->direction == 1) { p1 = (OpenBSDProcess*)v1; p2 = (OpenBSDProcess*)v2; } else { p2 = (OpenBSDProcess*)v1; p1 = (OpenBSDProcess*)v2; } - switch (settings->sortKey) { + switch (settings->ss->sortKey) { // add OpenBSD-specific fields here default: return Process_compare(v1, v2);