From bf98bea4ad42dcaefba4164b3d5649328c177563 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 23 Jul 2019 10:50:50 +0200 Subject: [PATCH] ClangTools: Sanitize parameter order The path to the serialized diagnostics log is the main parameter, so put it first. Change-Id: I8865aad302b0e5d3008dab606ab774167cebda3c Reviewed-by: Cristian Adam Reviewed-by: Nikolai Kosjar --- src/plugins/clangtools/clangtidyclazytool.cpp | 8 ++++---- src/plugins/clangtools/clangtidyclazytool.h | 4 ++-- src/plugins/clangtools/clangtool.h | 4 ++-- src/plugins/clangtools/clangtoolruncontrol.cpp | 4 ++-- src/plugins/clangtools/clangtoolslogfilereader.cpp | 14 +++++++------- src/plugins/clangtools/clangtoolslogfilereader.h | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/plugins/clangtools/clangtidyclazytool.cpp b/src/plugins/clangtools/clangtidyclazytool.cpp index eedd6f87337..62940b00a92 100644 --- a/src/plugins/clangtools/clangtidyclazytool.cpp +++ b/src/plugins/clangtools/clangtidyclazytool.cpp @@ -463,14 +463,14 @@ void ClangTidyClazyTool::handleStateUpdate() Debugger::showPermanentStatusMessage(message); } -Diagnostics ClangTidyClazyTool::read(const QString &filePath, +Diagnostics ClangTidyClazyTool::read(const QString &logFilePath, + const QString &mainFilePath, const QSet &projectFiles, - const QString &logFilePath, QString *errorMessage) const { - return readSerializedDiagnostics(Utils::FilePath::fromString(filePath), + return readSerializedDiagnostics(Utils::FilePath::fromString(logFilePath), + Utils::FilePath::fromString(mainFilePath), projectFiles, - Utils::FilePath::fromString(logFilePath), errorMessage); } diff --git a/src/plugins/clangtools/clangtidyclazytool.h b/src/plugins/clangtools/clangtidyclazytool.h index bf4ae4fbca7..f77fe8820a9 100644 --- a/src/plugins/clangtools/clangtidyclazytool.h +++ b/src/plugins/clangtools/clangtidyclazytool.h @@ -53,9 +53,9 @@ public: void startTool(bool askUserForFileSelection) final; - Diagnostics read(const QString &filePath, + Diagnostics read(const QString &logFilePath, + const QString &mainFilePath, const QSet &projectFiles, - const QString &logFilePath, QString *errorMessage) const final; void onNewDiagnosticsAvailable(const Diagnostics &diagnostics) override; diff --git a/src/plugins/clangtools/clangtool.h b/src/plugins/clangtools/clangtool.h index b23d80dc059..3f3c2d69982 100644 --- a/src/plugins/clangtools/clangtool.h +++ b/src/plugins/clangtools/clangtool.h @@ -50,9 +50,9 @@ public: virtual void startTool(bool askUserForFileSelection) = 0; - virtual Diagnostics read(const QString &filePath, + virtual Diagnostics read(const QString &logFilePath, + const QString &mainFilePath, const QSet &projectFiles, - const QString &logFilePath, QString *errorMessage) const = 0; FileInfos collectFileInfos(ProjectExplorer::Project *project, diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index ccacbfa1da0..b00da895293 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -398,9 +398,9 @@ void ClangToolRunControl::onRunnerFinishedWithSuccess(const QString &filePath) qCDebug(LOG) << "onRunnerFinishedWithSuccess:" << logFilePath; QString errorMessage; - const Diagnostics diagnostics = tool()->read(filePath, + const Diagnostics diagnostics = tool()->read(logFilePath, + filePath, m_projectFiles, - logFilePath, &errorMessage); QFile::remove(logFilePath); // Clean-up. diff --git a/src/plugins/clangtools/clangtoolslogfilereader.cpp b/src/plugins/clangtools/clangtoolslogfilereader.cpp index 52f70baf73b..4c4dc50c27b 100644 --- a/src/plugins/clangtools/clangtoolslogfilereader.cpp +++ b/src/plugins/clangtools/clangtoolslogfilereader.cpp @@ -182,9 +182,9 @@ static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic, return diagnostic; } -static Diagnostics readSerializedDiagnostics_helper(const Utils::FilePath &filePath, - const QSet &projectFiles, - const Utils::FilePath &logFilePath) +static Diagnostics readSerializedDiagnostics_helper(const Utils::FilePath &logFilePath, + const Utils::FilePath &mainFilePath, + const QSet &projectFiles) { Diagnostics list; CXLoadDiag_Error error; @@ -200,7 +200,7 @@ static Diagnostics readSerializedDiagnostics_helper(const Utils::FilePath &fileP clang_disposeDiagnosticSet(diagnostics); }); - const QString nativeFilePath = QDir::toNativeSeparators(filePath.toString()); + const QString nativeFilePath = QDir::toNativeSeparators(mainFilePath.toString()); for (unsigned i = 0; i < clang_getNumDiagnosticsInSet(diagnostics); ++i) { CXDiagnostic cxDiagnostic = clang_getDiagnosticInSet(diagnostics, i); Utils::ExecuteOnDestruction cleanUpDiagnostic([&]() { @@ -231,15 +231,15 @@ static bool checkFilePath(const Utils::FilePath &filePath, QString *errorMessage return true; } -Diagnostics readSerializedDiagnostics(const Utils::FilePath &filePath, +Diagnostics readSerializedDiagnostics(const Utils::FilePath &logFilePath, + const Utils::FilePath &mainFilePath, const QSet &projectFiles, - const Utils::FilePath &logFilePath, QString *errorMessage) { if (!checkFilePath(logFilePath, errorMessage)) return {}; - return readSerializedDiagnostics_helper(filePath, projectFiles, logFilePath); + return readSerializedDiagnostics_helper(logFilePath, mainFilePath, projectFiles); } } // namespace Internal diff --git a/src/plugins/clangtools/clangtoolslogfilereader.h b/src/plugins/clangtools/clangtoolslogfilereader.h index 7cd5483f765..5c686913f13 100644 --- a/src/plugins/clangtools/clangtoolslogfilereader.h +++ b/src/plugins/clangtools/clangtoolslogfilereader.h @@ -34,9 +34,9 @@ namespace Utils { class FilePath; } namespace ClangTools { namespace Internal { -Diagnostics readSerializedDiagnostics(const Utils::FilePath &filePath, +Diagnostics readSerializedDiagnostics(const Utils::FilePath &logFilePath, + const Utils::FilePath &mainFilePath, const QSet &projectFiles, - const Utils::FilePath &logFilePath, QString *errorMessage); } // namespace Internal