diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-31 17:57:45 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-31 17:57:45 -0700 |
| commit | 9b9a35fa3824d3cd4f8da48fc0a60ca384a5ccab (patch) | |
| tree | 9a70043783cfd89d0ad8d9f85b5778059e41795c | |
| parent | 4e26c6781cfacde5f167a8401c37984ab1de7756 (diff) | |
| download | vcpkg-9b9a35fa3824d3cd4f8da48fc0a60ca384a5ccab.tar.gz vcpkg-9b9a35fa3824d3cd4f8da48fc0a60ca384a5ccab.zip | |
Remove Files::check_is_directory()
| -rw-r--r-- | toolsrc/include/vcpkg_Files.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_import.cpp | 14 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_Files.cpp | 5 |
3 files changed, 10 insertions, 11 deletions
diff --git a/toolsrc/include/vcpkg_Files.h b/toolsrc/include/vcpkg_Files.h index 9afb9eeec..3998fbfe3 100644 --- a/toolsrc/include/vcpkg_Files.h +++ b/toolsrc/include/vcpkg_Files.h @@ -8,8 +8,6 @@ namespace vcpkg::Files { static const char* FILESYSTEM_INVALID_CHARACTERS = R"(\/:*?"<>|)"; - void check_is_directory(const LineInfo& line_info, const fs::path& dirpath); - bool has_invalid_chars_for_filesystem(const std::string& s); expected<std::string> read_contents(const fs::path& file_path) noexcept; diff --git a/toolsrc/src/commands_import.cpp b/toolsrc/src/commands_import.cpp index 6be5c2fe1..63808654a 100644 --- a/toolsrc/src/commands_import.cpp +++ b/toolsrc/src/commands_import.cpp @@ -12,9 +12,15 @@ namespace vcpkg::Commands::Import std::vector<fs::path> libs; }; + + void check_is_directory(const LineInfo& line_info, const fs::path& dirpath) + { + Checks::check_exit(line_info, fs::is_directory(dirpath), "The path %s is not a directory", dirpath.string()); + } + static Binaries find_binaries_in_dir(const fs::path& path) { - Files::check_is_directory(VCPKG_LINE_INFO, path); + check_is_directory(VCPKG_LINE_INFO, path); Binaries binaries; binaries.dlls = Files::recursive_find_files_with_extension_in_dir(path, ".dll"); @@ -35,9 +41,9 @@ namespace vcpkg::Commands::Import static void place_library_files_in(const fs::path& include_directory, const fs::path& project_directory, const fs::path& destination_path) { - Files::check_is_directory(VCPKG_LINE_INFO, include_directory); - Files::check_is_directory(VCPKG_LINE_INFO, project_directory); - Files::check_is_directory(VCPKG_LINE_INFO, destination_path); + check_is_directory(VCPKG_LINE_INFO, include_directory); + check_is_directory(VCPKG_LINE_INFO, project_directory); + check_is_directory(VCPKG_LINE_INFO, destination_path); Binaries debug_binaries = find_binaries_in_dir(project_directory / "Debug"); Binaries release_binaries = find_binaries_in_dir(project_directory / "Release"); diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp index 6b5270ef3..d1468b445 100644 --- a/toolsrc/src/vcpkg_Files.cpp +++ b/toolsrc/src/vcpkg_Files.cpp @@ -6,11 +6,6 @@ namespace vcpkg::Files { static const std::regex FILESYSTEM_INVALID_CHARACTERS_REGEX = std::regex(R"([\/:*?"<>|])"); - void check_is_directory(const LineInfo& line_info, const fs::path& dirpath) - { - Checks::check_exit(line_info, fs::is_directory(dirpath), "The path %s is not a directory", dirpath.string()); - } - bool has_invalid_chars_for_filesystem(const std::string& s) { return std::regex_search(s, FILESYSTEM_INVALID_CHARACTERS_REGEX); |