From 5f4754639211eabc7e2438a03d510ba301231212 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Tue, 14 Jul 2020 12:46:19 -0300 Subject: [PATCH] Cleanup c-style casts from Http.WinHttp.cpp --- src/openrct2/core/Http.WinHttp.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/openrct2/core/Http.WinHttp.cpp b/src/openrct2/core/Http.WinHttp.cpp index a84c89d5bb..4b94d6927d 100644 --- a/src/openrct2/core/Http.WinHttp.cpp +++ b/src/openrct2/core/Http.WinHttp.cpp @@ -48,7 +48,7 @@ namespace Http static int32_t ReadStatusCode(HINTERNET hRequest) { wchar_t headerBuffer[32]{}; - auto headerBufferLen = (DWORD)std::size(headerBuffer); + auto headerBufferLen = static_cast(std::size(headerBuffer)); if (!WinHttpQueryHeaders( hRequest, WINHTTP_QUERY_STATUS_CODE, L"StatusCode", headerBuffer, &headerBufferLen, WINHTTP_NO_HEADER_INDEX)) { @@ -136,7 +136,7 @@ namespace Http dwSizeToRead = 4096; body.resize(dwRealSize + dwSizeToRead); - auto dst = (LPVOID)&body[dwRealSize]; + auto dst = reinterpret_cast(&body[dwRealSize]); dwDownloaded = 0; if (!WinHttpReadData(hRequest, dst, dwSizeToRead, &dwDownloaded)) @@ -156,10 +156,10 @@ namespace Http { URL_COMPONENTS url{}; url.dwStructSize = sizeof(url); - url.dwSchemeLength = (DWORD)-1; - url.dwHostNameLength = (DWORD)-1; - url.dwUrlPathLength = (DWORD)-1; - url.dwExtraInfoLength = (DWORD)-1; + url.dwSchemeLength = static_cast(-1); + url.dwHostNameLength = static_cast(-1); + url.dwUrlPathLength = static_cast(-1); + url.dwExtraInfoLength = static_cast(-1); auto wUrl = String::ToWideChar(req.url); if (!WinHttpCrackUrl(wUrl.c_str(), 0, 0, &url)) @@ -192,12 +192,12 @@ namespace Http for (auto header : req.header) { auto fullHeader = String::ToWideChar(header.first) + L": " + String::ToWideChar(header.second); - if (!WinHttpAddRequestHeaders(hRequest, fullHeader.c_str(), (ULONG)-1L, WINHTTP_ADDREQ_FLAG_ADD)) + if (!WinHttpAddRequestHeaders(hRequest, fullHeader.c_str(), static_cast(-1L), WINHTTP_ADDREQ_FLAG_ADD)) ThrowWin32Exception("WinHttpAddRequestHeaders"); } - auto reqBody = (LPVOID)req.body.data(); - auto reqBodyLen = (DWORD)req.body.size(); + auto reqBody = reinterpret_cast(const_cast(req.body.data())); + auto reqBodyLen = static_cast(req.body.size()); if (!WinHttpSendRequest(hRequest, WINHTTP_NO_ADDITIONAL_HEADERS, 0, reqBody, reqBodyLen, reqBodyLen, 0)) ThrowWin32Exception("WinHttpSendRequest"); @@ -210,7 +210,7 @@ namespace Http Response response; response.body = std::move(body); - response.status = (Status)statusCode; + response.status = static_cast(statusCode); auto it = headers.find("Content-Type"); if (it != headers.end()) {