mirror of
https://github.com/yuzu-emu/breakpad.git
synced 2025-02-03 02:41:06 +00:00
Fix up warnings when building http_upload.cc. Changed warning level to /W4, and also turned off deprecated 64-bit compatability warning flag(since some people are regularly building Breakpad in 64-bit mode, if we turn off this flag we get rid of a warning in 32 bit mode under VS2008)
R=mmentovai A=nealsid git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@340 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
parent
bec07f6972
commit
2a4698319a
|
@ -46,8 +46,8 @@
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="4"
|
||||||
Detect64BitPortabilityProblems="true"
|
Detect64BitPortabilityProblems="false"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
// Disable exception handler warnings.
|
// Disable exception handler warnings.
|
||||||
#pragma warning( disable : 4530 )
|
#pragma warning( disable : 4530 )
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
|
@ -211,17 +211,19 @@ bool HTTPUpload::ReadResponse(HINTERNET request, wstring *response) {
|
||||||
|
|
||||||
DWORD bytes_available;
|
DWORD bytes_available;
|
||||||
DWORD total_read = 0;
|
DWORD total_read = 0;
|
||||||
bool return_code;
|
BOOL return_code;
|
||||||
|
|
||||||
|
while (((return_code = InternetQueryDataAvailable(request, &bytes_available,
|
||||||
|
0, 0)) != 0) && bytes_available > 0) {
|
||||||
|
|
||||||
while ((return_code = InternetQueryDataAvailable(request, &bytes_available,
|
|
||||||
0, 0) != 0) &&
|
|
||||||
bytes_available > 0) {
|
|
||||||
vector<char> response_buffer(bytes_available);
|
vector<char> response_buffer(bytes_available);
|
||||||
DWORD size_read;
|
DWORD size_read;
|
||||||
|
|
||||||
if ((return_code = InternetReadFile(request, &response_buffer[0],
|
return_code = InternetReadFile(request,
|
||||||
bytes_available, &size_read) != 0) &&
|
&response_buffer[0],
|
||||||
size_read > 0) {
|
bytes_available, &size_read);
|
||||||
|
|
||||||
|
if (return_code && size_read > 0) {
|
||||||
total_read += size_read;
|
total_read += size_read;
|
||||||
response_body.append(&response_buffer[0], size_read);
|
response_body.append(&response_buffer[0], size_read);
|
||||||
} else {
|
} else {
|
||||||
|
@ -333,7 +335,7 @@ void HTTPUpload::GetFileContents(const wstring &filename,
|
||||||
#endif // _MSC_VER >= 1400
|
#endif // _MSC_VER >= 1400
|
||||||
if (file.is_open()) {
|
if (file.is_open()) {
|
||||||
file.seekg(0, ios::end);
|
file.seekg(0, ios::end);
|
||||||
int length = file.tellg();
|
std::streamoff length = file.tellg();
|
||||||
contents->resize(length);
|
contents->resize(length);
|
||||||
if (length != 0) {
|
if (length != 0) {
|
||||||
file.seekg(0, ios::beg);
|
file.seekg(0, ios::beg);
|
||||||
|
|
Loading…
Reference in a new issue