1 files changed, 17 insertions, 11 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 60a243a..c85f053 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,7 @@
 
 #include <unistd.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <sys/poll.h>
 
@@ -28,19 +28,21 @@ int check_events(struct wl::display &d, struct conn &c, int fd) {
    if (poll(pfd, fd != -1 ? 2 : 1, -1) != -1 && errno != EINTR) {
       int ret = 0;
 
-      if (pfd[0].revents & POLLIN) {
+      if ((pfd[0].revents & POLLIN) != 0) {
          ret = d.dispatch();
       }
 
-      if (ret == -1)
+      if (ret == -1) {
          return ret;
+      }
 
-      if (fd != -1 && (pfd[1].revents & POLLIN)) {
+      if (fd != -1 && ((pfd[1].revents & POLLIN) != 0)) {
          char buf[256];
 
          // read all there is ...
-         while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf))
+         while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf)) {
             ;
+         }
 
          // Display current status
          if (!c.c->surfaces.empty()) {
@@ -109,7 +111,7 @@ void init_layout(struct conn &c) {
    c.c->commit_changes();
    // Note: this does not flush the display!
 }
-}
+}  // namespace
 
 //                  _        ____
 //  _ __ ___   __ _(_)_ __  / /\ \
@@ -117,15 +119,17 @@ void init_layout(struct conn &c) {
 // | | | | | | (_| | | | | | |  | |
 // |_| |_| |_|\__,_|_|_| |_| |  | |
 //                          \_\/_/
-int main(int argc, char **argv) {
+int main(int /*argc*/, char ** /*argv*/) {
    lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
 
-   if (!getenv("XDG_RUNTIME_DIR"))
+   if (getenv("XDG_RUNTIME_DIR") == nullptr) {
       fatal("Environment variable XDG_RUNTIME_DIR not set");
+   }
 
    struct wl::display d {};
-   if (!d.ok())
+   if (!d.ok()) {
       fatal("Could not connect to compositor");
+   }
 
    struct conn c {};
 
@@ -146,11 +150,13 @@ int main(int argc, char **argv) {
    // Third level objects
    d.roundtrip();
 
-   if (!c.c)
+   if (!c.c) {
       fatal("ivi_controller global not available");
+   }
 
-   if (c.outputs.empty())
+   if (c.outputs.empty()) {
       fatal("no output was set up!");
+   }
 
    init_layout(c);