Files::get_contents() -> Files::read_contents()

8 files changed, 10 insertions, 10 deletions

diff --git a/toolsrc/src/Paragraphs.cpp b/toolsrc/src/Paragraphs.cpp
index 5efa9a7b3..823b4a85e 100644
--- a/toolsrc/src/Paragraphs.cpp
+++ b/toolsrc/src/Paragraphs.cpp
@@ -153,7 +153,7 @@ namespace vcpkg { namespace Paragraphs
 
     std::vector<std::unordered_map<std::string, std::string>> get_paragraphs(const fs::path& control_path)
     {
-        return parse_paragraphs(Files::get_contents(control_path).get_or_throw());
+        return parse_paragraphs(Files::read_contents(control_path).get_or_throw());
     }
 
     std::vector<std::unordered_map<std::string, std::string>> parse_paragraphs(const std::string& str)
diff --git a/toolsrc/src/commands_cache.cpp b/toolsrc/src/commands_cache.cpp
index 17b04b093..1a10b93cf 100644
--- a/toolsrc/src/commands_cache.cpp
+++ b/toolsrc/src/commands_cache.cpp
@@ -15,7 +15,7 @@ namespace vcpkg
 
             try
             {
-                auto file_contents = Files::get_contents(path / "CONTROL");
+                auto file_contents = Files::read_contents(path / "CONTROL");
                 if (auto text = file_contents.get())
                 {
                     auto pghs = Paragraphs::parse_paragraphs(*text);
diff --git a/toolsrc/src/commands_integration.cpp b/toolsrc/src/commands_integration.cpp
index 31f30f216..e7e5b2d8d 100644
--- a/toolsrc/src/commands_integration.cpp
+++ b/toolsrc/src/commands_integration.cpp
@@ -173,7 +173,7 @@ namespace vcpkg
         bool should_install_system = true;
         if (fs::exists(system_wide_targets_file))
         {
-            auto system_wide_file_contents = Files::get_contents(system_wide_targets_file);
+            auto system_wide_file_contents = Files::read_contents(system_wide_targets_file);
             if (auto contents_data = system_wide_file_contents.get())
             {
                 std::regex re(R"###(<!-- version (\d+) -->)###");
diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/commands_update.cpp
index 82e3b7e52..a4ab7c6e7 100644
--- a/toolsrc/src/commands_update.cpp
+++ b/toolsrc/src/commands_update.cpp
@@ -71,7 +71,7 @@ namespace vcpkg
             System::println("\nTo update these packages, run\n    vcpkg remove --purge <pkgs>...\n    vcpkg install <pkgs>...");
         }
 
-        auto version_file = Files::get_contents(paths.root / "toolsrc" / "VERSION.txt");
+        auto version_file = Files::read_contents(paths.root / "toolsrc" / "VERSION.txt");
         if (auto version_contents = version_file.get())
         {
             int maj1, min1, rev1;
diff --git a/toolsrc/src/main.cpp b/toolsrc/src/main.cpp
index 5e9dcf7ff..7703c541f 100644
--- a/toolsrc/src/main.cpp
+++ b/toolsrc/src/main.cpp
@@ -113,7 +113,7 @@ static void loadConfig()
 
     try
     {
-        std::string config_contents = Files::get_contents(localappdata / "vcpkg" / "config").get_or_throw();
+        std::string config_contents = Files::read_contents(localappdata / "vcpkg" / "config").get_or_throw();
 
         std::unordered_map<std::string, std::string> keys;
         auto pghs = Paragraphs::parse_paragraphs(config_contents);
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index bf9dbd6ab..6858d5518 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -27,7 +27,7 @@ static StatusParagraphs load_current_database(const fs::path& vcpkg_dir_status_f
         fs::rename(vcpkg_dir_status_file_old, vcpkg_dir_status_file);
     }
 
-    auto text = Files::get_contents(vcpkg_dir_status_file).get_or_throw();
+    auto text = Files::read_contents(vcpkg_dir_status_file).get_or_throw();
     auto pghs = Paragraphs::parse_paragraphs(text);
 
     std::vector<std::unique_ptr<StatusParagraph>> status_pghs;
@@ -70,7 +70,7 @@ StatusParagraphs vcpkg::database_load_check(const vcpkg_paths& paths)
         if (b->path().filename() == "incomplete")
             continue;
 
-        auto text = Files::get_contents(b->path()).get_or_throw();
+        auto text = Files::read_contents(b->path()).get_or_throw();
         auto pghs = Paragraphs::parse_paragraphs(text);
         for (auto&& p : pghs)
         {
@@ -230,7 +230,7 @@ expected<BinaryParagraph> vcpkg::try_load_cached_package(const vcpkg_paths& path
 {
     const fs::path path = paths.package_dir(spec) / "CONTROL";
 
-    auto control_contents_maybe = Files::get_contents(path);
+    auto control_contents_maybe = Files::read_contents(path);
     if (auto control_contents = control_contents_maybe.get())
     {
         std::vector<std::unordered_map<std::string, std::string>> pghs;
diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 9e7002a37..48283e43f 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -17,7 +17,7 @@ namespace vcpkg {namespace Files
         return std::regex_search(s, FILESYSTEM_INVALID_CHARACTERS_REGEX);
     }
 
-    expected<std::string> get_contents(const fs::path& file_path) noexcept
+    expected<std::string> read_contents(const fs::path& file_path) noexcept
     {
         std::fstream file_stream(file_path, std::ios_base::in | std::ios_base::binary);
         if (file_stream.fail())
diff --git a/toolsrc/src/vcpkg_metrics_uploader.cpp b/toolsrc/src/vcpkg_metrics_uploader.cpp
index 63668d1d7..14fc9ae48 100644
--- a/toolsrc/src/vcpkg_metrics_uploader.cpp
+++ b/toolsrc/src/vcpkg_metrics_uploader.cpp
@@ -19,5 +19,5 @@ WinMain(
     szArgList = CommandLineToArgvW(GetCommandLineW(), &argCount);
 
     Checks::check_exit(argCount == 2, "Requires exactly one argument, the path to the payload file");
-    Upload(Files::get_contents(szArgList[1]).get_or_throw());
+    Upload(Files::read_contents(szArgList[1]).get_or_throw());
 }