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

Astyle: sync windows and linux folders (#3016)

This commit is contained in:
Rikard Falkeborn 2021-01-06 17:13:44 +01:00 committed by GitHub
parent a7f0e91539
commit 50cdb6cbfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/astutils.cpp
View File

@ -648,7 +648,8 @@ bool exprDependsOnThis(const Token* expr, nonneg int depth)
return exprDependsOnThis(expr->astOperand1(), depth) || exprDependsOnThis(expr->astOperand2(), depth); return exprDependsOnThis(expr->astOperand1(), depth) || exprDependsOnThis(expr->astOperand2(), depth);
} }
static bool hasUnknownVars(const Token* startTok) { static bool hasUnknownVars(const Token* startTok)
{
bool result = false; bool result = false;
visitAstNodes(startTok, [&](const Token* tok) { visitAstNodes(startTok, [&](const Token* tok) {
if (tok->varId() > 0 && !tok->variable()) { if (tok->varId() > 0 && !tok->variable()) {

2
lib/checkbufferoverrun.cpp
View File

@ -890,7 +890,7 @@ void CheckBufferOverrun::objectIndex()
continue; continue;
std::vector<ValueFlow::Value> values = getLifetimeObjValues(obj, false, true); std::vector<ValueFlow::Value> values = getLifetimeObjValues(obj, false, true);
for(const ValueFlow::Value& v:values) { for (const ValueFlow::Value& v:values) {
if (v.lifetimeKind != ValueFlow::Value::LifetimeKind::Address) if (v.lifetimeKind != ValueFlow::Value::LifetimeKind::Address)
continue; continue;
const Variable *var = v.tokvalue->variable(); const Variable *var = v.tokvalue->variable();

3
lib/forwardanalyzer.cpp
View File

@ -451,8 +451,7 @@ struct ForwardTraversal {
if (!thenBranch.isConclusiveEscape()) { if (!thenBranch.isConclusiveEscape()) {
if (!analyzer->lowerToInconclusive()) if (!analyzer->lowerToInconclusive())
return Progress::Break; return Progress::Break;
} } else if (thenBranch.check) {
else if (thenBranch.check) {
return Progress::Break; return Progress::Break;
} else { } else {
if (analyzer->isConditional() && stopUpdates()) if (analyzer->isConditional() && stopUpdates())

2
runastyle
View File

@ -58,7 +58,7 @@ formatCplusplus "test/*.cpp"
formatCplusplus "test/cfg/*.c" formatCplusplus "test/cfg/*.c"
formatCplusplus "test/cfg/*.cpp" formatCplusplus "test/cfg/*.cpp"
formatCplusplus "test/*.h" formatCplusplus "test/*.h"
formatCplusplus "tools/*.cpp" formatCplusplusRecursive "tools/*.cpp"
formatCplusplusRecursive "tools/*.h" formatCplusplusRecursive "tools/*.h"
formatCplusplusRecursive "samples/*.c" formatCplusplusRecursive "samples/*.c"
formatCplusplusRecursive "samples/*.cpp" formatCplusplusRecursive "samples/*.cpp"

2
runastyle.bat
View File

@ -30,6 +30,8 @@
%ASTYLE% --options=%RCFILE% -r gui/test/*.h %ASTYLE% --options=%RCFILE% -r gui/test/*.h
%ASTYLE% --options=%RCFILE% lib/*.cpp %ASTYLE% --options=%RCFILE% lib/*.cpp
%ASTYLE% --options=%RCFILE% lib/*.h %ASTYLE% --options=%RCFILE% lib/*.h
%ASTYLE% --options=%RCFILE% oss-fuzz/*.cpp
%ASTYLE% --options=%RCFILE% oss-fuzz/*.h
%ASTYLE% --options=%RCFILE% test/*.cpp %ASTYLE% --options=%RCFILE% test/*.cpp
%ASTYLE% --options=%RCFILE% test/cfg/*.c %ASTYLE% --options=%RCFILE% test/cfg/*.c
%ASTYLE% --options=%RCFILE% test/cfg/*.cpp %ASTYLE% --options=%RCFILE% test/cfg/*.cpp

6
tools/triage/mainwindow.cpp
View File

@ -36,7 +36,7 @@ MainWindow::MainWindow(QWidget *parent) :
mFSmodel.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); mFSmodel.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
ui->directoryTree->setModel(&mFSmodel); ui->directoryTree->setModel(&mFSmodel);
QHeaderView * header = ui->directoryTree->header(); QHeaderView * header = ui->directoryTree->header();
for(int i = 1; i < header->length(); ++i) // hide all except [0] for (int i = 1; i < header->length(); ++i) // hide all except [0]
header->hideSection(i); header->hideSection(i);
ui->directoryTree->setRootIndex(mFSmodel.index(WORK_FOLDER)); ui->directoryTree->setRootIndex(mFSmodel.index(WORK_FOLDER));
@ -276,9 +276,9 @@ void MainWindow::findInFilesClicked()
const QString text = ui->filterEdit->text(); const QString text = ui->filterEdit->text();
QStringList filter; QStringList filter;
if(ui->hFilesFilter->isChecked()) if (ui->hFilesFilter->isChecked())
filter.append(hFiles); filter.append(hFiles);
if(ui->srcFilesFilter->isChecked()) if (ui->srcFilesFilter->isChecked())
filter.append(srcFiles); filter.append(srcFiles);
QMimeDatabase mimeDatabase; QMimeDatabase mimeDatabase;