From c33d6178cbefb7dad17dc7315527e8a894a85c94 Mon Sep 17 00:00:00 2001
From: Arvin Schnell <aschnell@suse.de>
Date: Wed, 19 Apr 2023 09:40:04 +0200
Subject: [PATCH] - coding style

---
 client/installation-helper.cc |  2 +-
 client/misc.cc                |  2 +-
 server/Client.cc              | 18 +++++++++---------
 snapper/Btrfs.cc              |  2 +-
 snapper/Filesystem.cc         |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/client/installation-helper.cc b/client/installation-helper.cc
index 248cf350..4869c8e1 100644
--- a/client/installation-helper.cc
+++ b/client/installation-helper.cc
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/client/misc.cc b/client/misc.cc
index 6088918a..105049bb 100644
--- a/client/misc.cc
+++ b/client/misc.cc
@@ -192,7 +192,7 @@ get_filesystem(const ProxyConfig& config, const string& target_root)
 
 
 Differ::Differ()
-    : command(DIFFBIN " --new-file --unified"), extensions()
+    : command(DIFFBIN " --new-file --unified")
 {
 }
 
diff --git a/server/Client.cc b/server/Client.cc
index 87bcc724..066d3d6e 100644
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -603,7 +603,7 @@ Client::list_configs(DBus::Connection& conn, DBus::Message& msg)
     DBus::Marshaller marshaller(reply);
     marshaller.open_array(DBus::TypeInfo<ConfigInfo>::signature);
     for (MetaSnappers::const_iterator it = meta_snappers.begin(); it != meta_snappers.end(); ++it)
-    marshaller << it->getConfigInfo();
+	marshaller << it->getConfigInfo();
     marshaller.close_array();
 
     conn.send(reply);
@@ -1218,9 +1218,9 @@ Client::get_default_snapshot(DBus::Connection& conn, DBus::Message& msg)
     DBus::Marshaller marshaller(reply);
 
     if (tmp != snapshots.end())
-    marshaller << true << tmp->getNum();
+	marshaller << true << tmp->getNum();
     else
-    marshaller << false << (unsigned int)(0);
+	marshaller << false << (unsigned int)(0);
 
     conn.send(reply);
 }
@@ -1252,9 +1252,9 @@ Client::get_active_snapshot(DBus::Connection& conn, DBus::Message& msg)
     DBus::Marshaller marshaller(reply);
 
     if (tmp != snapshots.end())
-    marshaller << true << tmp->getNum();
+	marshaller << true << tmp->getNum();
     else
-    marshaller << false << (unsigned int)(0);
+	marshaller << false << (unsigned int)(0);
 
     conn.send(reply);
 }
@@ -1726,7 +1726,7 @@ Client::debug(DBus::Connection& conn, DBus::Message& msg)
     {
 	std::ostringstream s;
 	s << "    pid:" << getpid();
-    marshaller << s.str();
+	marshaller << s.str();
     }
 
     marshaller << "clients:";
@@ -1742,7 +1742,7 @@ Client::debug(DBus::Connection& conn, DBus::Message& msg)
 	    s << ", locks " << it->locks.size();
 	if (!it->comparisons.empty())
 	    s << ", comparisons " << it->comparisons.size();
-    marshaller << s.str();
+	marshaller << s.str();
     }
 
     marshaller << "backgrounds:";
@@ -1750,7 +1750,7 @@ Client::debug(DBus::Connection& conn, DBus::Message& msg)
     {
 	std::ostringstream s;
 	s << "    name:'" << it->meta_snapper->configName() << "'";
-    marshaller << s.str();
+	marshaller << s.str();
     }
 
     marshaller << "meta-snappers:";
@@ -1766,7 +1766,7 @@ Client::debug(DBus::Connection& conn, DBus::Message& msg)
 	    else
 		s << ", use count " << it->use_count();
 	}
-    marshaller << s.str();
+	marshaller << s.str();
     }
 
     marshaller << "compile options:";
diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
index 8386c1b6..c406daa8 100644
--- a/snapper/Btrfs.cc
+++ b/snapper/Btrfs.cc
@@ -131,7 +131,7 @@ namespace snapper
 		case EEXIST:
 		    SN_THROW(CreateConfigFailedException("creating btrfs subvolume .snapshots failed "
 							 "since it already exists"));
-                    break;
+		    break;
 
 		default:
 		    SN_THROW(CreateConfigFailedException("creating btrfs subvolume .snapshots failed"));
diff --git a/snapper/Filesystem.cc b/snapper/Filesystem.cc
index 30164d19..0e0e7e7a 100644
--- a/snapper/Filesystem.cc
+++ b/snapper/Filesystem.cc
@@ -23,11 +23,11 @@
 
 #include "config.h"
 
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/mount.h>
-#include <errno.h>
+#include <cerrno>
 #include <unistd.h>
 #include <mntent.h>
 #include <fcntl.h>
-- 
2.47.3