- coding style

diff --git a/client/installation-helper.cc b/client/installation-helper.cc
index 248cf3506e3dee1c5f83749590f1f87f9f6a3c7f..4869c8e1fb89e40ff79cd58656f8464f419616cb 100644 (file)
--- 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 6088918a17057f0bc03a740da5e99b9944f44805..105049bbbfec341cbf959e0de1b4be9f348c2a7b 100644 (file)
--- 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 87bcc724541e9b450bda000cf9ed815ec5a50c7e..066d3d6e7fdb3508dbbdacf8539544713c3475e8 100644 (file)
--- 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 8386c1b697a3da4bb6800f3260e97de84c16ebb0..c406daa8cb09012460055c4c44c737662b1250c7 100644 (file)
--- 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 30164d1963f1c6b97f98c83336d6af42d3f191f9..0e0e7e7ab5c1458e0a0617b8760d661716e2274a 100644 (file)
--- 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>