Apply suggestions from code review

Co-authored-by: Billy O'Neal <[email protected]>
Co-authored-by: Thomas1664 <[email protected]>

Author: 3 people

cmake/FindLibCURL.cmake

@@ -61,14 +61,11 @@ function(get_libcurl)
         string(APPEND CMAKE_C_FLAGS " /wd6101")
         string(APPEND CMAKE_C_FLAGS " /wd6011")
         string(APPEND CMAKE_C_FLAGS " /wd6054")
-        #string(APPEND CMAKE_C_FLAGS " /wd6240")
-        #string(APPEND CMAKE_C_FLAGS " /wd6239")
         string(APPEND CMAKE_C_FLAGS " /wd6287")
         string(APPEND CMAKE_C_FLAGS " /wd6323")
         string(APPEND CMAKE_C_FLAGS " /wd6385")
         string(APPEND CMAKE_C_FLAGS " /wd6387")
         string(APPEND CMAKE_C_FLAGS " /wd28182")
-        #string(APPEND CMAKE_C_FLAGS " /wd28183")
         string(APPEND CMAKE_C_FLAGS " /wd28251")
         string(APPEND CMAKE_C_FLAGS " /wd28301")
     else()

include/vcpkg/base/curl.h

@@ -52,7 +52,7 @@ namespace vcpkg
 
     struct CurlHeaders
     {
-        CurlHeaders();
+        CurlHeaders() = default;
         CurlHeaders(View<std::string> headers);
         CurlHeaders(CurlHeaders&& other) noexcept;
         CurlHeaders& operator=(CurlHeaders&& other) noexcept;

include/vcpkg/metrics.h

@@ -199,7 +199,5 @@ namespace vcpkg
 
     void flush_global_metrics(const Filesystem&);
     bool curl_upload_metrics(const std::string& payload);
-
-    // exposed for testing
     bool parse_metrics_response(StringView response_body);
 }

src/vcpkg/base/curl.cpp

@@ -28,7 +28,7 @@ namespace vcpkg
         return g_curl_global_init.get_init_status();
     }
 
-    CurlEasyHandle::CurlEasyHandle() : m_ptr(nullptr) { vcpkg::get_curl_global_init_status(); }
+    CurlEasyHandle::CurlEasyHandle() { get_curl_global_init_status(); }
     CurlEasyHandle::CurlEasyHandle(CurlEasyHandle&& other) noexcept : m_ptr(std::exchange(other.m_ptr, nullptr)) { }
     CurlEasyHandle& CurlEasyHandle::operator=(CurlEasyHandle&& other) noexcept
     {
@@ -55,7 +55,7 @@ namespace vcpkg
         return m_ptr;
     }
 
-    CurlMultiHandle::CurlMultiHandle() : m_ptr(nullptr) { vcpkg::get_curl_global_init_status(); }
+    CurlMultiHandle::CurlMultiHandle() { get_curl_global_init_status(); }
     CurlMultiHandle::CurlMultiHandle(CurlMultiHandle&& other) noexcept
         : m_ptr(std::exchange(other.m_ptr, nullptr)), m_easy_handles(std::move(other.m_easy_handles))
     {
@@ -99,7 +99,6 @@ namespace vcpkg
         return m_ptr;
     }
 
-    CurlHeaders::CurlHeaders() : m_headers(nullptr) { }
     CurlHeaders::CurlHeaders(View<std::string> headers) : m_headers(nullptr)
     {
         for (const auto& header : headers)

src/vcpkg/metrics.cpp

@@ -548,9 +548,9 @@ namespace vcpkg
         auto json = maybe_json.get();
         if (!json) return false;
 
-        auto maybe_received = json->get(vcpkg::AppInsightsResponseItemsReceived);
-        auto maybe_accepted = json->get(vcpkg::AppInsightsResponseItemsAccepted);
-        auto maybe_errors = json->get(vcpkg::AppInsightsResponseErrors);
+        auto maybe_received = json->get(AppInsightsResponseItemsReceived);
+        auto maybe_accepted = json->get(AppInsightsResponseItemsAccepted);
+        auto maybe_errors = json->get(AppInsightsResponseErrors);
 
         if (maybe_received && maybe_accepted && maybe_errors && maybe_received->is_integer() &&
             maybe_accepted->is_integer() && maybe_errors->is_array())