From c75c5ef9c6631127e5c0f3ace4b59e4acadd04e5 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 19 Nov 2020 12:32:07 +1100 Subject: Minor cleanups to platform-specific init and done Move platform-specific code out of the htop.c main function and into the platform sub-directories - primarily this is the Linux procfs path check and sensors setup/teardown; not needed on any other platforms. No functional changes here. --- dragonflybsd/Platform.c | 17 +++++++++++++---- dragonflybsd/Platform.h | 8 ++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'dragonflybsd') diff --git a/dragonflybsd/Platform.c b/dragonflybsd/Platform.c index c6966c11..00fe93ea 100644 --- a/dragonflybsd/Platform.c +++ b/dragonflybsd/Platform.c @@ -74,10 +74,6 @@ const SignalItem Platform_signals[] = { const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals); -void Platform_setBindings(Htop_Action* keys) { - (void) keys; -} - const MeterClass* const Platform_meterTypes[] = { &CPUMeter_class, &ClockMeter_class, @@ -107,6 +103,19 @@ const MeterClass* const Platform_meterTypes[] = { NULL }; +void Platform_init(void) { + /* no platform-specific setup needed */ +} + +void Platform_done(void) { + /* no platform-specific cleanup needed */ +} + +void Platform_setBindings(Htop_Action* keys) { + /* no platform-specific key bindings */ + (void) keys; +} + int Platform_getUptime() { struct timeval bootTime, currTime; int mib[2] = { CTL_KERN, KERN_BOOTTIME }; diff --git a/dragonflybsd/Platform.h b/dragonflybsd/Platform.h index 267b8f37..a05eb641 100644 --- a/dragonflybsd/Platform.h +++ b/dragonflybsd/Platform.h @@ -27,10 +27,14 @@ extern const SignalItem Platform_signals[]; extern const unsigned int Platform_numberOfSignals; -void Platform_setBindings(Htop_Action* keys); - extern const MeterClass* const Platform_meterTypes[]; +void Platform_init(void); + +void Platform_done(void); + +void Platform_setBindings(Htop_Action* keys); + int Platform_getUptime(void); void Platform_getLoadAverage(double* one, double* five, double* fifteen); -- cgit v1.2.3