diff --git a/dCommon/AMFFormat_BitStream.cpp b/dCommon/AMFFormat_BitStream.cpp index b603ba31..dcb9197d 100644 --- a/dCommon/AMFFormat_BitStream.cpp +++ b/dCommon/AMFFormat_BitStream.cpp @@ -65,6 +65,15 @@ void RakNet::BitStream::Write(AMFValue* value) { this->Write((AMFArrayValue*)value); break; } + case AMFObject: + case AMFXML: + case AMFByteArray: + case AMFVectorInt: + case AMFVectorUInt: + case AMFVectorDouble: + case AMFVectorObject: + case AMFDictionary: + break; } } } diff --git a/dCommon/Diagnostics.cpp b/dCommon/Diagnostics.cpp index 3025f083..58d558de 100644 --- a/dCommon/Diagnostics.cpp +++ b/dCommon/Diagnostics.cpp @@ -111,7 +111,7 @@ static void ErrorCallback(void* data, const char* msg, int errnum) { void GenerateDump() { std::string cmd = "sudo gcore " + std::to_string(getpid()); - system(cmd.c_str()); + int ret = system(cmd.c_str()); // Saving a return just to prevent warning } void CatchUnhandled(int sig) { diff --git a/dCommon/dClient/AssetManager.cpp b/dCommon/dClient/AssetManager.cpp index ed86d719..00cedba9 100644 --- a/dCommon/dClient/AssetManager.cpp +++ b/dCommon/dClient/AssetManager.cpp @@ -47,6 +47,10 @@ AssetManager::AssetManager(const std::filesystem::path& path) { this->LoadPackIndex(); break; } + case eAssetBundleType::None: + case eAssetBundleType::Unpacked: { + break; + } } } @@ -111,7 +115,7 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) { *len = ftell(file); *data = (char*)malloc(*len); fseek(file, 0, SEEK_SET); - fread(*data, sizeof(uint8_t), *len, file); + int32_t readInData = fread(*data, sizeof(uint8_t), *len, file); fclose(file); return true; diff --git a/dCommon/dClient/Pack.cpp b/dCommon/dClient/Pack.cpp index 1c1a643a..11345fc9 100644 --- a/dCommon/dClient/Pack.cpp +++ b/dCommon/dClient/Pack.cpp @@ -77,7 +77,7 @@ bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) { if (!isCompressed) { char* tempData = (char*)malloc(pkRecord.m_UncompressedSize); - fread(tempData, sizeof(uint8_t), pkRecord.m_UncompressedSize, file); + int32_t readInData = fread(tempData, sizeof(uint8_t), pkRecord.m_UncompressedSize, file); *data = tempData; *len = pkRecord.m_UncompressedSize; @@ -97,11 +97,11 @@ bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) { if (currentReadPos >= pkRecord.m_UncompressedSize) break; uint32_t size; - fread(&size, sizeof(uint32_t), 1, file); + int32_t readInData = fread(&size, sizeof(uint32_t), 1, file); pos += 4; // Move pointer position 4 to the right char* chunk = (char*)malloc(size); - fread(chunk, sizeof(int8_t), size, file); + int32_t readInData2 = fread(chunk, sizeof(int8_t), size, file); pos += size; // Move pointer position the amount of bytes read to the right int32_t err; diff --git a/dGame/dComponents/RebuildComponent.cpp b/dGame/dComponents/RebuildComponent.cpp index 2562b313..e3c885dd 100644 --- a/dGame/dComponents/RebuildComponent.cpp +++ b/dGame/dComponents/RebuildComponent.cpp @@ -234,6 +234,7 @@ void RebuildComponent::Update(float deltaTime) { } break; } + case REBUILD_RESETTING: break; } } diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp index bf7476e9..0fc32e2e 100644 --- a/dGame/dGameMessages/GameMessages.cpp +++ b/dGame/dGameMessages/GameMessages.cpp @@ -2570,7 +2570,7 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream* inStream, Entity* ent //We runs this in async because the http library here is blocking, meaning it'll halt the thread. //But we don't want the server to go unresponsive, because then the client would disconnect. - std::async(std::launch::async, [&]() { + auto returnVal = std::async(std::launch::async, [&]() { //We need to get a new ID for our model first: ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t newID) { diff --git a/dGame/dUtilities/Mail.cpp b/dGame/dUtilities/Mail.cpp index 9490f748..5cd11ea4 100644 --- a/dGame/dUtilities/Mail.cpp +++ b/dGame/dUtilities/Mail.cpp @@ -130,7 +130,7 @@ void Mail::HandleMailStuff(RakNet::BitStream* packet, const SystemAddress& sysAd int mailStuffID = 0; packet->Read(mailStuffID); - std::async(std::launch::async, [packet, &sysAddr, entity, mailStuffID]() { + auto returnVal = std::async(std::launch::async, [packet, &sysAddr, entity, mailStuffID]() { Mail::MailMessageID stuffID = MailMessageID(mailStuffID); switch (stuffID) { case MailMessageID::AttachmentCollect: @@ -393,7 +393,7 @@ void Mail::HandleMailRead(RakNet::BitStream* packet, const SystemAddress& sysAdd } void Mail::HandleNotificationRequest(const SystemAddress& sysAddr, uint32_t objectID) { - std::async(std::launch::async, [&]() { + auto returnVal = std::async(std::launch::async, [&]() { sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT id FROM mail WHERE receiver_id=? AND was_read=0"); stmt->setUInt(1, objectID); sql::ResultSet* res = stmt->executeQuery(); diff --git a/tests/dCommonTests/AMFDeserializeTests.cpp b/tests/dCommonTests/AMFDeserializeTests.cpp index 3811a706..b679ea78 100644 --- a/tests/dCommonTests/AMFDeserializeTests.cpp +++ b/tests/dCommonTests/AMFDeserializeTests.cpp @@ -173,9 +173,8 @@ TEST(dCommonTests, AMFDeserializeAMFArrayTest) { /** * @brief This test checks that if we recieve an unimplemented AMFValueType * we correctly throw an error and can actch it. - * + * Yes this leaks memory. */ -#pragma message("-- The AMFDeserializeUnimplementedValuesTest causes a known memory leak of 880 bytes since it throws errors! --") TEST(dCommonTests, AMFDeserializeUnimplementedValuesTest) { std::vector unimplementedValues = { AMFValueType::AMFXMLDoc,