Merge branch 'master' of http://github.com/Microsoft/vcpkg

1 files changed, 4 insertions, 4 deletions

diff --git a/toolsrc/src/commands_cache.cpp b/toolsrc/src/commands_cache.cpp
index 19c762caf..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);
@@ -38,7 +38,7 @@ namespace vcpkg
     {
         static const std::string example = Strings::format(
             "The argument should be a substring to search for, or no argument to display all cached libraries.\n%s", create_example_string("cache png"));
-        args.check_max_arg_count(1, example.c_str());
+        args.check_max_arg_count(1, example);
 
         const std::vector<BinaryParagraph> binary_paragraphs = read_all_binary_paragraphs(paths);
         if (binary_paragraphs.empty())
@@ -52,7 +52,7 @@ namespace vcpkg
             for (const BinaryParagraph& binary_paragraph : binary_paragraphs)
             {
                 const std::string displayname = binary_paragraph.displayname();
-                System::println(displayname.c_str());
+                System::println(displayname);
             }
         }
         else
@@ -66,7 +66,7 @@ namespace vcpkg
                     continue;
                 }
 
-                System::println(displayname.c_str());
+                System::println(displayname);
             }
         }