From 2fa437833852b9a10e5481248e2535e16a4373bf Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sat, 31 Jul 2010 15:44:08 +0300
Subject: [PATCH] Astyle cleanup with new Astyle options.

---
 cli/threadexecutor.cpp      | 10 +++++-----
 lib/cppcheck.cpp            |  2 +-
 test/testthreadexecutor.cpp | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
index bd8c66cfd..9e572510e 100644
--- a/cli/threadexecutor.cpp
+++ b/cli/threadexecutor.cpp
@@ -57,7 +57,7 @@ int ThreadExecutor::handleRead(unsigned int &result)
     char type = 0;
     if (read(_pipe[0], &type, 1) <= 0)
     {
-        if ( errno == EAGAIN )
+        if (errno == EAGAIN)
             return 0;
 
         return -1;
@@ -141,10 +141,10 @@ unsigned int ThreadExecutor::check()
 
     unsigned int childCount = 0;
     unsigned int i = 0;
-    while ( true )
+    while (true)
     {
         // Start a new child
-        if ( i < _filenames.size() && childCount < _settings._jobs )
+        if (i < _filenames.size() && childCount < _settings._jobs)
         {
             pid_t pid = fork();
             if (pid < 0)
@@ -185,9 +185,9 @@ unsigned int ThreadExecutor::check()
             while (true)
             {
                 int readRes = handleRead(result);
-                if ( readRes == -1 )
+                if (readRes == -1)
                     break;
-                else if ( readRes == 0 )
+                else if (readRes == 0)
                     usleep(5000); // 5 ms
             }
 
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index f85448234..4e5ef3985 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -747,7 +747,7 @@ unsigned int CppCheck::check()
                 }
 
                 std::string appendCode = _settings.append();
-                if ( !appendCode.empty() )
+                if (!appendCode.empty())
                     Preprocessor::preprocessWhitespaces(appendCode);
 
                 checkFile(codeWithoutCfg + appendCode, _filenames[c].c_str());
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
index da435d3e0..84a8343f5 100644
--- a/test/testthreadexecutor.cpp
+++ b/test/testthreadexecutor.cpp
@@ -45,7 +45,7 @@ private:
      * Execute check using n jobs for y files which are have
      * identical data, given within data.
      */
-    void check( int jobs, int files, int result, const std::string &data)
+    void check(int jobs, int files, int result, const std::string &data)
     {
         errout.str("");
         output.str("");
@@ -56,7 +56,7 @@ private:
         }
 
         std::vector<std::string> filenames;
-        for ( int i = 1; i <= files; ++i )
+        for (int i = 1; i <= files; ++i)
         {
             std::ostringstream oss;
             oss << "file_" << i << ".cpp";
@@ -67,7 +67,7 @@ private:
         settings._jobs = jobs;
         ThreadExecutor executor(filenames, settings, *this);
         for (unsigned int i = 0; i < filenames.size(); ++i)
-            executor.addFileContent(filenames[i], data );
+            executor.addFileContent(filenames[i], data);
 
         ASSERT_EQUALS(result, executor.check());
     }
@@ -87,11 +87,11 @@ private:
         std::ostringstream oss;
         oss << "int main()\n"
             << "{\n";
-        for ( int i = 0; i < 500; i++ )
+        for (int i = 0; i < 500; i++)
             oss << "  {char *a = malloc(10);}\n";
 
         oss << "}\n";
-        check( 2, 3, 3, oss.str() );
+        check(2, 3, 3, oss.str());
     }
 
     void no_errors_more_files()
@@ -100,7 +100,7 @@ private:
         oss << "int main()\n"
             << "{\n";
         oss << "}\n";
-        check( 2, 3, 0, oss.str() );
+        check(2, 3, 0, oss.str());
     }
 
     void no_errors_less_files()
@@ -109,7 +109,7 @@ private:
         oss << "int main()\n"
             << "{\n";
         oss << "}\n";
-        check( 2, 1, 0, oss.str() );
+        check(2, 1, 0, oss.str());
     }
 
     void no_errors_equal_amount_files()
@@ -118,7 +118,7 @@ private:
         oss << "int main()\n"
             << "{\n";
         oss << "}\n";
-        check( 2, 2, 0, oss.str() );
+        check(2, 2, 0, oss.str());
     }
 
     void one_error_less_files()
@@ -128,7 +128,7 @@ private:
             << "{\n";
         oss << "  {char *a = malloc(10);}\n";
         oss << "}\n";
-        check( 2, 1, 1, oss.str() );
+        check(2, 1, 1, oss.str());
     }
 
     void one_error_several_files()
@@ -138,7 +138,7 @@ private:
             << "{\n";
         oss << "  {char *a = malloc(10);}\n";
         oss << "}\n";
-        check( 2, 20, 20, oss.str());
+        check(2, 20, 20, oss.str());
     }
 };