From 078fde56677c3519ce8ffb21951b3da31de1b813 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Fri, 9 Apr 2021 15:30:35 +0200 Subject: [PATCH] - coding style --- server/Client.cc | 2 +- server/Client.h | 3 ++- server/MetaSnapper.cc | 4 ++-- server/MetaSnapper.h | 4 ++-- snapper/XmlFile.cc | 1 + snapper/XmlFile.h | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/server/Client.cc b/server/Client.cc index 92759311..28942a43 100644 --- a/server/Client.cc +++ b/server/Client.cc @@ -39,7 +39,7 @@ boost::shared_mutex big_mutex; Client::Client(const string& name, const Clients& clients) - : name(name), zombie(false), clients(clients) + : name(name), clients(clients) { } diff --git a/server/Client.h b/server/Client.h index 60871d5d..6ed6e41c 100644 --- a/server/Client.h +++ b/server/Client.h @@ -160,7 +160,7 @@ public: boost::thread thread; queue tasks; - bool zombie; + bool zombie = false; void add_task(DBus::Connection& conn, DBus::Message& msg); @@ -176,6 +176,7 @@ private: class Clients { public: + Clients(Backgrounds& backgrounds); typedef list::iterator iterator; diff --git a/server/MetaSnapper.cc b/server/MetaSnapper.cc index 2dcc8624..f87e5ed3 100644 --- a/server/MetaSnapper.cc +++ b/server/MetaSnapper.cc @@ -36,7 +36,7 @@ MetaSnappers meta_snappers; RefCounter::RefCounter() - : counter(0), last_used(steady_clock::now()) + : last_used(steady_clock::now()) { } @@ -95,7 +95,7 @@ RefCounter::unused_for() const MetaSnapper::MetaSnapper(ConfigInfo& config_info) - : config_info(config_info), snapper(NULL) + : config_info(config_info) { set_permissions(); } diff --git a/server/MetaSnapper.h b/server/MetaSnapper.h index da3090ce..69033b32 100644 --- a/server/MetaSnapper.h +++ b/server/MetaSnapper.h @@ -53,7 +53,7 @@ private: mutable boost::mutex mutex; - int counter; + int counter = 0; steady_clock::time_point last_used; @@ -109,7 +109,7 @@ private: ConfigInfo config_info; - Snapper* snapper; + Snapper* snapper = nullptr; }; diff --git a/snapper/XmlFile.cc b/snapper/XmlFile.cc index 09823ae1..bc77822a 100644 --- a/snapper/XmlFile.cc +++ b/snapper/XmlFile.cc @@ -60,6 +60,7 @@ namespace snapper XmlFile::~XmlFile() { xmlFreeDoc(doc); + doc = nullptr; } diff --git a/snapper/XmlFile.h b/snapper/XmlFile.h index 974d3349..9f9db179 100644 --- a/snapper/XmlFile.h +++ b/snapper/XmlFile.h @@ -60,7 +60,7 @@ namespace snapper private: - xmlDoc* doc; + xmlDoc* doc = nullptr; }; -- 2.47.3