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

Fixed #830 (id 'pushback' used twice)

This commit is contained in:
Daniel 2009-10-21 20:15:11 +02:00
parent bae5b565dd
commit eeb281daf6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/checkstl.cpp
View File

@ -372,7 +372,7 @@ void CheckStl::pushback()
} }
if (pushback) if (pushback)
pushbackError(pushback, pushback->str(), tok2->strAt(0)); invalidIteratorError(pushback, pushback->str(), tok2->strAt(0));
} }
// Assigning iterator.. // Assigning iterator..
@ -393,9 +393,9 @@ void CheckStl::pushback()
if (!invalidIterator.empty()) if (!invalidIterator.empty())
{ {
if (Token::Match(tok2, "++|--|*|+|-|(|,|=|!= %varid%", iteratorid)) if (Token::Match(tok2, "++|--|*|+|-|(|,|=|!= %varid%", iteratorid))
pushbackError(tok2, invalidIterator, tok2->strAt(1)); invalidIteratorError(tok2, invalidIterator, tok2->strAt(1));
if (Token::Match(tok2, "%varid% ++|--|+|-", iteratorid)) if (Token::Match(tok2, "%varid% ++|--|+|-", iteratorid))
pushbackError(tok2, invalidIterator, tok2->str()); invalidIteratorError(tok2, invalidIterator, tok2->str());
} }
} }
} }
@ -405,16 +405,16 @@ void CheckStl::pushback()
// Error message for bad iterator usage.. // Error message for bad iterator usage..
void CheckStl::pushbackError(const Token *tok, const std::string &func, const std::string &iterator_name) void CheckStl::invalidIteratorError(const Token *tok, const std::string &func, const std::string &iterator_name)
{ {
reportError(tok, Severity::error, "pushback", "After " + func + ", the iterator '" + iterator_name + "' may be invalid"); reportError(tok, Severity::error, "invalidIterator", "After " + func + ", the iterator '" + iterator_name + "' may be invalid");
} }
// Error message for bad iterator usage.. // Error message for bad iterator usage..
void CheckStl::invalidPointerError(const Token *tok, const std::string &pointer_name) void CheckStl::invalidPointerError(const Token *tok, const std::string &pointer_name)
{ {
reportError(tok, Severity::error, "pushback", "Invalid pointer '" + pointer_name + "' after push_back / push_front"); reportError(tok, Severity::error, "invalidPointer", "Invalid pointer '" + pointer_name + "' after push_back / push_front");
} }

4
src/checkstl.h
View File

@ -105,7 +105,7 @@ private:
void iteratorsError(const Token *tok, const std::string &container1, const std::string &container2); void iteratorsError(const Token *tok, const std::string &container1, const std::string &container2);
void mismatchingContainersError(const Token *tok); void mismatchingContainersError(const Token *tok);
void eraseError(const Token *tok); void eraseError(const Token *tok);
void pushbackError(const Token *tok, const std::string &func, const std::string &iterator_name); void invalidIteratorError(const Token *tok, const std::string &func, const std::string &iterator_name);
void invalidPointerError(const Token *tok, const std::string &pointer_name); void invalidPointerError(const Token *tok, const std::string &pointer_name);
void stlBoundriesError(const Token *tok, const std::string &container_name); void stlBoundriesError(const Token *tok, const std::string &container_name);
@ -116,7 +116,7 @@ private:
dereferenceErasedError(0, "iter"); dereferenceErasedError(0, "iter");
stlOutOfBoundsError(0, "i", "foo"); stlOutOfBoundsError(0, "i", "foo");
eraseError(0); eraseError(0);
pushbackError(0, "push_back|push_front|insert", "iterator"); invalidIteratorError(0, "push_back|push_front|insert", "iterator");
invalidPointerError(0, "pointer"); invalidPointerError(0, "pointer");
stlBoundriesError(0, "container"); stlBoundriesError(0, "container");
} }