diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp index ac71b28d5..426e58376 100644 --- a/cli/cmdlineparser.cpp +++ b/cli/cmdlineparser.cpp @@ -547,7 +547,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[]) // --project else if (std::strncmp(argv[i], "--project=", 10) == 0) { - mSettings->checkAllConfigurations = false; // Can be overriden with --max-configs or --force + mSettings->checkAllConfigurations = false; // Can be overridden with --max-configs or --force const std::string projectFile = argv[i]+10; ImportProject::Type projType = mSettings->project.import(projectFile, mSettings); if (projType == ImportProject::Type::CPPCHECK_GUI) { diff --git a/man/manual.md b/man/manual.md index 8b52d2800..4b606214f 100644 --- a/man/manual.md +++ b/man/manual.md @@ -620,7 +620,7 @@ You can also suppress some unwanted rules using `--suppress-rules` option. Suppr ### threadsafety.py -[threadsafety.py](https://github.com/danmar/cppcheck/blob/master/addons/threadsafety.py) analyse Cppcheck dump files to locate threadsafety issues like static local objects used by multiple threads. +[threadsafety.py](https://github.com/danmar/cppcheck/blob/master/addons/threadsafety.py) analyse Cppcheck dump files to locate thread safety issues like static local objects used by multiple threads. ## Running Addons @@ -628,7 +628,7 @@ Addons could be run through Cppcheck command line utility as follows: cppcheck --addon=misra.py somefile.c -This will launch all Cppcheck checks and additionaly calls specific checks provided by selected addon. +This will launch all Cppcheck checks and additionally calls specific checks provided by selected addon. Some addons need extra arguments. You can configure how you want to execute an addon in a json file. For example put this in misra.json: diff --git a/test/cfg/std.c b/test/cfg/std.c index ca573429d..b712387c5 100644 --- a/test/cfg/std.c +++ b/test/cfg/std.c @@ -3147,7 +3147,7 @@ void uninitvar_strlen(const char *str) // cppcheck-suppress uninitvar (void)strlen(xPtr); - // No waring is expected + // No warning is expected (void)strlen(str); } diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp index 7457082c4..c8cb6b166 100644 --- a/tools/triage/mainwindow.cpp +++ b/tools/triage/mainwindow.cpp @@ -284,7 +284,7 @@ void MainWindow::findInFilesClicked() QMimeDatabase mimeDatabase; QDirIterator it(WORK_FOLDER, filter, QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot, QDirIterator::Subdirectories); - const auto common_path_len = WORK_FOLDER.length() + 1; // let's remove common part of path imporve UI + const auto common_path_len = WORK_FOLDER.length() + 1; // let's remove common part of path improve UI while (it.hasNext()) { const QString fileName = it.next();