walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #35 from simartin/ticket_3059 

Ticket 3059: Report the correct line number in unused functions warnings
This commit is contained in:
Daniel Marjamäki 2011-09-18 08:15:28 -07:00
parent 66eb37c135 b493e4bf7b
commit 96a04eee9c
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/checkunusedfunctions.cpp
View File

@ -74,7 +74,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer)
! Token::simpleMatch(tok2, ") const {") && ! Token::simpleMatch(tok2, ") const {") &&
! Token::simpleMatch(tok2, ") const throw ( ) {") && ! Token::simpleMatch(tok2, ") const throw ( ) {") &&
! Token::simpleMatch(tok2, ") throw ( ) {")) ! Token::simpleMatch(tok2, ") throw ( ) {"))
funcname = NULL; funcname = 0;
break; break;
} }
} }
@ -83,10 +83,14 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer)
{ {
FunctionUsage &func = _functions[ funcname->str()]; FunctionUsage &func = _functions[ funcname->str()];
if(!func.lineNumber)
func.lineNumber = funcname->linenr();
// No filename set yet.. // No filename set yet..
if (func.filename.empty()) if (func.filename.empty())
{
func.filename = tokenizer.getFiles()->at(0); func.filename = tokenizer.getFiles()->at(0);
}
// Multiple files => filename = "+" // Multiple files => filename = "+"
else if (func.filename != tokenizer.getFiles()->at(0)) else if (func.filename != tokenizer.getFiles()->at(0))
{ {
@ -141,7 +145,6 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer)
if (func.filename.empty() || func.filename == "+") if (func.filename.empty() || func.filename == "+")
func.usedOtherFile = true; func.usedOtherFile = true;
else else
func.usedSameFile = true; func.usedSameFile = true;
} }
@ -167,7 +170,7 @@ void CheckUnusedFunctions::check(ErrorLogger * const errorLogger)
filename = ""; filename = "";
else else
filename = func.filename; filename = func.filename;
unusedFunctionError(errorLogger, filename, it->first); unusedFunctionError(errorLogger, filename, func.lineNumber, it->first);
} }
else if (! func.usedOtherFile) else if (! func.usedOtherFile)
{ {
@ -181,14 +184,16 @@ void CheckUnusedFunctions::check(ErrorLogger * const errorLogger)
} }
} }
void CheckUnusedFunctions::unusedFunctionError(ErrorLogger * const errorLogger, const std::string &filename, const std::string &funcname) void CheckUnusedFunctions::unusedFunctionError(ErrorLogger * const errorLogger,
const std::string &filename, unsigned int lineNumber,
const std::string &funcname)
{ {
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList; std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
if (!filename.empty()) if (!filename.empty())
{ {
ErrorLogger::ErrorMessage::FileLocation fileLoc; ErrorLogger::ErrorMessage::FileLocation fileLoc;
fileLoc.setfile(filename); fileLoc.setfile(filename);
fileLoc.line = 1; fileLoc.line = lineNumber;
locationList.push_back(fileLoc); locationList.push_back(fileLoc);
} }

9
lib/checkunusedfunctions.h
View File

@ -53,13 +53,15 @@ private:
void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings)
{ {
CheckUnusedFunctions c(0, settings, errorLogger); CheckUnusedFunctions c(0, settings, errorLogger);
c.unusedFunctionError(errorLogger, "", "funcName"); c.unusedFunctionError(errorLogger, "", 0, "funcName");
} }
/** /**
* Dummy implementation, just to provide error for --errorlist * Dummy implementation, just to provide error for --errorlist
*/ */
void unusedFunctionError(ErrorLogger * const errorLogger, const std::string &filename, const std::string &funcname); void unusedFunctionError(ErrorLogger * const errorLogger,
const std::string &filename, unsigned int lineNumber,
const std::string &funcname);
/** /**
* Dummy implementation, just to provide error for --errorlist * Dummy implementation, just to provide error for --errorlist
@ -82,10 +84,11 @@ private:
class FunctionUsage class FunctionUsage
{ {
public: public:
FunctionUsage() : usedSameFile(false), usedOtherFile(false) FunctionUsage() : lineNumber(0), usedSameFile(false), usedOtherFile(false)
{ } { }
std::string filename; std::string filename;
unsigned int lineNumber;
bool usedSameFile; bool usedSameFile;
bool usedOtherFile; bool usedOtherFile;
}; };

11
test/testunusedfunctions.cpp
View File

@ -47,6 +47,8 @@ private:
TEST_CASE(initializationIsNotAFunction); TEST_CASE(initializationIsNotAFunction);
TEST_CASE(multipleFiles); // same function name in multiple files TEST_CASE(multipleFiles); // same function name in multiple files
TEST_CASE(lineNumber); // Ticket 3059
} }
void check(const char code[]) void check(const char code[])
@ -216,6 +218,15 @@ private:
ASSERT_EQUALS("[test1.cpp:1]: (style) The function 'f' is never used\n",errout.str()); ASSERT_EQUALS("[test1.cpp:1]: (style) The function 'f' is never used\n",errout.str());
} }
void lineNumber()
{
check("void foo() {}\n"
"void bar() {}\n"
"int main()\n");
ASSERT_EQUALS("[test.cpp:2]: (style) The function 'bar' is never used\n"
"[test.cpp:1]: (style) The function 'foo' is never used\n", errout.str());
}
}; };
REGISTER_TEST(TestUnusedFunctions) REGISTER_TEST(TestUnusedFunctions)