From c799942eb46d800de8145478501d7a1f6c930816 Mon Sep 17 00:00:00 2001
From: Piotr Bartosiewicz <p.bartosiewi@partner.samsung.com>
Date: Wed, 31 Dec 2014 13:28:54 +0100
Subject: [PATCH] Small code cleanup

[Bug/Feature]   N/A
[Cause]         N/A
[Solution]      N/A
[Verification]  Run tests

Change-Id: I45d18c987c7ea90276a3cf6e1eac3760a9df1db7
---
 common/lxc/cgroup.cpp                   | 7 ++++---
 common/utils/glib-loop.cpp              | 4 +---
 server/zone-provision.hpp               | 2 +-
 tests/unit_tests/dbus/ut-connection.cpp | 7 ++++++-
 tests/unit_tests/utils/ut-worker.cpp    | 2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common/lxc/cgroup.cpp b/common/lxc/cgroup.cpp
index 807ddff..62f3184 100644
--- a/common/lxc/cgroup.cpp
+++ b/common/lxc/cgroup.cpp
@@ -24,6 +24,7 @@
 
 
 #include "config.hpp"
+#include "lxc/cgroup.hpp"
 #include "logger/logger.hpp"
 #include "utils/fs.hpp"
 
@@ -105,11 +106,11 @@ bool setDeviceAccess(const std::string& zoneName,
         return false;
     }
 
-    int major = major(devStat.st_rdev);
-    int minor = minor(devStat.st_rdev);
+    unsigned int major = major(devStat.st_rdev);
+    unsigned int minor = minor(devStat.st_rdev);
 
     char value[100];
-    snprintf(value, sizeof(value), "%c %d:%d %s", type, major, minor, perm.c_str());
+    snprintf(value, sizeof(value), "%c %u:%u %s", type, major, minor, perm.c_str());
 
     std::string name = grant ? "devices.allow" : "devices.deny";
     return setCgroup(zoneName, name, value);
diff --git a/common/utils/glib-loop.cpp b/common/utils/glib-loop.cpp
index fb2d952..dd82204 100644
--- a/common/utils/glib-loop.cpp
+++ b/common/utils/glib-loop.cpp
@@ -48,9 +48,7 @@ ScopedGlibLoop::ScopedGlibLoop()
 #if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
 #endif
-    mLoopThread = std::thread([this] {
-                                  g_main_loop_run(mLoop.get());
-                              });
+    mLoopThread = std::thread(g_main_loop_run, mLoop.get());
 }
 
 ScopedGlibLoop::~ScopedGlibLoop()
diff --git a/server/zone-provision.hpp b/server/zone-provision.hpp
index d7cc1e4..c87fbe9 100644
--- a/server/zone-provision.hpp
+++ b/server/zone-provision.hpp
@@ -43,7 +43,7 @@ class ZoneProvision {
 public:
     /**
      * ZoneProvision constructor
-     * @param zonesPath directory where zones are defined (lxc configs, rootfs etc)
+     * @param zonePath directory where zones are defined (lxc configs, rootfs etc)
      */
     ZoneProvision(const std::string& zonePath,
                   const std::vector<std::string>& validLinkPrefixes);
diff --git a/tests/unit_tests/dbus/ut-connection.cpp b/tests/unit_tests/dbus/ut-connection.cpp
index 3e335ed..d4eb1de 100644
--- a/tests/unit_tests/dbus/ut-connection.cpp
+++ b/tests/unit_tests/dbus/ut-connection.cpp
@@ -110,6 +110,12 @@ BOOST_AUTO_TEST_CASE(NoDbusTest)
     BOOST_CHECK_THROW(DbusConnection::create(DBUS_ADDRESS), DbusIOException);
 }
 
+BOOST_AUTO_TEST_CASE(ConnectionTest)
+{
+    ScopedGlibLoop loop;
+    DbusConnection::Pointer connSystem = DbusConnection::createSystem();
+}
+
 BOOST_AUTO_TEST_CASE(SimpleTest)
 {
     ScopedDbusDaemon daemon;
@@ -273,7 +279,6 @@ BOOST_AUTO_TEST_CASE(RegisterObjectTest)
 
 BOOST_AUTO_TEST_CASE(IntrospectSystemTest)
 {
-    ScopedDbusDaemon daemon;
     ScopedGlibLoop loop;
     DbusConnection::Pointer conn = DbusConnection::createSystem();
     std::string xml = conn->introspect("org.freedesktop.DBus", "/org/freedesktop/DBus");
diff --git a/tests/unit_tests/utils/ut-worker.cpp b/tests/unit_tests/utils/ut-worker.cpp
index 280889b..91fa6b8 100644
--- a/tests/unit_tests/utils/ut-worker.cpp
+++ b/tests/unit_tests/utils/ut-worker.cpp
@@ -161,7 +161,7 @@ BOOST_AUTO_TEST_CASE(NoCopyTest)
     struct Task {
         Counter& count;
 
-        Task(Counter& c) : count(c) {};
+        Task(Counter& c) : count(c) {}
         Task(const Task& t) : count(t.count) {++count;}
         Task(Task&& r) : count(r.count) {}
         Task& operator=(const Task&) = delete;
-- 
2.7.4