Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid useless vars on cpu_frequency, mimic sigrtmin/sigrtmax

Browse Source
This commit is contained in:
bilaliscarioth
2025-07-08 02:21:48 +02:00
parent 0cb605b529
commit d808c00324
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/util/SafeSignal.hpp
View File

@ -11,6 +11,11 @@
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#ifdef __OpenBSD__
#define SIGRTMIN SIGUSR1-1
#define SIGRTMAX SIGUSR1+1
#endif
namespace waybar { namespace waybar {
/** /**

13
src/modules/cpu_frequency/bsd.cpp
View File

@ -5,12 +5,12 @@
std::vector<float> waybar::modules::CpuFrequency::parseCpuFrequencies() { std::vector<float> waybar::modules::CpuFrequency::parseCpuFrequencies() {
std::vector<float> frequencies; std::vector<float> frequencies;
char buffer[256];
size_t len; size_t len;
int32_t freq; int32_t freq;
uint32_t i = 0;
#ifndef __OpenBSD__ #ifndef __OpenBSD__
char buffer[256];
uint32_t i = 0;
while (true) { while (true) {
len = 4; len = 4;
snprintf(buffer, 256, "dev.cpu.%u.freq", i); snprintf(buffer, 256, "dev.cpu.%u.freq", i);
@ -19,11 +19,10 @@ std::vector<float> waybar::modules::CpuFrequency::parseCpuFrequencies() {
++i; ++i;
} }
#else #else
size_t sz; int getMhz[] = {CTL_HW, HW_CPUSPEED};
int psize, cpuspeed, getMhz[] = {CTL_HW, HW_CPUSPEED}; len = sizeof(freq);
sz = sizeof(cpuspeed); sysctl(getMhz, 2, &freq, &len, NULL, 0);
sysctl(getMhz, 2, &cpuspeed, &sz, NULL, 0); frequencies.push_back((float)freq);
frequencies.push_back((float)cpuspeed);
#endif #endif
if (frequencies.empty()) { if (frequencies.empty()) {