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

dos2unix

This commit is contained in:
Daniel Marjamäki 2010-04-13 19:25:08 +02:00
parent 8966888a92
commit a7903c3385
6 changed files with 1104 additions and 1104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkbufferoverrun.cpp
View File

@ -174,8 +174,8 @@ public:
} }
private: private:
TokenStrEquals& operator=(const TokenStrEquals&); // disallow assignments TokenStrEquals& operator=(const TokenStrEquals&); // disallow assignments
const std::string value; const std::string value;
}; };

6
lib/checkclass.h
View File

@ -140,9 +140,9 @@ private:
/** @brief next Var item */ /** @brief next Var item */
Var *next; Var *next;
private: private:
Var& operator=(const Var&); // disallow assignments Var& operator=(const Var&); // disallow assignments
}; };
/** /**

1662
lib/cppcheck.cpp
View File

File diff suppressed because it is too large Load Diff

388
lib/settings.h
View File

@ -1,194 +1,194 @@
/* /*
* Cppcheck - A tool for static C/C++ code analysis * Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team. * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef SETTINGS_H #ifndef SETTINGS_H
#define SETTINGS_H #define SETTINGS_H
#include <list> #include <list>
#include <string> #include <string>
#include <istream> #include <istream>
#include <map> #include <map>
#include <set> #include <set>
/// @addtogroup Core /// @addtogroup Core
/// @{ /// @{
/** /**
* @brief This is just a container for general settings so that we don't need * @brief This is just a container for general settings so that we don't need
* to pass individual values to functions or constructors now or in the * to pass individual values to functions or constructors now or in the
* future when we might have even more detailed settings. * future when we might have even more detailed settings.
*/ */
class Settings class Settings
{ {
private: private:
/** @brief classes that are automaticly deallocated */ /** @brief classes that are automaticly deallocated */
std::set<std::string> _autoDealloc; std::set<std::string> _autoDealloc;
/** @brief Code to append in the checks */ /** @brief Code to append in the checks */
std::string _append; std::string _append;
/** @brief enable extra checks by id */ /** @brief enable extra checks by id */
std::map<std::string, bool> _enabled; std::map<std::string, bool> _enabled;
/** @brief terminate checking */ /** @brief terminate checking */
bool _terminate; bool _terminate;
Settings(bool all); Settings(bool all);
public: public:
Settings(); Settings();
Settings(const Settings &s); Settings(const Settings &s);
const Settings &operator=(const Settings &s); const Settings &operator=(const Settings &s);
virtual ~Settings(); virtual ~Settings();
/** @brief Return test settings where inconclusive is true */ /** @brief Return test settings where inconclusive is true */
static Settings testSettings() static Settings testSettings()
{ {
return Settings(true); return Settings(true);
} }
/** @brief Is --debug given? */ /** @brief Is --debug given? */
bool _debug; bool _debug;
/** @brief Inconclusive checks - for debugging of Cppcheck */ /** @brief Inconclusive checks - for debugging of Cppcheck */
const bool inconclusive; const bool inconclusive;
/** @brief Is --style given? */ /** @brief Is --style given? */
bool _checkCodingStyle; bool _checkCodingStyle;
/** @brief Is --quiet given? */ /** @brief Is --quiet given? */
bool _errorsOnly; bool _errorsOnly;
/** @brief Is --inline-suppr given? */ /** @brief Is --inline-suppr given? */
bool _inlineSuppressions; bool _inlineSuppressions;
/** @brief Is --verbose given? */ /** @brief Is --verbose given? */
bool _verbose; bool _verbose;
/** @brief Request termination of checking */ /** @brief Request termination of checking */
void terminate() void terminate()
{ {
_terminate = true; _terminate = true;
} }
/** @brief termination requested? */ /** @brief termination requested? */
bool terminated() const bool terminated() const
{ {
return _terminate; return _terminate;
} }
/** @brief Force checking the files with "too many" configurations (--force). */ /** @brief Force checking the files with "too many" configurations (--force). */
bool _force; bool _force;
/** @brief write xml results (--xml) */ /** @brief write xml results (--xml) */
bool _xml; bool _xml;
/** @brief How many processes/threads should do checking at the same /** @brief How many processes/threads should do checking at the same
time. Default is 1. (-j N) */ time. Default is 1. (-j N) */
unsigned int _jobs; unsigned int _jobs;
/** @brief If errors are found, this value is returned from main(). /** @brief If errors are found, this value is returned from main().
Default value is 0. */ Default value is 0. */
int _exitCode; int _exitCode;
/** @brief The output format in which the errors are printed in text mode, /** @brief The output format in which the errors are printed in text mode,
e.g. "{severity} {file}:{line} {message} {id}" */ e.g. "{severity} {file}:{line} {message} {id}" */
std::string _outputFormat; std::string _outputFormat;
/** @brief show timing information (--showtime=file|summary|top5) */ /** @brief show timing information (--showtime=file|summary|top5) */
unsigned int _showtime; unsigned int _showtime;
/** @brief List of include paths, e.g. "my/includes/" which should be used /** @brief List of include paths, e.g. "my/includes/" which should be used
for finding include files inside source files. (-I) */ for finding include files inside source files. (-I) */
std::list<std::string> _includePaths; std::list<std::string> _includePaths;
/** @brief Fill list of automaticly deallocated classes (--auto-dealloc) */ /** @brief Fill list of automaticly deallocated classes (--auto-dealloc) */
void autoDealloc(std::istream &istr); void autoDealloc(std::istream &istr);
/** @brief Add class to list of automatically deallocated classes */ /** @brief Add class to list of automatically deallocated classes */
void addAutoAllocClass(const std::string &name); void addAutoAllocClass(const std::string &name);
/** @brief is a class automaticly deallocated? */ /** @brief is a class automaticly deallocated? */
bool isAutoDealloc(const std::string &classname) const; bool isAutoDealloc(const std::string &classname) const;
/** @brief assign append code (--append) */ /** @brief assign append code (--append) */
void append(const std::string &filename); void append(const std::string &filename);
/** @brief get append code (--append) */ /** @brief get append code (--append) */
std::string append() const; std::string append() const;
/** /**
* @brief Returns true if given id is in the list of * @brief Returns true if given id is in the list of
* enabled extra checks (--enable) * enabled extra checks (--enable)
* @param str id for the extra check, e.g. "style" * @param str id for the extra check, e.g. "style"
* @return true if the check is enabled. * @return true if the check is enabled.
*/ */
bool isEnabled(const std::string &str) const; bool isEnabled(const std::string &str) const;
/** /**
* @brief Enable extra checks by id. See isEnabled() * @brief Enable extra checks by id. See isEnabled()
* @param str single id or list of id values to be enabled * @param str single id or list of id values to be enabled
* or empty string to enable all. e.g. "style,possibleError" * or empty string to enable all. e.g. "style,possibleError"
*/ */
void addEnabled(const std::string &str); void addEnabled(const std::string &str);
/** @brief class for handling suppressions */ /** @brief class for handling suppressions */
class Suppressions class Suppressions
{ {
private: private:
/** @brief List of error which the user doesn't want to see. */ /** @brief List of error which the user doesn't want to see. */
std::map<std::string, std::map<std::string, std::list<int> > > _suppressions; std::map<std::string, std::map<std::string, std::list<int> > > _suppressions;
public: public:
/** /**
* @brief Don't show errors listed in the file. * @brief Don't show errors listed in the file.
* @param istr Open file stream where errors can be read. * @param istr Open file stream where errors can be read.
* @return true on success, false in syntax error is noticed. * @return true on success, false in syntax error is noticed.
*/ */
bool parseFile(std::istream &istr); bool parseFile(std::istream &istr);
/** /**
* @brief Don't show this error. If file and/or line are optional. In which case * @brief Don't show this error. If file and/or line are optional. In which case
* the errorId alone is used for filtering. * the errorId alone is used for filtering.
* @param errorId the id for the error, e.g. "arrayIndexOutOfBounds" * @param errorId the id for the error, e.g. "arrayIndexOutOfBounds"
* @param file File name with the path, e.g. "src/main.cpp" * @param file File name with the path, e.g. "src/main.cpp"
* @param line number, e.g. "123" * @param line number, e.g. "123"
*/ */
void addSuppression(const std::string &errorId, const std::string &file = "", unsigned int line = 0); void addSuppression(const std::string &errorId, const std::string &file = "", unsigned int line = 0);
/** /**
* @brief Returns true if this message should not be shown to the user. * @brief Returns true if this message should not be shown to the user.
* @param errorId the id for the error, e.g. "arrayIndexOutOfBounds" * @param errorId the id for the error, e.g. "arrayIndexOutOfBounds"
* @param file File name with the path, e.g. "src/main.cpp" * @param file File name with the path, e.g. "src/main.cpp"
* @param line number, e.g. "123" * @param line number, e.g. "123"
* @return true if this error is suppressed. * @return true if this error is suppressed.
*/ */
bool isSuppressed(const std::string &errorId, const std::string &file, unsigned int line); bool isSuppressed(const std::string &errorId, const std::string &file, unsigned int line);
}; };
/** @brief suppress message (--suppressions) */ /** @brief suppress message (--suppressions) */
Suppressions nomsg; Suppressions nomsg;
/** @brief suppress exitcode */ /** @brief suppress exitcode */
Suppressions nofail; Suppressions nofail;
}; };
/// @} /// @}
#endif // SETTINGS_H #endif // SETTINGS_H

