From d808c00324618c35de30335ca6fd215f6d81860f Mon Sep 17 00:00:00 2001 From: bilaliscarioth Date: Tue, 8 Jul 2025 02:21:48 +0200 Subject: [PATCH] avoid useless vars on cpu_frequency, mimic sigrtmin/sigrtmax --- include/util/SafeSignal.hpp | 5 +++++ src/modules/cpu_frequency/bsd.cpp | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/util/SafeSignal.hpp b/include/util/SafeSignal.hpp index 458bc57e..e19542f7 100644 --- a/include/util/SafeSignal.hpp +++ b/include/util/SafeSignal.hpp @@ -11,6 +11,11 @@ #include #include +#ifdef __OpenBSD__ +#define SIGRTMIN SIGUSR1-1 +#define SIGRTMAX SIGUSR1+1 +#endif + namespace waybar { /** diff --git a/src/modules/cpu_frequency/bsd.cpp b/src/modules/cpu_frequency/bsd.cpp index 97074474..eb5ae98a 100644 --- a/src/modules/cpu_frequency/bsd.cpp +++ b/src/modules/cpu_frequency/bsd.cpp @@ -5,12 +5,12 @@ std::vector waybar::modules::CpuFrequency::parseCpuFrequencies() { std::vector frequencies; - char buffer[256]; size_t len; int32_t freq; - uint32_t i = 0; #ifndef __OpenBSD__ + char buffer[256]; + uint32_t i = 0; while (true) { len = 4; snprintf(buffer, 256, "dev.cpu.%u.freq", i); @@ -19,11 +19,10 @@ std::vector waybar::modules::CpuFrequency::parseCpuFrequencies() { ++i; } #else - size_t sz; - int psize, cpuspeed, getMhz[] = {CTL_HW, HW_CPUSPEED}; - sz = sizeof(cpuspeed); - sysctl(getMhz, 2, &cpuspeed, &sz, NULL, 0); - frequencies.push_back((float)cpuspeed); + int getMhz[] = {CTL_HW, HW_CPUSPEED}; + len = sizeof(freq); + sysctl(getMhz, 2, &freq, &len, NULL, 0); + frequencies.push_back((float)freq); #endif if (frequencies.empty()) {