Astyle: sync windows and linux folders (danmar#3016)

rikardfalkeborn · web-flow · commit 50cdb6cbfcb3 · 2021-01-06T17:13:44.000+01:00
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -648,7 +648,8 @@ bool exprDependsOnThis(const Token* expr, nonneg int 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;
     visitAstNodes(startTok, [&](const Token* tok) {
         if (tok->varId() > 0 && !tok->variable()) {
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -890,7 +890,7 @@ void CheckBufferOverrun::objectIndex()
                 continue;
 
             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)
                     continue;
                 const Variable *var = v.tokvalue->variable();
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
@@ -451,8 +451,7 @@ struct ForwardTraversal {
                         if (!thenBranch.isConclusiveEscape()) {
                             if (!analyzer->lowerToInconclusive())
                                 return Progress::Break;
-                        }
-                        else if (thenBranch.check) {
+                        } else if (thenBranch.check) {
                             return Progress::Break;
                         } else {
                             if (analyzer->isConditional() && stopUpdates())
diff --git a/runastyle b/runastyle
@@ -58,7 +58,7 @@ formatCplusplus "test/*.cpp"
 formatCplusplus "test/cfg/*.c"
 formatCplusplus "test/cfg/*.cpp"
 formatCplusplus "test/*.h"
-formatCplusplus "tools/*.cpp"
+formatCplusplusRecursive "tools/*.cpp"
 formatCplusplusRecursive "tools/*.h"
 formatCplusplusRecursive "samples/*.c"
 formatCplusplusRecursive "samples/*.cpp"
diff --git a/runastyle.bat b/runastyle.bat
@@ -30,6 +30,8 @@
 %ASTYLE% --options=%RCFILE% -r gui/test/*.h
 %ASTYLE% --options=%RCFILE% lib/*.cpp
 %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/cfg/*.c
 %ASTYLE% --options=%RCFILE% test/cfg/*.cpp
diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp
@@ -36,7 +36,7 @@ MainWindow::MainWindow(QWidget *parent) :
     mFSmodel.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
     ui->directoryTree->setModel(&mFSmodel);
     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);
     ui->directoryTree->setRootIndex(mFSmodel.index(WORK_FOLDER));
 
@@ -276,9 +276,9 @@ void MainWindow::findInFilesClicked()
     const QString text = ui->filterEdit->text();
 
     QStringList filter;
-    if(ui->hFilesFilter->isChecked())
+    if (ui->hFilesFilter->isChecked())
         filter.append(hFiles);
-    if(ui->srcFilesFilter->isChecked())
+    if (ui->srcFilesFilter->isChecked())
         filter.append(srcFiles);
 
     QMimeDatabase mimeDatabase;

Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,8 @@ bool exprDependsOnThis(const Token* expr, nonneg int depth)`
`648`	`648`	`return exprDependsOnThis(expr->astOperand1(), depth) \|\| exprDependsOnThis(expr->astOperand2(), depth);`
`649`	`649`	`}`
`650`	`650`
`651`		`-static bool hasUnknownVars(const Token* startTok) {`
	`651`	`+static bool hasUnknownVars(const Token* startTok)`
	`652`	`+{`
`652`	`653`	`bool result = false;`
`653`	`654`	`visitAstNodes(startTok, [&](const Token* tok) {`
`654`	`655`	`if (tok->varId() > 0 && !tok->variable()) {`