From d5d6d7fbb8bf5b85bb3a8c1a48683c4b04898740 Mon Sep 17 00:00:00 2001 From: Martin Ettl Date: Fri, 29 May 2015 20:20:05 +0200 Subject: [PATCH] Running astyle, no functional changes. --- lib/checkbufferoverrun.cpp | 2 +- lib/checkstring.cpp | 4 ++-- test/testgarbage.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp index ffb0a8e57..f37fcd5a3 100644 --- a/lib/checkbufferoverrun.cpp +++ b/lib/checkbufferoverrun.cpp @@ -1721,7 +1721,7 @@ void CheckBufferOverrun::arrayIndexThenCheck() if (tok->type() == Token::eComparisonOp) tok = tok->tokAt(2); - if (!tok) + if (!tok) break; // skip close parentheses if (tok->str() == ")") diff --git a/lib/checkstring.cpp b/lib/checkstring.cpp index 3348c5e5e..994138efc 100644 --- a/lib/checkstring.cpp +++ b/lib/checkstring.cpp @@ -98,8 +98,8 @@ void CheckString::checkAlwaysTrueOrFalseStringCompare() alwaysTrueFalseStringCompareError(tok, str1, str2); tok = tok->tokAt(5); } - if (!tok) - break; + if (!tok) + break; } } diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp index 11026ad13..23750ec75 100644 --- a/test/testgarbage.cpp +++ b/test/testgarbage.cpp @@ -90,8 +90,8 @@ private: TEST_CASE(garbageCode49); // #6715 TEST_CASE(garbageCode50); // #6718 TEST_CASE(garbageCode51); // #6719 - TEST_CASE(garbageCode52); // #6720 - TEST_CASE(garbageCode53); // #6721 + TEST_CASE(garbageCode52); // #6720 + TEST_CASE(garbageCode53); // #6721 TEST_CASE(garbageValueFlow); TEST_CASE(garbageSymbolDatabase); @@ -517,11 +517,11 @@ private: checkCode(" (const \"C\" ...); struct base { int f2; base (int arg1, int arg2); }; global_base(0x55, 0xff); { ((global_base.f1 0x55) (global_base.f2 0xff)) { } } base::base(int arg1, int arg2) { f2 = }"); } - void garbageCode52() { // #6720 + void garbageCode52() { // #6720 checkCode("a \"b\" not_eq \"c\""); } - void garbageCode53() { // #6721 + void garbageCode53() { // #6721 checkCode("{ { } }; void foo (struct int i) { x->b[i] = = }"); }