From: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Date: Tue, 12 Sep 2017 09:29:31 +0000 (+0200)
Subject: misc: fix some minor style issues, fix SCOPE_TRACING compilation
X-Git-Tag: 4.99.1~105
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=7a14533d1a270bb7a57be16dce31235604d71e0b;p=staging%2Fwindowmanager.git

misc: fix some minor style issues, fix SCOPE_TRACING compilation

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
---

diff --git a/src/json_helper.cpp b/src/json_helper.cpp
index e4d73bc..179c8cc 100644
--- a/src/json_helper.cpp
+++ b/src/json_helper.cpp
@@ -16,7 +16,6 @@
 
 #include "json_helper.hpp"
 
-#include <stdlib.h>
 #include <json.h>
 
 json_object *to_json(genivi::surface_properties const &s) {
diff --git a/src/main.cpp b/src/main.cpp
index f14cf96..5b140f2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -50,7 +50,7 @@ int afb_instance::init() {
    return this->app.init();
 }
 
-int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
+int display_event_callback(sd_event_source *evs, int  /*fd*/, uint32_t events,
                            void * /*data*/) {
    ST();
 
@@ -83,8 +83,9 @@ int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
 
 error:
    sd_event_source_unref(evs);
-   if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr)
+   if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr) {
       exit(1);
+}
    return -1;
 }
 
@@ -155,7 +156,7 @@ void binding_api::send_event(char const *evname, char const *label) {
       logdebug("afb_event_broadcast failed: %m");
    }
 }
-}
+} // namespace wm
 
 extern "C" const struct afb_binding_v2 afbBindingV2 = {
    "winman", nullptr, nullptr, winman_verbs, nullptr, binding_init, nullptr, 0};
diff --git a/src/util.cpp b/src/util.cpp
index 44c377c..c178d90 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -26,7 +26,7 @@
 
 #ifdef SCOPE_TRACING
 thread_local int ScopeTrace::indent = 0;
-explicit ScopeTrace::ScopeTrace(char const *func) : f(func) {
+ScopeTrace::ScopeTrace(char const *func) : f(func) {
    fprintf(stderr, "%lu %*s%s -->\n", pthread_self(), 2 * indent++, "", this->f);
 }
 ScopeTrace::~ScopeTrace() { fprintf(stderr, "%lu %*s%s <--\n", pthread_self(), 2 * --indent, "", this->f); }