Use brace initializer instead of empty C string to return empty C++ s…

…tring (#763)
microsoft · Oct 26, 2022 · b89f945 · b89f945
1 parent 2b84243
commit b89f945
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/vcpkg/base/system.mac.cpp b/src/vcpkg/base/system.mac.cpp
@@ -63,7 +63,7 @@ namespace vcpkg
 
     std::string mac_bytes_to_string(const Span<char>& bytes)
     {
-        if (bytes.size() != MAC_BYTES_LENGTH) return "";
+        if (bytes.size() != MAC_BYTES_LENGTH) return {};
 
         static constexpr char hexits[] = "0123456789abcdef";
         char mac_address[MAC_STRING_LENGTH];

diff --git a/src/vcpkg/commands.dependinfo.cpp b/src/vcpkg/commands.dependinfo.cpp
@@ -225,7 +225,7 @@ namespace vcpkg::Commands::DependInfo
             {
                 return create_dgml_as_string(depend_info);
             }
-            return "";
+            return {};
         }
 
         void assign_depth_to_dependencies(const std::string& package,

diff --git a/src/vcpkg/metrics.cpp b/src/vcpkg/metrics.cpp
@@ -101,7 +101,7 @@ namespace vcpkg
             return ptime->to_string();
         }
 
-        return "";
+        return {};
     }
 
     static const std::string& get_session_id()
@@ -120,16 +120,16 @@ namespace vcpkg
         path += L"\\kernel32.dll";
 
         const auto versz = GetFileVersionInfoSizeW(path.c_str(), nullptr);
-        if (versz == 0) return "";
+        if (versz == 0) return {};
 
         std::vector<char> verbuf;
         verbuf.resize(versz);
 
-        if (!GetFileVersionInfoW(path.c_str(), 0, static_cast<DWORD>(verbuf.size()), &verbuf[0])) return "";
+        if (!GetFileVersionInfoW(path.c_str(), 0, static_cast<DWORD>(verbuf.size()), &verbuf[0])) return {};
 
         void* rootblock;
         UINT rootblocksize;
-        if (!VerQueryValueW(&verbuf[0], L"\\", &rootblock, &rootblocksize)) return "";
+        if (!VerQueryValueW(&verbuf[0], L"\\", &rootblock, &rootblocksize)) return {};
 
         auto rootblock_ffi = static_cast<VS_FIXEDFILEINFO*>(rootblock);
 

diff --git a/src/vcpkg/sourceparagraph.cpp b/src/vcpkg/sourceparagraph.cpp
@@ -838,7 +838,7 @@ namespace vcpkg
             if (cur() == Unicode::end_of_file)
             {
                 add_error(msg::format(msgEmptyLicenseExpression));
-                return "";
+                return {};
             }
 
             Expecting expecting = Expecting::License;