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

Merge pull request #2266 from zjeffer/master 

Fixed some build warnings
pull/2268/head
Alexis Rouillard 2023-07-01 10:53:24 +02:00 committed by GitHub
parent 4116490535 25c2aaabcb
commit b62e5eb822
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/network.cpp
View File

@ -91,10 +91,11 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf
cidr_(0), cidr_(0),
signal_strength_dbm_(0), signal_strength_dbm_(0),
signal_strength_(0), signal_strength_(0),
frequency_(0.0),
#ifdef WANT_RFKILL #ifdef WANT_RFKILL
rfkill_{RFKILL_TYPE_WLAN}, rfkill_{RFKILL_TYPE_WLAN}
#endif #endif
frequency_(0.0) { {
// Start with some "text" in the module's label_. update() will then // Start with some "text" in the module's label_. update() will then
// update it. Since the text should be different, update() will be able // update it. Since the text should be different, update() will be able

5
src/util/rfkill.cpp
View File

@ -63,7 +63,7 @@ bool waybar::util::Rfkill::on_event(Glib::IOCondition cond) {
return false; return false;
} }
if (len < RFKILL_EVENT_SIZE_V1) { if (static_cast<size_t>(len) < RFKILL_EVENT_SIZE_V1) {
spdlog::error("Wrong size of RFKILL event: {} < {}", len, RFKILL_EVENT_SIZE_V1); spdlog::error("Wrong size of RFKILL event: {} < {}", len, RFKILL_EVENT_SIZE_V1);
return true; return true;
} }
@ -73,10 +73,9 @@ bool waybar::util::Rfkill::on_event(Glib::IOCondition cond) {
on_update.emit(event); on_update.emit(event);
} }
return true; return true;
} else { }
spdlog::error("Failed to poll RFKILL control device"); spdlog::error("Failed to poll RFKILL control device");
return false; return false;
}
} }
bool waybar::util::Rfkill::getState() const { return state_; } bool waybar::util::Rfkill::getState() const { return state_; }