cppcheck-opensource · danmar · Aug 7, 2021 · Aug 6, 2021 · Aug 6, 2021 · Aug 6, 2021
diff --git a/.uncrustify.cfg b/.uncrustify.cfg
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -81,8 +81,7 @@
 
 CppCheckExecutor::CppCheckExecutor()
     : mSettings(nullptr), mLatestProgressOutputTime(0), mErrorOutput(nullptr), mBugHuntingReport(nullptr), mShowAllErrors(false)
-{
-}
+{}
 
 CppCheckExecutor::~CppCheckExecutor()
 {
@@ -125,7 +124,7 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
     {
         for (std::list<std::string>::iterator iter = settings.includePaths.begin();
              iter != settings.includePaths.end();
-            ) {
+             ) {
             const std::string path(Path::toNativeSeparators(*iter));
             if (FileLister::isDirectory(path))
                 ++iter;
@@ -250,7 +249,7 @@ void CppCheckExecutor::setSettings(const Settings &settings)
  * \return size of array
  * */
 template<typename T, int size>
-std::size_t getArrayLength(const T(&)[size])
+std::size_t getArrayLength(const T (&)[size])
 {
     return size;
 }
@@ -548,7 +547,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
                 (type==0) ? "reading " : "writing ",
                 (unsigned long)info->si_addr,
                 (isAddressOnStack)?" Stackoverflow?":""
-               );
+                );
         break;
     case SIGUSR1:
         fputs("cppcheck received signal ", output);
@@ -589,15 +588,15 @@ namespace {
     };
     typedef BOOL (WINAPI *fpStackWalk64)(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, PREAD_PROCESS_MEMORY_ROUTINE64, PFUNCTION_TABLE_ACCESS_ROUTINE64, PGET_MODULE_BASE_ROUTINE64, PTRANSLATE_ADDRESS_ROUTINE64);
     fpStackWalk64 pStackWalk64;
-    typedef DWORD64(WINAPI *fpSymGetModuleBase64)(HANDLE, DWORD64);
+    typedef DWORD64 (WINAPI *fpSymGetModuleBase64)(HANDLE, DWORD64);
     fpSymGetModuleBase64 pSymGetModuleBase64;
     typedef BOOL (WINAPI *fpSymGetSymFromAddr64)(HANDLE, DWORD64, PDWORD64, PIMAGEHLP_SYMBOL64);
     fpSymGetSymFromAddr64 pSymGetSymFromAddr64;
     typedef BOOL (WINAPI *fpSymGetLineFromAddr64)(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINE64);
     fpSymGetLineFromAddr64 pSymGetLineFromAddr64;
-    typedef DWORD (WINAPI *fpUnDecorateSymbolName)(const TCHAR*, PTSTR, DWORD, DWORD) ;
+    typedef DWORD (WINAPI *fpUnDecorateSymbolName)(const TCHAR*, PTSTR, DWORD, DWORD);
     fpUnDecorateSymbolName pUnDecorateSymbolName;
-    typedef PVOID(WINAPI *fpSymFunctionTableAccess64)(HANDLE, DWORD64);
+    typedef PVOID (WINAPI *fpSymFunctionTableAccess64)(HANDLE, DWORD64);
     fpSymFunctionTableAccess64 pSymFunctionTableAccess64;
     typedef BOOL (WINAPI *fpSymInitialize)(HANDLE, PCSTR, BOOL);
     fpSymInitialize pSymInitialize;
@@ -630,9 +629,9 @@ namespace {
             hProcess,
             nullptr,
             TRUE
-        );
-        CONTEXT             context = *(ex->ContextRecord);
-        STACKFRAME64        stack= {0};
+            );
+        CONTEXT context = *(ex->ContextRecord);
+        STACKFRAME64 stack= {0};
 #ifdef _M_IX86
         stack.AddrPC.Offset    = context.Eip;
         stack.AddrPC.Mode      = AddrModeFlat;
