From 2c71b47d4e871250ddd6e1be5fdf1041581c23a8 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 27 Jun 2019 06:59:47 +0200 Subject: [PATCH] Addons scripts: Remove redundant code/characters, fix indentation. (#1926) --- addons/misra.py | 8 ++++---- addons/test/test-misra.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/misra.py b/addons/misra.py index 2750ab0c7..8c5f99d42 100755 --- a/addons/misra.py +++ b/addons/misra.py @@ -201,7 +201,7 @@ def isFunctionCall(expr): def hasExternalLinkage(var): - return var.isGlobal and not var.isStatic + return var.isGlobal and not var.isStatic def countSideEffects(expr): @@ -1719,12 +1719,12 @@ class MisraChecker: while exp[pos1] == ' ': pos1 -= 1 if exp[pos1] != '(' and exp[pos1] != '[': - self.reportError(directive, 20, 7); + self.reportError(directive, 20, 7) break while exp[pos2] == ' ': pos2 += 1 if exp[pos2] != ')' and exp[pos2] != ']': - self.reportError(directive, 20, 7); + self.reportError(directive, 20, 7) break @@ -1732,7 +1732,7 @@ class MisraChecker: for directive in data.directives: d = Define(directive) if d.expansionList.find('#') >= 0: - self.reportError(directive, 20, 10); + self.reportError(directive, 20, 10) def misra_20_13(self, data): dir_pattern = re.compile(r'#[ ]*([^ (<]*)') diff --git a/addons/test/test-misra.py b/addons/test/test-misra.py index 3efa76077..e686000c6 100644 --- a/addons/test/test-misra.py +++ b/addons/test/test-misra.py @@ -43,7 +43,7 @@ TEST_SOURCE_FILES = ['./addons/test/misra-test.c'] def setup_module(module): for f in TEST_SOURCE_FILES: p = subprocess.Popen(["./cppcheck", "--dump", "--quiet", f]) - p.communicate()[0] + p.communicate() if p.returncode != 0: raise OSError("cppcheck returns error code: %d" % p.returncode) subprocess.Popen(["sync"])