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

style: fix

pull/46/head
Alexis 2018-09-10 11:16:57 +02:00
parent f78ef0d491
commit 0abaaf2f7f
No known key found for this signature in database
GPG Key ID: 20B1EC2EBBA96BD9
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/modules/network.hpp
View File

@ -17,8 +17,8 @@ class Network : public ALabel {
~Network(); ~Network();
auto update() -> void; auto update() -> void;
private: private:
static uint64_t netlinkRequest(int, void*, uint32_t, uint32_t groups = 0); static int netlinkRequest(int, void*, uint32_t, uint32_t groups = 0);
static uint64_t netlinkResponse(int, void*, uint32_t, uint32_t groups = 0); static int netlinkResponse(int, void*, uint32_t, uint32_t groups = 0);
static int scanCb(struct nl_msg*, void*); static int scanCb(struct nl_msg*, void*);
void disconnected(); void disconnected();
@ -33,7 +33,7 @@ class Network : public ALabel {
int ifid_; int ifid_;
sa_family_t family_; sa_family_t family_;
int sock_fd_; int sock_fd_;
struct sockaddr_nl nladdr_ = {0}; struct sockaddr_nl nladdr_ = {};
struct nl_sock* sk_ = nullptr; struct nl_sock* sk_ = nullptr;
int nl80211_id_; int nl80211_id_;

2
src/ALabel.cpp
View File

@ -24,7 +24,7 @@ auto waybar::ALabel::update() -> void
// Nothing here // Nothing here
} }
bool waybar::ALabel::handleToggle(GdkEventButton* const& ev) bool waybar::ALabel::handleToggle(GdkEventButton* const& /*ev*/)
{ {
alt = !alt; alt = !alt;
if (alt) { if (alt) {

2
src/main.cpp
View File

@ -13,7 +13,7 @@ int main(int argc, char* argv[])
try { try {
waybar::Client c(argc, argv); waybar::Client c(argc, argv);
waybar::client = &c; waybar::client = &c;
std::signal(SIGUSR1, [] (int signal) { std::signal(SIGUSR1, [] (int /*signal*/) {
for (auto& bar : waybar::client->bars) { for (auto& bar : waybar::client->bars) {
(*bar).toggle(); (*bar).toggle();
} }

2
src/modules/cpu.cpp
View File

@ -13,7 +13,7 @@ waybar::modules::Cpu::Cpu(const Json::Value& config)
auto waybar::modules::Cpu::update() -> void auto waybar::modules::Cpu::update() -> void
{ {
struct sysinfo info = {0}; struct sysinfo info = {};
if (sysinfo(&info) == 0) { if (sysinfo(&info) == 0) {
float f_load = 1.f / (1u << SI_LOAD_SHIFT); float f_load = 1.f / (1u << SI_LOAD_SHIFT);
uint16_t load = info.loads[0] * f_load * 100 / get_nprocs(); uint16_t load = info.loads[0] * f_load * 100 / get_nprocs();

2
src/modules/memory.cpp
View File

@ -13,7 +13,7 @@ waybar::modules::Memory::Memory(const Json::Value& config)
auto waybar::modules::Memory::update() -> void auto waybar::modules::Memory::update() -> void
{ {
struct sysinfo info = {0}; struct sysinfo info = {};
if (sysinfo(&info) == 0) { if (sysinfo(&info) == 0) {
auto total = info.totalram * info.mem_unit; auto total = info.totalram * info.mem_unit;
auto freeram = info.freeram * info.mem_unit; auto freeram = info.freeram * info.mem_unit;

14
src/modules/network.cpp
View File

@ -165,7 +165,7 @@ int waybar::modules::Network::getExternalInterface()
* consume responses till NLMSG_DONE/NLMSG_ERROR is encountered). * consume responses till NLMSG_DONE/NLMSG_ERROR is encountered).
*/ */
do { do {
uint64_t len = netlinkResponse(sock_fd_, resp, route_buffer_size); auto len = netlinkResponse(sock_fd_, resp, route_buffer_size);
if (len < 0) { if (len < 0) {
goto out; goto out;
} }
@ -228,7 +228,7 @@ int waybar::modules::Network::getExternalInterface()
break; break;
} }
for (uint32_t i = 0; i < dstlen; i += 1) { for (uint32_t i = 0; i < dstlen; i += 1) {
c |= *(unsigned char *)(RTA_DATA(attr) + i); c |= *((unsigned char *)RTA_DATA(attr) + i);
} }
has_destination = (c == 0); has_destination = (c == 0);
break; break;
@ -255,10 +255,10 @@ out:
return ifidx; return ifidx;
} }
uint64_t waybar::modules::Network::netlinkRequest(int fd, void *req, int waybar::modules::Network::netlinkRequest(int fd, void *req,
uint32_t reqlen, uint32_t groups) uint32_t reqlen, uint32_t groups)
{ {
struct sockaddr_nl sa = {0}; struct sockaddr_nl sa = {};
sa.nl_family = AF_NETLINK; sa.nl_family = AF_NETLINK;
sa.nl_groups = groups; sa.nl_groups = groups;
struct iovec iov = { req, reqlen }; struct iovec iov = { req, reqlen };
@ -266,11 +266,11 @@ uint64_t waybar::modules::Network::netlinkRequest(int fd, void *req,
return sendmsg(fd, &msg, 0); return sendmsg(fd, &msg, 0);
} }
uint64_t waybar::modules::Network::netlinkResponse(int fd, void *resp, int waybar::modules::Network::netlinkResponse(int fd, void *resp,
uint32_t resplen, uint32_t groups) uint32_t resplen, uint32_t groups)
{ {
uint64_t ret; int ret;
struct sockaddr_nl sa = {0}; struct sockaddr_nl sa = {};
sa.nl_family = AF_NETLINK; sa.nl_family = AF_NETLINK;
sa.nl_groups = groups; sa.nl_groups = groups;
struct iovec iov = { resp, resplen }; struct iovec iov = { resp, resplen };