8
lib/tokenize.cpp
View File

@ -18,10 +18,10 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable: 4503) #pragma warning(disable: 4503)
#endif #endif
#include "tokenize.h" #include "tokenize.h"
#include "token.h" #include "token.h"
#include "filelister.h" #include "filelister.h"

140
test/testcppcheck.cpp
View File

@ -80,13 +80,13 @@ private:
} }
{ {
const char *argv[] = {"cppcheck", "-h"}; const char *argv[] = {"cppcheck", "-h"};
ASSERT_EQUALS(true, argCheck(2, argv)); ASSERT_EQUALS(true, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS(true, output.str().find("Example usage") != std::string::npos); ASSERT_EQUALS(true, output.str().find("Example usage") != std::string::npos);
} }
{ {
const char *argv[] = {"cppcheck"}; const char *argv[] = {"cppcheck"};
ASSERT_EQUALS(true, argCheck(1, argv)); ASSERT_EQUALS(true, argCheck(1, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
@ -124,69 +124,69 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: No file specified for the --suppressions option\n", output.str()); ASSERT_EQUALS("cppcheck: No file specified for the --suppressions option\n", output.str());
} }
{ {
const char *argv[] = {"cppcheck", "--exitcode-suppressions"}; const char *argv[] = {"cppcheck", "--exitcode-suppressions"};
ASSERT_EQUALS(false, argCheck(2, argv)); ASSERT_EQUALS(false, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: No file specified for the --exitcode-suppressions option\n", output.str()); ASSERT_EQUALS("cppcheck: No file specified for the --exitcode-suppressions option\n", output.str());
} }
{ {
const char *argv[] = {"cppcheck", "--enable"}; const char *argv[] = {"cppcheck", "--enable"};
ASSERT_EQUALS(false, argCheck(2, argv)); ASSERT_EQUALS(false, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--enable\"\n", output.str()); ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--enable\"\n", output.str());
} }
{ {
const char *argv[] = {"cppcheck", "--append"}; const char *argv[] = {"cppcheck", "--append"};
ASSERT_EQUALS(false, argCheck(2, argv)); ASSERT_EQUALS(false, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--append\"\n", output.str()); ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--append\"\n", output.str());
} }
{ {
const char *argv[] = {"cppcheck", "--error-exitcode"}; const char *argv[] = {"cppcheck", "--error-exitcode"};
ASSERT_EQUALS(false, argCheck(2, argv)); ASSERT_EQUALS(false, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--error-exitcode\"\n", output.str()); ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--error-exitcode\"\n", output.str());
} }
{ {
const char *argv[] = {"cppcheck", "--file-list"}; const char *argv[] = {"cppcheck", "--file-list"};
ASSERT_EQUALS(false, argCheck(2, argv)); ASSERT_EQUALS(false, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--file-list\"\n", output.str()); ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--file-list\"\n", output.str());
} }
{ {
const char *argv[] = {"cppcheck", "--showtime"}; const char *argv[] = {"cppcheck", "--showtime"};
ASSERT_EQUALS(false, argCheck(2, argv)); ASSERT_EQUALS(false, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--showtime\"\n", output.str()); ASSERT_EQUALS("cppcheck: error: unrecognized command line option \"--showtime\"\n", output.str());
} }
{ {
const char *argv[] = {"cppcheck", "-I"}; const char *argv[] = {"cppcheck", "-I"};
ASSERT_EQUALS(false, argCheck(2, argv)); ASSERT_EQUALS(false, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: argument to '-I' is missing\n", output.str()); ASSERT_EQUALS("cppcheck: argument to '-I' is missing\n", output.str());
} }
{ {
const char *argv[] = {"cppcheck", "-j"}; const char *argv[] = {"cppcheck", "-j"};
ASSERT_EQUALS(false, argCheck(2, argv)); ASSERT_EQUALS(false, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: argument to '-j' is missing\n", output.str()); ASSERT_EQUALS("cppcheck: argument to '-j' is missing\n", output.str());
} }
{ {
const char *argv[] = {"cppcheck", "--template"}; const char *argv[] = {"cppcheck", "--template"};
ASSERT_EQUALS(false, argCheck(2, argv)); ASSERT_EQUALS(false, argCheck(2, argv));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("cppcheck: argument to '--template' is missing\n", output.str()); ASSERT_EQUALS("cppcheck: argument to '--template' is missing\n", output.str());
} }
} }
void linenumbers() void linenumbers()