- cleanup and coding style

diff --git a/client/commands.cc b/client/commands.cc
index dda9d3c687747f631ae8c72d408be880c944efd4..357f23f3e02c48959b209678cca0410570661d8d 100644 (file)
--- a/client/commands.cc
+++ b/client/commands.cc
@@ -581,7 +581,7 @@ command_prepare_quota(DBus::Connection& conn, const string& config_name)
        DBus::Hoho hoho(call);
        hoho << config_name;
 
-        conn.send_with_reply_and_block(call);
+       conn.send_with_reply_and_block(call);
     }
     catch (const DBus::ErrorException& e)
     {

diff --git a/server/Client.cc b/server/Client.cc
index 1fe24f141d4ab1578e394971e23f8ac982115962..79e0cc5e7b0c915f57c6589d4e042fe8043bb29b 100644 (file)
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -47,13 +47,13 @@ Client::Client(const string& name, uid_t uid, const Clients& clients)
 Client::~Client()
 {
     method_call_thread.interrupt();
-    file_transfer_thread.interrupt();
+    files_transfer_thread.interrupt();
 
     if (method_call_thread.joinable())
        method_call_thread.join();
 
-    if (file_transfer_thread.joinable())
-       file_transfer_thread.join();
+    if (files_transfer_thread.joinable())
+       files_transfer_thread.join();
 
     for (list<Comparison*>::iterator it = comparisons.begin(); it != comparisons.end(); ++it)
     {
@@ -1478,14 +1478,14 @@ Client::get_files_by_pipe(DBus::Connection& conn, DBus::Message& msg)
 
     DBus::Hoho hoho(reply);
 
-    shared_ptr<FilesTransferTask> file_transfer_task = make_shared<FilesTransferTask>(files);
+    shared_ptr<FilesTransferTask> files_transfer_task = make_shared<FilesTransferTask>(files);
 
-    hoho << file_transfer_task->get_read_end();
+    hoho << files_transfer_task->get_read_end();
     conn.send(reply);
 
-    file_transfer_task->get_read_end().close();
+    files_transfer_task->get_read_end().close();
 
-    add_file_transfer_task(file_transfer_task);
+    add_files_transfer_task(files_transfer_task);
 }
 
 
@@ -1970,16 +1970,16 @@ Client::add_method_call_task(DBus::Connection& conn, DBus::Message& msg)
 
 
 void
-Client::add_file_transfer_task(shared_ptr<FilesTransferTask> file_transfer_task)
+Client::add_files_transfer_task(shared_ptr<FilesTransferTask> files_transfer_task)
 {
-    if (file_transfer_thread.get_id() == boost::thread::id())
-       file_transfer_thread = boost::thread(boost::bind(&Client::files_transfer_worker, this));
+    if (files_transfer_thread.get_id() == boost::thread::id())
+       files_transfer_thread = boost::thread(boost::bind(&Client::files_transfer_worker, this));
 
-    boost::unique_lock<boost::mutex> lock(file_transfer_mutex);
-    file_transfer_tasks.push(file_transfer_task);
+    boost::unique_lock<boost::mutex> lock(files_transfer_mutex);
+    files_transfer_tasks.push(files_transfer_task);
     lock.unlock();
 
-    file_transfer_condition.notify_one();
+    files_transfer_condition.notify_one();
 }
 
 
@@ -2073,12 +2073,12 @@ Client::files_transfer_worker()
     {
        while (true)
        {
-           boost::unique_lock<boost::mutex> lock(file_transfer_mutex);
-           while (file_transfer_tasks.empty())
-               file_transfer_condition.wait(lock);
+           boost::unique_lock<boost::mutex> lock(files_transfer_mutex);
+           while (files_transfer_tasks.empty())
+               files_transfer_condition.wait(lock);
 
-           shared_ptr<FilesTransferTask> ptr(file_transfer_tasks.front());
-           file_transfer_tasks.pop();
+           shared_ptr<FilesTransferTask> ptr(files_transfer_tasks.front());
+           files_transfer_tasks.pop();
            lock.unlock();
 
            try

diff --git a/server/Client.h b/server/Client.h
index 996360aa193a16bccd1c0004e593b776712b765f..398756ae325a40402527e7fb0dd812df91c9623d 100644 (file)
--- a/server/Client.h
+++ b/server/Client.h
@@ -164,11 +164,11 @@ public:
     queue<MethodCallTask> method_call_tasks;
     void add_method_call_task(DBus::Connection& conn, DBus::Message& msg);
 
-    boost::condition_variable file_transfer_condition;
-    boost::mutex file_transfer_mutex;
-    boost::thread file_transfer_thread;
-    queue<shared_ptr<FilesTransferTask>> file_transfer_tasks;
-    void add_file_transfer_task(shared_ptr<FilesTransferTask> file_transfer_task);
+    boost::condition_variable files_transfer_condition;
+    boost::mutex files_transfer_mutex;
+    boost::thread files_transfer_thread;
+    queue<shared_ptr<FilesTransferTask>> files_transfer_tasks;
+    void add_files_transfer_task(shared_ptr<FilesTransferTask> files_transfer_task);
 
     bool zombie = false;
 

diff --git a/server/snapperd.cc b/server/snapperd.cc
index daa99e021e9cf681c533920cc224d26aee04269b..a0277c212fcc77c9858791ad9acadbea9dedd86c 100644 (file)
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -132,7 +132,7 @@ MyMainLoop::client_disconnected(const string& name)
     {
        client->zombie = true;
        client->method_call_thread.interrupt();
-       client->file_transfer_thread.interrupt();
+       client->files_transfer_thread.interrupt();
     }
 
     reset_idle_count();

diff --git a/snapper/Comparison.h b/snapper/Comparison.h
index 9b3413999986b616bbc546f7ce98b9dc74e23d4e..33a5640ec4d19927687d74dbe65dae9400bf8e0d 100644 (file)
--- a/snapper/Comparison.h
+++ b/snapper/Comparison.h
@@ -83,8 +83,6 @@ namespace snapper
 
        Files files;
 
-       struct AppendHelper;
-
     };
 
 }

diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
index f72080f5b6e86f4c11b0ba457f6d54105230432f..ceb086262e91f82e06730223f32c244d21feaa05 100644 (file)
--- a/testsuite-real/Makefile.am
+++ b/testsuite-real/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/testsuite-real
 #
 
-CXXFLAGS += -std=gnu++0x
+CXXFLAGS += -std=gnu++11
 
 AM_CPPFLAGS = -I$(top_srcdir)
 

diff --git a/testsuite/limit.cc b/testsuite/limit.cc
index 5c95f4fb751c72085420b5cd74028347fe7eade1..47a55f4aa02d7227d4c7c2605c1af369eadb3ca1 100644 (file)
--- a/testsuite/limit.cc
+++ b/testsuite/limit.cc
@@ -24,7 +24,7 @@ test(const char* loc, const string& s)
     limit.parse(s);
 
     locale::global(locale::classic());
-    
+
     ostringstream tmp;
     tmp << limit;
     return tmp.str();