FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simgear/io/HTTPRepository.cxx: fixed some compiler warnings.

Browse Source
This commit is contained in:
Julian Smith 2021-05-26 10:17:23 +01:00
parent f9b485a915
commit 3ba8c383b4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/io/HTTPRepository.cxx
View File

@ -241,11 +241,11 @@ public:
src.open(SG_IO_IN); src.open(SG_IO_IN);
dst.open(SG_IO_OUT); dst.open(SG_IO_OUT);
const auto sizeToCopy = cp.sizeInBytes(); const size_t sizeToCopy = cp.sizeInBytes();
if (buf.size() < sizeToCopy) { if (buf.size() < sizeToCopy) {
try { try {
buf.resize(sizeToCopy); buf.resize(sizeToCopy);
} catch (std::bad_alloc) { } catch (std::bad_alloc&) {
simgear::reportFailure(simgear::LoadFailure::OutOfMemory, simgear::ErrorCode::TerraSync, simgear::reportFailure(simgear::LoadFailure::OutOfMemory, simgear::ErrorCode::TerraSync,
"copyInstalledChildren: couldn't allocation copy buffer of size:" + std::to_string(sizeToCopy), "copyInstalledChildren: couldn't allocation copy buffer of size:" + std::to_string(sizeToCopy),
child.path); child.path);
@ -253,7 +253,7 @@ public:
} }
} }
const auto r = src.read(buf.data(), sizeToCopy); const size_t r = (size_t) src.read(buf.data(), sizeToCopy);
if (r != sizeToCopy) { if (r != sizeToCopy) {
simgear::reportFailure(simgear::LoadFailure::IOError, simgear::ErrorCode::TerraSync, simgear::reportFailure(simgear::LoadFailure::IOError, simgear::ErrorCode::TerraSync,
"copyInstalledChildren: read underflow, got:" + std::to_string(r), "copyInstalledChildren: read underflow, got:" + std::to_string(r),
@ -261,7 +261,7 @@ public:
return; return;
} }
const auto written = dst.write(buf.data(), sizeToCopy); const size_t written = dst.write(buf.data(), sizeToCopy);
if (written != sizeToCopy) { if (written != sizeToCopy) {
simgear::reportFailure(simgear::LoadFailure::IOError, simgear::ErrorCode::TerraSync, simgear::reportFailure(simgear::LoadFailure::IOError, simgear::ErrorCode::TerraSync,
"copyInstalledChildren: write underflow, wrote:" + std::to_string(r), "copyInstalledChildren: write underflow, wrote:" + std::to_string(r),