aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2023-01-31 18:51:31 +0100
committerShauren <shauren.trinity@gmail.com>2023-01-31 18:51:31 +0100
commit7395d75b5adfd89085b78b17feb726ad9266715f (patch)
tree67cbfb38c406f796c21db31527dca73c5077a957 /src
parent74dc88eb54751d5cd3eb8c379cdf9b2bdbbaa1ec (diff)
Core/Misc: Fixed clang 15 warnings
Diffstat (limited to 'src')
-rw-r--r--src/common/Cryptography/CryptoHash.h1
-rw-r--r--src/common/DataStores/DB2FileLoader.cpp3
-rw-r--r--src/common/Threading/MPSCQueue.h2
-rw-r--r--src/common/Utilities/Util.h2
-rw-r--r--src/server/game/DataStores/DB2Stores.cpp2
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp6
-rw-r--r--src/server/game/Handlers/VoidStorageHandler.cpp5
-rw-r--r--src/server/game/Spells/SpellEffects.cpp4
-rw-r--r--src/server/scripts/Commands/cs_gm.cpp2
-rw-r--r--src/server/scripts/Kalimdor/zone_silithus.cpp6
-rw-r--r--src/server/shared/DataStores/DB2DatabaseLoader.cpp2
11 files changed, 9 insertions, 26 deletions
diff --git a/src/common/Cryptography/CryptoHash.h b/src/common/Cryptography/CryptoHash.h
index e31578a8f46..cb7e5716e66 100644
--- a/src/common/Cryptography/CryptoHash.h
+++ b/src/common/Cryptography/CryptoHash.h
@@ -24,6 +24,7 @@
#include <array>
#include <string>
#include <string_view>
+#include <utility>
#include <openssl/evp.h>
class BigNumber;
diff --git a/src/common/DataStores/DB2FileLoader.cpp b/src/common/DataStores/DB2FileLoader.cpp
index f9bf392bdfd..f15864e4c7b 100644
--- a/src/common/DataStores/DB2FileLoader.cpp
+++ b/src/common/DataStores/DB2FileLoader.cpp
@@ -1075,7 +1075,6 @@ char* DB2FileLoaderSparseImpl::AutoProduceData(uint32& indexTableSize, char**& i
memset(dataTable, 0, (records + _copyTable.size()) * recordsize);
uint32 offset = 0;
- uint32 recordNum = 0;
uint32 y = 0;
for (uint32 section = 0; section < _header->SectionCount; ++section)
@@ -1176,8 +1175,6 @@ char* DB2FileLoaderSparseImpl::AutoProduceData(uint32& indexTableSize, char**& i
++fieldIndex;
}
}
-
- ++recordNum;
}
}
diff --git a/src/common/Threading/MPSCQueue.h b/src/common/Threading/MPSCQueue.h
index ee58eb96b29..c4f95b80c5c 100644
--- a/src/common/Threading/MPSCQueue.h
+++ b/src/common/Threading/MPSCQueue.h
@@ -96,7 +96,7 @@ class MPSCQueueIntrusive
using Atomic = std::atomic<T*>;
public:
- MPSCQueueIntrusive() : _dummyPtr(reinterpret_cast<T*>(_dummy.data())), _head(_dummyPtr), _tail(_dummyPtr)
+ MPSCQueueIntrusive() : _dummy(), _dummyPtr(reinterpret_cast<T*>(_dummy.data())), _head(_dummyPtr), _tail(_dummyPtr)
{
// _dummy is constructed from raw byte array and is intentionally left uninitialized (it might not be default constructible)
// so we init only its IntrusiveLink here
diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h
index 57523ca558f..3fc09f65792 100644
--- a/src/common/Utilities/Util.h
+++ b/src/common/Utilities/Util.h
@@ -52,7 +52,9 @@ namespace Trinity
TC_COMMON_API Optional<int64> MoneyStringToMoney(std::string const& moneyString);
+#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))
TC_COMMON_API struct tm* localtime_r(time_t const* time, struct tm *result);
+#endif
TC_COMMON_API time_t LocalTimeToUTCTime(time_t time);
TC_COMMON_API time_t GetLocalHourTimestamp(time_t time, uint8 hour, bool onlyAfterTime = true);
TC_COMMON_API tm TimeBreakdown(time_t t);
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp
index 0f5a48d5bef..d57b0842b71 100644
--- a/src/server/game/DataStores/DB2Stores.cpp
+++ b/src/server/game/DataStores/DB2Stores.cpp
@@ -1686,7 +1686,7 @@ void DB2Manager::LoadHotfixData()
if (DB2StorageBase* store = Trinity::Containers::MapGetValuePtr(_stores, itr->first.first))
store->EraseRecord(itr->first.second);
- TC_LOG_INFO("server.loading", ">> Loaded {} hotfix records in {} ms", _hotfixData.size(), GetMSTimeDiffToNow(oldMSTime));
+ TC_LOG_INFO("server.loading", ">> Loaded {} hotfix records in {} ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void DB2Manager::LoadHotfixBlob(uint32 localeMask)
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 30ebd249e71..86d1bfafbf2 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -3343,7 +3343,6 @@ struct ItemSpecStats
void ObjectMgr::LoadItemTemplates()
{
uint32 oldMSTime = getMSTime();
- uint32 sparseCount = 0;
for (ItemSparseEntry const* sparse : sItemSparseStore)
{
@@ -3421,8 +3420,6 @@ void ObjectMgr::LoadItemTemplates()
for (auto& specs : itemTemplate.Specializations)
if (specs.count() == 0)
specs.set();
-
- ++sparseCount;
}
// Load item effects (spells)
@@ -10680,7 +10677,6 @@ void ObjectMgr::LoadRaceAndClassExpansionRequirements()
if (result)
{
- uint32 count = 0;
do
{
Field* fields = result->Fetch();
@@ -10711,8 +10707,6 @@ void ObjectMgr::LoadRaceAndClassExpansionRequirements()
RaceUnlockRequirement& raceUnlockRequirement = _raceUnlockRequirementStore[raceID];
raceUnlockRequirement.Expansion = expansion;
raceUnlockRequirement.AchievementId = achievementId;
-
- ++count;
}
while (result->NextRow());
TC_LOG_INFO("server.loading", ">> Loaded {} race expansion requirements in {} ms.", _raceUnlockRequirementStore.size(), GetMSTimeDiffToNow(oldMSTime));
diff --git a/src/server/game/Handlers/VoidStorageHandler.cpp b/src/server/game/Handlers/VoidStorageHandler.cpp
index 381c377a028..e48f55ee3e3 100644
--- a/src/server/game/Handlers/VoidStorageHandler.cpp
+++ b/src/server/game/Handlers/VoidStorageHandler.cpp
@@ -66,11 +66,6 @@ void WorldSession::HandleVoidStorageQuery(WorldPackets::VoidStorage::QueryVoidSt
return;
}
- uint8 count = 0;
- for (uint8 i = 0; i < VOID_STORAGE_MAX_SLOT; ++i)
- if (_player->GetVoidStorageItem(i))
- ++count;
-
WorldPackets::VoidStorage::VoidStorageContents voidStorageContents;
voidStorageContents.Items.reserve(VOID_STORAGE_MAX_SLOT);
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index a9d38f7578c..780445220f1 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -2059,7 +2059,6 @@ void Spell::EffectDispel()
size_t remaining = dispelList.size();
// Ok if exist some buffs for dispel try dispel it
- uint32 failCount = 0;
DispelChargesList successList;
successList.reserve(damage);
@@ -2102,7 +2101,6 @@ void Spell::EffectDispel()
}
else
{
- ++failCount;
dispelFailed.FailedSpells.push_back(int32(itr->GetAura()->GetId()));
}
++count;
@@ -4567,7 +4565,6 @@ void Spell::EffectStealBeneficialBuff()
size_t remaining = stealList.size();
// Ok if exist some buffs for dispel try dispel it
- uint32 failCount = 0;
std::vector<std::tuple<uint32, ObjectGuid, int32>> successList;
successList.reserve(damage);
@@ -4598,7 +4595,6 @@ void Spell::EffectStealBeneficialBuff()
}
else
{
- ++failCount;
dispelFailed.FailedSpells.push_back(int32(itr->GetAura()->GetId()));
}
++count;
diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp
index 54078045b85..d4b644ec62f 100644
--- a/src/server/scripts/Commands/cs_gm.cpp
+++ b/src/server/scripts/Commands/cs_gm.cpp
@@ -120,7 +120,7 @@ public:
bool footer = false;
std::shared_lock<std::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
- for (auto const [playerGuid, player] : ObjectAccessor::GetPlayers())
+ for (auto&& [playerGuid, player] : ObjectAccessor::GetPlayers())
{
AccountTypes playerSec = player->GetSession()->GetSecurity();
if ((player->IsGameMaster() ||
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index 8f72488bd3f..fee121eb877 100644
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -879,7 +879,7 @@ public:
Player* groupMember = nullptr;
uint8 GroupMemberCount = 0;
- uint8 DeadMemberCount = 0;
+ //uint8 DeadMemberCount = 0;
uint8 FailedMemberCount = 0;
Group::MemberSlotList const& members = EventGroup->GetMemberSlots();
@@ -896,8 +896,8 @@ public:
}
++GroupMemberCount;
- if (groupMember->isDead())
- ++DeadMemberCount;
+ //if (groupMember->isDead())
+ // ++DeadMemberCount;
}
if (GroupMemberCount == FailedMemberCount || !player->IsWithinDistInMap(me, EVENT_AREA_RADIUS))
diff --git a/src/server/shared/DataStores/DB2DatabaseLoader.cpp b/src/server/shared/DataStores/DB2DatabaseLoader.cpp
index c34950aab01..6513c740809 100644
--- a/src/server/shared/DataStores/DB2DatabaseLoader.cpp
+++ b/src/server/shared/DataStores/DB2DatabaseLoader.cpp
@@ -65,7 +65,6 @@ char* DB2DatabaseLoader::Load(bool custom, uint32& records, char**& indexTable,
if (stringFields)
stringPool.reserve(std::max<uint64>(stringPool.capacity(), stringPool.size() + stringFields * result->GetRowCount() + 1));
- uint32 rec = 0;
uint32 newRecords = 0;
do
@@ -156,7 +155,6 @@ char* DB2DatabaseLoader::Load(bool custom, uint32& records, char**& indexTable,
}
ASSERT(offset == recordSize);
- ++rec;
} while (result->NextRow());
if (!newRecords)