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

CheckBufferOverrun: increased constness of _tokenizer member

This commit is contained in:
Daniel Marjamäki 2008-11-22 19:47:10 +00:00
parent 07b5ebe72b
commit a60dad3562
4 changed files with 127 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CheckBufferOverrun.cpp
View File

@ -35,7 +35,7 @@
// CallStack used when parsing into subfunctions. // CallStack used when parsing into subfunctions.
CheckBufferOverrunClass::CheckBufferOverrunClass( Tokenizer *tokenizer, ErrorLogger *errorLogger ) CheckBufferOverrunClass::CheckBufferOverrunClass( const Tokenizer *tokenizer, ErrorLogger *errorLogger )
{ {
_tokenizer = tokenizer; _tokenizer = tokenizer;
_errorLogger = errorLogger; _errorLogger = errorLogger;

4
CheckBufferOverrun.h
View File

@ -28,7 +28,7 @@
class CheckBufferOverrunClass class CheckBufferOverrunClass
{ {
public: public:
CheckBufferOverrunClass( Tokenizer *tokenizer, ErrorLogger *errorLogger ); CheckBufferOverrunClass( const Tokenizer *tokenizer, ErrorLogger *errorLogger );
~CheckBufferOverrunClass(); ~CheckBufferOverrunClass();
// Buffer overrun.. // Buffer overrun..
@ -43,7 +43,7 @@ private:
void CheckBufferOverrun_CheckScope( const TOKEN *tok, const char *varname[], const int size, const int total_size ); void CheckBufferOverrun_CheckScope( const TOKEN *tok, const char *varname[], const int size, const int total_size );
void ReportError(const TOKEN *tok, const char errmsg[]); void ReportError(const TOKEN *tok, const char errmsg[]);
Tokenizer *_tokenizer; const Tokenizer *_tokenizer;
ErrorLogger *_errorLogger; ErrorLogger *_errorLogger;
std::list<const TOKEN *> CallStack; std::list<const TOKEN *> CallStack;
}; };

10
tokenize.cpp
View File

@ -225,12 +225,16 @@ void Tokenizer::combine_2tokens(TOKEN *tok, const char str1[], const char str2[]
int Tokenizer::SizeOfType(const char type[]) int Tokenizer::SizeOfType(const char type[]) const
{ {
if (!type) if (!type)
return 0; return 0;
return TypeSize[type]; std::map<std::string, unsigned int>::const_iterator it = TypeSize.find(type);
if ( it == TypeSize.end() )
return 0;
return it->second;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -1310,7 +1314,7 @@ const TOKEN *Tokenizer::findmatch(const TOKEN *tok, const char pattern[], const
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
std::string Tokenizer::fileLine( const TOKEN *tok ) std::string Tokenizer::fileLine( const TOKEN *tok ) const
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << "[" << Files.at(tok->FileIndex) << ":" << tok->linenr << "]"; ostr << "[" << Files.at(tok->FileIndex) << ":" << tok->linenr << "]";

4
tokenize.h
View File

@ -91,10 +91,10 @@ public:
static bool IsNumber(const char str[]); static bool IsNumber(const char str[]);
static bool IsStandardType(const char str[]); static bool IsStandardType(const char str[]);
std::string fileLine( const TOKEN *tok ); std::string fileLine( const TOKEN *tok ) const;
// Return size. // Return size.
int SizeOfType(const char type[]); int SizeOfType(const char type[]) const;
void initTokens(); void initTokens();