@@ -657,18 +656,18 @@ namespace {
             BOOL result = pStackWalk64
                           (
 #ifdef _M_IX86
-                              IMAGE_FILE_MACHINE_I386,
+                IMAGE_FILE_MACHINE_I386,
 #else
-                              IMAGE_FILE_MACHINE_AMD64,
+                IMAGE_FILE_MACHINE_AMD64,
 #endif
-                              hProcess,
-                              hThread,
-                              &stack,
-                              &context,
-                              nullptr,
-                              pSymFunctionTableAccess64,
-                              pSymGetModuleBase64,
-                              nullptr
+                hProcess,
+                hThread,
+                &stack,
+                &context,
+                nullptr,
+                pSymFunctionTableAccess64,
+                pSymGetModuleBase64,
+                nullptr
                           );
             if (!result)  // official end...
                 break;

diff --git a/cli/cppcheckexecutor.h b/cli/cppcheckexecutor.h
@@ -99,14 +99,14 @@ class CppCheckExecutor : public ErrorLogger {
      */
     static void setExceptionOutput(FILE* exceptionOutput);
     /**
-    * @return file name to be used for output from exception handler. Has to be either "stdout" or "stderr".
-    */
+     * @return file name to be used for output from exception handler. Has to be either "stdout" or "stderr".
+     */
     static FILE* getExceptionOutput();
 
     /**
-    * Tries to load a library and prints warning/error messages
-    * @return false, if an error occurred (except unknown XML elements)
-    */
+     * Tries to load a library and prints warning/error messages
+     * @return false, if an error occurred (except unknown XML elements)
+     */
     static bool tryLoadLibrary(Library& destination, const char* basepath, const char* filename);
 
     /**
@@ -152,17 +152,17 @@ class CppCheckExecutor : public ErrorLogger {
     int check_wrapper(CppCheck& cppcheck, int argc, const char* const argv[]);
 
     /**
-    * Starts the checking.
-    *
-    * @param cppcheck cppcheck instance
-    * @param argc from main()
-    * @param argv from main()
-    * @return EXIT_FAILURE if arguments are invalid or no input files
-    *         were found.
-    *         If errors are found and --error-exitcode is used,
-    *         given value is returned instead of default 0.
-    *         If no errors are found, 0 is returned.
-    */
+     * Starts the checking.
+     *
+     * @param cppcheck cppcheck instance
+     * @param argc from main()
+     * @param argv from main()
+     * @return EXIT_FAILURE if arguments are invalid or no input files
+     *         were found.
+     *         If errors are found and --error-exitcode is used,
+     *         given value is returned instead of default 0.
+     *         If no errors are found, 0 is returned.
+     */
     int check_internal(CppCheck& cppcheck, int argc, const char* const argv[]);
 
     /**

diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -193,7 +193,7 @@ static std::string addFiles2(std::map<std::string, std::size_t> &files,
                              const std::set<std::string> &extra,
                              bool recursive,
                              const PathMatch& ignored
-                            )
+                             )
 {
     struct stat file_stat;
     if (stat(path.c_str(), &file_stat) != -1) {

diff --git a/cli/filelister.h b/cli/filelister.h
@@ -81,9 +81,9 @@ class FileLister {
     static bool isDirectory(const std::string &path);
 
     /**
-      * @brief Check if the given path is a file and if it exists?
-      * @return true if path points to file and the file exists.
-      */
+     * @brief Check if the given path is a file and if it exists?
+     * @return true if path points to file and the file exists.
+     */
     static bool fileExists(const std::string &path);
 };
 

diff --git a/cli/main.cpp b/cli/main.cpp
@@ -88,7 +88,7 @@ int main(int argc, char* argv[])
     GetModuleFileNameA(nullptr, exename, sizeof(exename)/sizeof(exename[0])-1);
     argv[0] = exename;
 #endif
-
+// *INDENT-OFF*
 #ifdef NDEBUG
     try {
 #endif
@@ -103,12 +103,13 @@ int main(int argc, char* argv[])
     }
     return EXIT_FAILURE;
 #endif
+// *INDENT-ON*
 }
 
 
 // Warn about deprecated compilers
 #ifdef __clang__
-#   if ( __clang_major__ < 2 || ( __clang_major__  == 2 && __clang_minor__ < 9))
+#   if (__clang_major__ < 2 || (__clang_major__  == 2 && __clang_minor__ < 9))
 #       warning "Using Clang 2.8 or earlier. Support for this version has been removed."
 #   endif
 #elif defined(__GNUC__)

diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -55,7 +55,7 @@ using std::memset;
 
 ThreadExecutor::ThreadExecutor(const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger)
     : mFiles(files), mSettings(settings), mErrorLogger(errorLogger), mFileCount(0)
-      // Not initialized mFileSync, mErrorSync, mReportSync
+    // Not initialized mFileSync, mErrorSync, mReportSync
 {
 #if defined(THREADING_MODEL_FORK)
     mWpipe = 0;
@@ -81,7 +81,7 @@ ThreadExecutor::~ThreadExecutor()
 
 void ThreadExecutor::addFileContent(const std::string &path, const std::string &content)
 {
-    mFileContents[ path ] = content;
+    mFileContents[path] = content;
 }
 
 int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
@@ -139,11 +139,11 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
         unsigned int fileResult = 0;
         iss >> fileResult;
         result += fileResult;
-        delete [] buf;
+        delete[] buf;
         return -1;
     }
 
