From d9a2f542be6859b6f6ec670caab2d1211e6b7cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Mon, 29 Jul 2013 12:01:52 +0200 Subject: [PATCH] CheckOther: removed redundant conditions. No need to check if varid is > 0 and if there is variable info. --- lib/checkother.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/checkother.cpp b/lib/checkother.cpp index 4a8adcd23..ff49aeea3 100644 --- a/lib/checkother.cpp +++ b/lib/checkother.cpp @@ -63,19 +63,15 @@ void CheckOther::checkCastIntToCharAndBack() } } else if (Token::Match(tok, "EOF %comp% ( %var% = fclose|fflush|fputc|fputs|fscanf|getchar|getc|fgetc|putchar|putc|puts|scanf|sscanf|ungetc (")) { tok = tok->tokAt(3); - if (tok && tok->varId()) { - const Variable *var = tok->variable(); - if (var && var->typeEndToken()->str() == "char" && !var->typeEndToken()->isSigned()) { - checkCastIntToCharAndBackError(tok, tok->strAt(2)); - } + const Variable *var = tok->variable(); + if (var && var->typeEndToken()->str() == "char" && !var->typeEndToken()->isSigned()) { + checkCastIntToCharAndBackError(tok, tok->strAt(2)); } } else if (Token::Match(tok, "EOF %comp% ( %var% = std :: cin . get (") || Token::Match(tok, "EOF %comp% ( %var% = cin . get (")) { tok = tok->tokAt(3); - if (tok && tok->varId()) { - const Variable *var = tok->variable(); - if (var && var->typeEndToken()->str() == "char" && !var->typeEndToken()->isSigned()) { - checkCastIntToCharAndBackError(tok, "cin.get"); - } + const Variable *var = tok->variable(); + if (var && var->typeEndToken()->str() == "char" && !var->typeEndToken()->isSigned()) { + checkCastIntToCharAndBackError(tok, "cin.get"); } } else if (Token::Match(tok, "%var% = std :: cin . get (") || Token::Match(tok, "%var% = cin . get (")) { const Variable *var = tok->variable();