From 91e89380c24b628431aedf84ebb257a3c12eb05e Mon Sep 17 00:00:00 2001
From: Reijo Tomperi <aggro80@users.sourceforge.net>
Date: Sun, 20 Nov 2011 23:43:55 +0200
Subject: [PATCH] astyle fix

---
 lib/cppcheck.cpp   | 7 +++----
 lib/token.cpp      | 2 +-
 test/testtoken.cpp | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 8feebe7f5..1f20e5a94 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -253,16 +253,15 @@ unsigned int CppCheck::processFile()
     } catch (ErrorLogger::ErrorMessage &err) {
         // Catch exception from Token class
         const std::string fixedpath = Path::toNativeSeparators(_filename);
-        if( err._callStack.empty() ){
+        if (err._callStack.empty()) {
             ErrorLogger::ErrorMessage::FileLocation loc;
             loc.setfile(fixedpath);
             err._callStack.push_back(loc);
-        }
-        else{
+        } else {
             err._callStack.begin()->setfile(fixedpath);
         }
 
-        _errorLogger.reportErr(err );
+        _errorLogger.reportErr(err);
     }
 
     if (!_settings._errorsOnly)
diff --git a/lib/token.cpp b/lib/token.cpp
index 7f660f42b..6b897ecdf 100644
--- a/lib/token.cpp
+++ b/lib/token.cpp
@@ -542,7 +542,7 @@ bool Token::Match(const Token *tok, const char pattern[], unsigned int varid)
                                                                "Internal error. Token::Match called with varid 0.",
                                                                "cppcheckError",
                                                                false);
-                       throw errmsg;
+                        throw errmsg;
                     }
 
                     if (tok->varId() != varid)
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
index cbfe840fe..ad24495f4 100644
--- a/test/testtoken.cpp
+++ b/test/testtoken.cpp
@@ -279,7 +279,7 @@ private:
         givenACodeSampleToTokenize var("int a ; int b ;");
 
         // Varid == 0 should throw exception
-        ASSERT_THROW(Token::Match(var.tokens(), "%type% %varid% ; %type% %var%", 0),ErrorLogger::ErrorMessage );
+        ASSERT_THROW(Token::Match(var.tokens(), "%type% %varid% ; %type% %var%", 0),ErrorLogger::ErrorMessage);
 
         ASSERT_EQUALS(true, Token::Match(var.tokens(), "%type% %varid% ; %type% %var%", 1));
         ASSERT_EQUALS(true, Token::Match(var.tokens(), "%type% %var% ; %type% %varid%", 2));