diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-12 23:00:42 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-12 23:00:42 -0700 |
| commit | 1b21fd0f71e5dd428c5f80396aa50ec7e0a9ee00 (patch) | |
| tree | ad4214c629e2e5d61fae51545716e86afbb244c7 /toolsrc | |
| parent | c3b54a2e7bd0a07068b6a12c29b00b8f57bdb3f1 (diff) | |
| download | vcpkg-1b21fd0f71e5dd428c5f80396aa50ec7e0a9ee00.tar.gz vcpkg-1b21fd0f71e5dd428c5f80396aa50ec7e0a9ee00.zip | |
Files::read_lines() -> Files::read_all_lines()
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/include/vcpkg_Files.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_remove.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_Files.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkglib.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/include/vcpkg_Files.h b/toolsrc/include/vcpkg_Files.h index 7bf13e973..7632463b7 100644 --- a/toolsrc/include/vcpkg_Files.h +++ b/toolsrc/include/vcpkg_Files.h @@ -8,7 +8,7 @@ namespace vcpkg::Files __interface Filesystem { virtual Expected<std::string> read_contents(const fs::path& file_path) const = 0; - virtual Expected<std::vector<std::string>> read_all_lines(const fs::path& file_path) const = 0; + virtual Expected<std::vector<std::string>> read_lines(const fs::path& file_path) const = 0; virtual fs::path find_file_recursively_up(const fs::path& starting_dir, const std::string& filename) const = 0; virtual std::vector<fs::path> recursive_find_all_files_in_dir(const fs::path& dir) const = 0; virtual std::vector<fs::path> non_recursive_find_all_files_in_dir(const fs::path& dir) const = 0; diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index a61435b5d..e6f111d41 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -36,7 +36,7 @@ namespace vcpkg::Commands::Remove pkg.state = InstallState::HALF_INSTALLED; write_update(paths, pkg); - auto maybe_lines = fs.read_all_lines(paths.listfile_path(pkg.package)); + auto maybe_lines = fs.read_lines(paths.listfile_path(pkg.package)); if (auto lines = maybe_lines.get()) { diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp index f4fb1bb61..ba7bcc222 100644 --- a/toolsrc/src/vcpkg_Files.cpp +++ b/toolsrc/src/vcpkg_Files.cpp @@ -32,7 +32,7 @@ namespace vcpkg::Files return std::move(output); } - virtual Expected<std::vector<std::string>> read_all_lines(const fs::path& file_path) const override + virtual Expected<std::vector<std::string>> read_lines(const fs::path& file_path) const override { std::fstream file_stream(file_path, std::ios_base::in | std::ios_base::binary); if (file_stream.fail()) diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp index 6cfc741e1..f70f9ace1 100644 --- a/toolsrc/src/vcpkglib.cpp +++ b/toolsrc/src/vcpkglib.cpp @@ -196,7 +196,7 @@ namespace vcpkg } const fs::path listfile_path = paths.listfile_path(pgh->package); - std::vector<std::string> installed_files_of_current_pgh = fs.read_all_lines(listfile_path).value_or_exit(VCPKG_LINE_INFO); + std::vector<std::string> installed_files_of_current_pgh = fs.read_lines(listfile_path).value_or_exit(VCPKG_LINE_INFO); Strings::trim_all_and_remove_whitespace_strings(&installed_files_of_current_pgh); upgrade_to_slash_terminated_sorted_format(fs, &installed_files_of_current_pgh, listfile_path); |