astyle formatting

This commit is contained in:
Daniel Marjamäki 2013-02-10 23:53:01 +01:00
parent ea574b0a38
commit b660cf89ef
4 changed files with 8 additions and 11 deletions

View File

@ -207,9 +207,7 @@ void MainWindow::HandleCLIParams(const QStringList &params)
checkedDir = params[ind + 1]; checkedDir = params[ind + 1];
LoadResults(logFile, checkedDir); LoadResults(logFile, checkedDir);
} } else {
else
{
LoadResults(logFile); LoadResults(logFile);
} }
} else } else

View File

@ -792,7 +792,7 @@ void ResultsTree::HideAllIdResult()
//Get the error itself //Get the error itself
QStandardItem *child = file->child(j, 0); QStandardItem *child = file->child(j, 0);
if (!child) { if (!child) {
continue; continue;
} }
QVariantMap userdata = child->data().toMap(); QVariantMap userdata = child->data().toMap();

View File

@ -278,12 +278,11 @@ private:
CheckUninitVar *checkUninitVar = dynamic_cast<CheckUninitVar *>(c->owner); CheckUninitVar *checkUninitVar = dynamic_cast<CheckUninitVar *>(c->owner);
if (checkUninitVar) { if (checkUninitVar) {
if (c->strncpy_ || c->memset_nonzero) { if (c->strncpy_ || c->memset_nonzero) {
if(!Token::Match(c->var->typeStartToken(), "char|wchar_t")) { if (!Token::Match(c->var->typeStartToken(), "char|wchar_t")) {
continue; continue;
} }
checkUninitVar->uninitstringError(tok, c->var->name(), c->strncpy_); checkUninitVar->uninitstringError(tok, c->var->name(), c->strncpy_);
} } else if (c->var->isPointer() && !c->var->isArray() && c->alloc)
else if (c->var->isPointer() && !c->var->isArray() && c->alloc)
checkUninitVar->uninitdataError(tok, c->var->name()); checkUninitVar->uninitdataError(tok, c->var->name());
else else
checkUninitVar->uninitvarError(tok, c->var->name()); checkUninitVar->uninitvarError(tok, c->var->name());