Skip to content

Commit 639f1fa

Browse files
committed
Fixed another variable shadowing warning.
1 parent b5cf567 commit 639f1fa

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

lib/checkvaarg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void CheckVaarg::va_list_usage()
8686
bool exitOnEndOfStatement = false;
8787

8888
const Token* tok = var->nameToken()->next();
89-
for (const Token* tok = var->nameToken()->next(); tok != var->scope()->classEnd; tok = tok->next()) {
89+
for (; tok != var->scope()->classEnd; tok = tok->next()) {
9090
if (Token::Match(tok, "va_start ( %varid% ,", var->declarationId())) {
9191
if (open)
9292
va_start_subsequentCallsError(tok, var->name());

test/testvaarg.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ class TestVaarg : public TestFixture {
104104
" va_list arg_ptr;\n"
105105
" va_start(arg_ptr, szBuffer);\n"
106106
"}");
107-
ASSERT_EQUALS("[test.cpp:2]: (error) va_list 'arg_ptr' was opened but not closed by va_end().\n", errout.str());
107+
ASSERT_EQUALS("[test.cpp:4]: (error) va_list 'arg_ptr' was opened but not closed by va_end().\n", errout.str());
108108

109109
check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
110110
" va_list arg_ptr;\n"
111111
" va_start(arg_ptr, szBuffer);\n"
112112
" if(sth) return;\n"
113113
" va_end(arg_ptr);\n"
114114
"}");
115-
ASSERT_EQUALS("[test.cpp:2]: (error) va_list 'arg_ptr' was opened but not closed by va_end().\n", errout.str());
115+
ASSERT_EQUALS("[test.cpp:4]: (error) va_list 'arg_ptr' was opened but not closed by va_end().\n", errout.str());
116116
}
117117

118118
void va_list_usedBeforeStarted() {

0 commit comments

Comments
 (0)