From ffac9281c43bb72305fc2a15c9eb95c538f633d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <hyd_danmar@users.sourceforge.net>
Date: Sat, 18 Jul 2009 20:35:22 +0200
Subject: [PATCH] astyle formatting

---
 src/checkother.cpp    | 58 +++++++++++++++++++++++++++++--------------
 test/testmemleak.cpp  |  3 ++-
 test/testtokenize.cpp |  8 +++---
 3 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/src/checkother.cpp b/src/checkother.cpp
index 90fc9cafb..8772d9730 100644
--- a/src/checkother.cpp
+++ b/src/checkother.cpp
@@ -94,28 +94,35 @@ void CheckOther::warningRedundantCode()
          *
          **/
 
-        if (Token::simpleMatch(tok2, "0 !=")) {
+        if (Token::simpleMatch(tok2, "0 !="))
+        {
             tok2 = tok2->tokAt(2);
         }
 
         if (Token::simpleMatch(tok2, "this .") ||
-            Token::Match(tok2, "%var% ::")) {
+            Token::Match(tok2, "%var% ::"))
+        {
             tok2 = tok2->tokAt(2);
         }
 
-        if (Token::Match(tok2, "%var%")) {
+        if (Token::Match(tok2, "%var%"))
+        {
             varname = tok2->strAt(0);
             tok2 = tok2->next();
         }
 
-        if (Token::simpleMatch(tok2, "!= 0")) {
+        if (Token::simpleMatch(tok2, "!= 0"))
+        {
             tok2 = tok2->tokAt(2);
         }
 
-        if (tok2->str() == ")") {
+        if (tok2->str() == ")")
+        {
             tok2 = tok2->next();
 
-        } else {
+        }
+        else
+        {
             varname = NULL;
         }
 
@@ -147,45 +154,60 @@ void CheckOther::warningRedundantCode()
          *
          **/
 
-        if (Token::Match(tok2, "free|kfree (")) {
+        if (Token::Match(tok2, "free|kfree ("))
+        {
             tok2 = tok2->tokAt(2);
             funcHasBracket = true;
 
-        } else if (tok2->str() == "delete") {
+        }
+        else if (tok2->str() == "delete")
+        {
 
             tok2 = tok2->next();
 
-            if (Token::simpleMatch(tok2, "[ ]")) {
+            if (Token::simpleMatch(tok2, "[ ]"))
+            {
                 tok2 = tok2->tokAt(2);
             }
         }
 
         if (Token::simpleMatch(tok2, "this .") ||
-            Token::Match(tok2, "%var% ::")) {
+            Token::Match(tok2, "%var% ::"))
+        {
             tok2 = tok2->tokAt(2);
         }
 
-        if (Token::Match(tok2, "%var%") && (strcmp(tok2->strAt(0), varname) == 0)) {
+        if (Token::Match(tok2, "%var%") && (strcmp(tok2->strAt(0), varname) == 0))
+        {
             tok2 = tok2->next();
             err = true;
         }
 
-        if (funcHasBracket) {
-            if (tok2->str() != ")") {
+        if (funcHasBracket)
+        {
+            if (tok2->str() != ")")
+            {
                 err = false;
-            } else {
+            }
+            else
+            {
                 tok2 = tok2->next();
             }
         }
 
-        if (tok2->str() != ";") {
+        if (tok2->str() != ";")
+        {
             err = false;
-        } else {
+        }
+        else
+        {
             tok2 = tok2->next();
         }
 
-        if (ifHasBracket) {
-            if (tok2->str() != "}") {
+        if (ifHasBracket)
+        {
+            if (tok2->str() != "}")
+            {
                 err = false;
             }
         }
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index c972c1f7c..dd65a507d 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -2405,7 +2405,8 @@ private:
         ASSERT_EQUALS("[test.cpp:22]: (error) Resource leak: f\n", errout.str());
     }
 
-    void getc_function() {
+    void getc_function()
+    {
         {
             check("void f()\n"
                   "{"
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 2b96fb9cb..a95ce7ab6 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -1347,10 +1347,10 @@ private:
     {
         const std::string code("void f()\n"
                                "{\n"
-                                "    std::vector<int> b;\n"
-                                "    std::vector<int> &a = b;\n"
-                                "    std::vector<int> *c = &b;\n"
-                                "}\n");
+                               "    std::vector<int> b;\n"
+                               "    std::vector<int> &a = b;\n"
+                               "    std::vector<int> *c = &b;\n"
+                               "}\n");
 
         // tokenize..
         Tokenizer tokenizer;