From ef62f213f8c24d58c28ee1812887fc77667ead47 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Mon, 4 Jul 2022 06:43:55 +0400 Subject: cmFindPackageCommand: Drop dead code The `cmFindPackageFileList` instances always constructed w/ the only parameter. The boolean flag is always `true` (default value). Also, `cmFindPackageCommand::InitialPass` adds an empty string to the `cmFindPackageCommand::SearchPathSuffixes` vector. Meaning that `cmFindPackageCommand::CheckDirectory()` gonna be called for the suffix-less path, so `cmFindPackageFileList::Visit` may call only `cmFindPackageCommand::SearchDirectory` and get the same result. --- Source/cmFindPackageCommand.cxx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index afc63a5..f955653 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -2220,23 +2220,17 @@ bool cmFileListGeneratorBase::Consider(std::string const& fullPath, class cmFindPackageFileList : public cmFileList { public: - cmFindPackageFileList(cmFindPackageCommand* const fpc, - bool const use_suffixes = true) + cmFindPackageFileList(cmFindPackageCommand* const fpc) : FPC(fpc) - , UseSuffixes(use_suffixes) { } private: bool Visit(std::string const& fullPath) override { - if (this->UseSuffixes) { - return this->FPC->SearchDirectory(fullPath); - } - return this->FPC->CheckDirectory(fullPath); + return this->FPC->SearchDirectory(fullPath); } cmFindPackageCommand* const FPC; - bool const UseSuffixes; }; namespace { -- cgit v0.12