-    delete [] buf;
+    delete[] buf;
     return 1;
 }
 
@@ -224,7 +224,7 @@ unsigned int ThreadExecutor::check()
                     resultOfCheck = fileChecker.check(*iFileSettings);
                 } else if (!mFileContents.empty() && mFileContents.find(iFile->first) != mFileContents.end()) {
                     // File content was given as a string
-                    resultOfCheck = fileChecker.check(iFile->first, mFileContents[ iFile->first ]);
+                    resultOfCheck = fileChecker.check(iFile->first, mFileContents[iFile->first]);
                 } else {
                     // Read file from a file
                     resultOfCheck = fileChecker.check(iFile->first);
@@ -327,18 +327,18 @@ unsigned int ThreadExecutor::check()
 void ThreadExecutor::writeToPipe(PipeSignal type, const std::string &data)
 {
     unsigned int len = static_cast<unsigned int>(data.length() + 1);
-    char *out = new char[ len + 1 + sizeof(len)];
+    char *out = new char[len + 1 + sizeof(len)];
     out[0] = static_cast<char>(type);
     std::memcpy(&(out[1]), &len, sizeof(len));
     std::memcpy(&(out[1+sizeof(len)]), data.c_str(), len);
     if (write(mWpipe, out, len + 1 + sizeof(len)) <= 0) {
-        delete [] out;
+        delete[] out;
         out = nullptr;
         std::cerr << "#### ThreadExecutor::writeToPipe, Failed to write to pipe" << std::endl;
         std::exit(EXIT_FAILURE);
     }
 
-    delete [] out;
+    delete[] out;
 }
 
 void ThreadExecutor::reportOut(const std::string &outmsg, Color c)
@@ -523,7 +523,7 @@ void ThreadExecutor::reportInfo(const ErrorMessage &msg)
     report(msg, MessageType::REPORT_INFO);
 }
 
-void ThreadExecutor::bughuntingReport(const std::string  &/*str*/)
+void ThreadExecutor::bughuntingReport(const std::string  & /*str*/)
 {
     // TODO
 }
@@ -562,32 +562,23 @@ void ThreadExecutor::report(const ErrorMessage &msg, MessageType msgType)
 
 #else
 
-void ThreadExecutor::addFileContent(const std::string &/*path*/, const std::string &/*content*/)
-{
-
-}
+void ThreadExecutor::addFileContent(const std::string & /*path*/, const std::string & /*content*/)
+{}
 
 unsigned int ThreadExecutor::check()
 {
     return 0;
 }
 
-void ThreadExecutor::reportOut(const std::string &/*outmsg*/, Color)
-{
+void ThreadExecutor::reportOut(const std::string & /*outmsg*/, Color)
+{}
+void ThreadExecutor::reportErr(const ErrorMessage & /*msg*/)
+{}
 
-}
-void ThreadExecutor::reportErr(const ErrorMessage &/*msg*/)
-{
+void ThreadExecutor::reportInfo(const ErrorMessage & /*msg*/)
+{}
 
-}
-
-void ThreadExecutor::reportInfo(const ErrorMessage &/*msg*/)
-{
-
-}
-
-void ThreadExecutor::bughuntingReport(const std::string &/*str*/)
-{
-}
+void ThreadExecutor::bughuntingReport(const std::string & /*str*/)
+{}
 
 #endif
diff --git a/democlient/democlient.cpp b/democlient/democlient.cpp
@@ -46,7 +46,7 @@ class CppcheckExecutor : public ErrorLogger {
 
     void bughuntingReport(const std::string&) override {}
 
-    void reportOut(const std::string &outmsg) override { }
+    void reportOut(const std::string &outmsg) override {}
     void reportErr(const ErrorMessage &msg) override {
         const std::string s = msg.toString(true);
 

diff --git a/gui/aboutdialog.h b/gui/aboutdialog.h
@@ -29,9 +29,9 @@ class QWidget;
 /// @{
 
 /**
-* @brief About dialog
-*
-*/
+ * @brief About dialog
+ *
+ */
 class AboutDialog : public QDialog {
     Q_OBJECT
 public:

diff --git a/gui/application.cpp b/gui/application.cpp
@@ -23,5 +23,4 @@ Application::Application(const QString &name, const QString &path,
     : mName(name)
     , mPath(path)
     , mParameters(params)
-{
-}
+{}