From f4482f247ffa78a798f54735589979fb87b3369a Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Tue, 24 Mar 2009 06:02:49 +0300 Subject: [PATCH] [7532] Avoid warnings at use size_t with printf fromat strings. --- src/game/AchievementMgr.cpp | 8 ++++---- src/game/AuctionHouseHandler.cpp | 2 +- src/game/Guild.cpp | 2 +- src/game/LootHandler.cpp | 2 +- src/game/LootMgr.cpp | 2 +- src/game/ObjectMgr.cpp | 26 +++++++++++++------------- src/game/SpellHandler.cpp | 6 +++--- src/game/Transports.cpp | 2 +- src/shared/ByteBuffer.h | 8 ++++---- src/shared/Database/DBCStores.cpp | 2 +- src/shared/Database/SqlOperations.cpp | 2 +- src/shared/revision_nr.h | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index a56265ad1..eff4e4101 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -1310,7 +1310,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList() } sLog.outString(); - sLog.outString(">> Loaded %u achievement criteria.",m_AchievementCriteriasByType->size()); + sLog.outString(">> Loaded %lu achievement criteria.",(unsigned long)m_AchievementCriteriasByType->size()); } @@ -1339,7 +1339,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements() delete result; sLog.outString(); - sLog.outString(">> Loaded %u realm completed achievements.",m_allCompletedAchievements.size()); + sLog.outString(">> Loaded %lu realm completed achievements.",(unsigned long)m_allCompletedAchievements.size()); } void AchievementGlobalMgr::LoadRewards() @@ -1449,7 +1449,7 @@ void AchievementGlobalMgr::LoadRewards() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u achievement reward locale strings", m_achievementRewardLocales.size() ); + sLog.outString( ">> Loaded %lu achievement reward locale strings", (unsigned long)m_achievementRewardLocales.size() ); } void AchievementGlobalMgr::LoadRewardLocales() @@ -1518,5 +1518,5 @@ void AchievementGlobalMgr::LoadRewardLocales() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u achievement reward locale strings", m_achievementRewardLocales.size() ); + sLog.outString( ">> Loaded %lu achievement reward locale strings", (unsigned long)m_achievementRewardLocales.size() ); } diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp index d12018fb1..f957a7b60 100644 --- a/src/game/AuctionHouseHandler.cpp +++ b/src/game/AuctionHouseHandler.cpp @@ -493,7 +493,7 @@ void WorldSession::HandleAuctionListBidderItems( WorldPacket & recv_data ) recv_data >> outbiddedCount; if (recv_data.size() != (16 + outbiddedCount * 4 )) { - sLog.outError("Client sent bad opcode!!! with count: %u and size : %d (mustbe: %d", outbiddedCount, recv_data.size(),(16 + outbiddedCount * 4 )); + sLog.outError("Client sent bad opcode!!! with count: %u and size : %lu (must be: %u)", outbiddedCount, (unsigned long)recv_data.size(),(16 + outbiddedCount * 4 )); outbiddedCount = 0; } diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index a13fc049d..d49b6bf2b 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -596,7 +596,7 @@ void Guild::CreateRank(std::string name_,uint32 rights) // name now can be used for encoding to DB CharacterDatabase.escape_string(name_); - CharacterDatabase.PExecute( "INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", Id, m_ranks.size(), name_.c_str(), rights ); + CharacterDatabase.PExecute( "INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", Id, (unsigned int)m_ranks.size(), name_.c_str(), rights ); } void Guild::AddRank(const std::string& name_,uint32 rights, uint32 money) diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp index 5c5d02699..254f1978f 100644 --- a/src/game/LootHandler.cpp +++ b/src/game/LootHandler.cpp @@ -478,7 +478,7 @@ void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data ) if (slotid > pLoot->items.size()) { - sLog.outDebug("AutoLootItem: Player %s might be using a hack! (slot %d, size %d)",GetPlayer()->GetName(), slotid, pLoot->items.size()); + sLog.outDebug("AutoLootItem: Player %s might be using a hack! (slot %d, size %lu)",GetPlayer()->GetName(), slotid, (unsigned long)pLoot->items.size()); return; } diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index a190a058a..0eba205f2 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -166,7 +166,7 @@ void LootStore::LoadLootTable() Verify(); // Checks validity of the loot store sLog.outString(); - sLog.outString( ">> Loaded %u loot definitions (%d templates)", count, m_LootTemplates.size()); + sLog.outString( ">> Loaded %u loot definitions (%lu templates)", count, (unsigned long)m_LootTemplates.size()); } else { diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 5b5c7ddc4..0a556f35d 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -322,7 +322,7 @@ void ObjectMgr::LoadCreatureLocales() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u creature locale strings", mCreatureLocaleMap.size() ); + sLog.outString( ">> Loaded %lu creature locale strings", (unsigned long)mCreatureLocaleMap.size() ); } void ObjectMgr::LoadNpcOptionLocales() @@ -390,7 +390,7 @@ void ObjectMgr::LoadNpcOptionLocales() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u npc_option locale strings", mNpcOptionLocaleMap.size() ); + sLog.outString( ">> Loaded %lu npc_option locale strings", (unsigned long)mNpcOptionLocaleMap.size() ); } void ObjectMgr::LoadPointOfInterestLocales() @@ -441,7 +441,7 @@ void ObjectMgr::LoadPointOfInterestLocales() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u points_of_interest locale strings", mPointOfInterestLocaleMap.size() ); + sLog.outString( ">> Loaded %lu points_of_interest locale strings", (unsigned long)mPointOfInterestLocaleMap.size() ); } struct SQLCreatureLoader : public SQLStorageLoaderBase @@ -981,7 +981,7 @@ void ObjectMgr::LoadCreatures() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u creatures", mCreatureDataMap.size() ); + sLog.outString( ">> Loaded %lu creatures", (unsigned long)mCreatureDataMap.size() ); } void ObjectMgr::AddCreatureToGrid(uint32 guid, CreatureData const* data) @@ -1108,7 +1108,7 @@ void ObjectMgr::LoadGameobjects() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u gameobjects", mGameObjectDataMap.size()); + sLog.outString( ">> Loaded %lu gameobjects", (unsigned long)mGameObjectDataMap.size()); } void ObjectMgr::AddGameobjectToGrid(uint32 guid, GameObjectData const* data) @@ -1181,7 +1181,7 @@ void ObjectMgr::LoadCreatureRespawnTimes() delete result; - sLog.outString( ">> Loaded %u creature respawn times", mCreatureRespawnTimes.size() ); + sLog.outString( ">> Loaded %lu creature respawn times", (unsigned long)mCreatureRespawnTimes.size() ); sLog.outString(); } @@ -1223,7 +1223,7 @@ void ObjectMgr::LoadGameobjectRespawnTimes() delete result; - sLog.outString( ">> Loaded %u gameobject respawn times", mGORespawnTimes.size() ); + sLog.outString( ">> Loaded %lu gameobject respawn times", (unsigned long)mGORespawnTimes.size() ); sLog.outString(); } @@ -1368,7 +1368,7 @@ void ObjectMgr::LoadItemLocales() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u Item locale strings", mItemLocaleMap.size() ); + sLog.outString( ">> Loaded %lu Item locale strings", (unsigned long)mItemLocaleMap.size() ); } struct SQLItemLoader : public SQLStorageLoaderBase @@ -3411,7 +3411,7 @@ void ObjectMgr::LoadQuests() } sLog.outString(); - sLog.outString( ">> Loaded %u quests definitions", mQuestTemplates.size() ); + sLog.outString( ">> Loaded %lu quests definitions", (unsigned long)mQuestTemplates.size() ); } void ObjectMgr::LoadQuestLocales() @@ -3547,7 +3547,7 @@ void ObjectMgr::LoadQuestLocales() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u Quest locale strings", mQuestLocaleMap.size() ); + sLog.outString( ">> Loaded %lu Quest locale strings", (unsigned long)mQuestLocaleMap.size() ); } void ObjectMgr::LoadPetCreateSpells() @@ -4097,7 +4097,7 @@ void ObjectMgr::LoadPageTextLocales() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u PageText locale strings", mPageTextLocaleMap.size() ); + sLog.outString( ">> Loaded %lu PageText locale strings", (unsigned long)mPageTextLocaleMap.size() ); } struct SQLInstanceLoader : public SQLStorageLoaderBase @@ -4292,7 +4292,7 @@ void ObjectMgr::LoadNpcTextLocales() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u NpcText locale strings", mNpcTextLocaleMap.size() ); + sLog.outString( ">> Loaded %lu NpcText locale strings", (unsigned long)mNpcTextLocaleMap.size() ); } //not very fast function but it is called only once a day, or on starting-up @@ -5361,7 +5361,7 @@ void ObjectMgr::LoadGameObjectLocales() delete result; sLog.outString(); - sLog.outString( ">> Loaded %u gameobject locale strings", mGameObjectLocaleMap.size() ); + sLog.outString( ">> Loaded %lu gameobject locale strings", (unsigned long)mGameObjectLocaleMap.size() ); } struct SQLGameObjectLoader : public SQLStorageLoaderBase diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index 89ce47123..46b861b69 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -56,7 +56,7 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) return; } - sLog.outDetail("WORLD: CMSG_USE_ITEM packet, bagIndex: %u, slot: %u, cast_count: %u, spellid: %u, Item: %u, glyphIndex: %u, unk_flags: %u, data length = %i", bagIndex, slot, cast_count, spellid, pItem->GetEntry(), glyphIndex, unk_flags, recvPacket.size()); + sLog.outDetail("WORLD: CMSG_USE_ITEM packet, bagIndex: %u, slot: %u, cast_count: %u, spellid: %u, Item: %u, glyphIndex: %u, unk_flags: %u, data length = %i", bagIndex, slot, cast_count, spellid, pItem->GetEntry(), glyphIndex, unk_flags, (uint32)recvPacket.size()); ItemPrototype const *proto = pItem->GetProto(); if(!proto) @@ -135,7 +135,7 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) { CHECK_PACKET_SIZE(recvPacket,1+1); - sLog.outDetail("WORLD: CMSG_OPEN_ITEM packet, data length = %i",recvPacket.size()); + sLog.outDetail("WORLD: CMSG_OPEN_ITEM packet, data length = %i",(uint32)recvPacket.size()); Player* pUser = _player; uint8 bagIndex, slot; @@ -247,7 +247,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) recvPacket >> unk_flags; // flags (if 0x02 - some additional data are received) sLog.outDebug("WORLD: got cast spell packet, spellId - %u, cast_count: %u, unk_flags %u, data length = %i", - spellId, cast_count, unk_flags, recvPacket.size()); + spellId, cast_count, unk_flags, (uint32)recvPacket.size()); SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId ); diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp index c095a8c34..0cd3b70cf 100644 --- a/src/game/Transports.cpp +++ b/src/game/Transports.cpp @@ -409,7 +409,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) uint32 timer = t; - // sLog.outDetail(" Generated %d waypoints, total time %u.", m_WayPoints.size(), timer); + // sLog.outDetail(" Generated %lu waypoints, total time %u.", (unsigned long)m_WayPoints.size(), timer); m_curr = m_WayPoints.begin(); m_curr = GetNextWayPoint(); diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h index e8f661ce4..645897677 100644 --- a/src/shared/ByteBuffer.h +++ b/src/shared/ByteBuffer.h @@ -338,7 +338,7 @@ class ByteBuffer if(!sLog.IsOutDebug()) // optimize disabled debug output return; - sLog.outDebug("STORAGE_SIZE: %u", size() ); + sLog.outDebug("STORAGE_SIZE: %lu", (unsigned long)size() ); for(uint32 i = 0; i < size(); i++) sLog.outDebugInLine("%u - ", read(i) ); sLog.outDebug(" "); @@ -349,7 +349,7 @@ class ByteBuffer if(!sLog.IsOutDebug()) // optimize disabled debug output return; - sLog.outDebug("STORAGE_SIZE: %u", size() ); + sLog.outDebug("STORAGE_SIZE: %lu", (unsigned long)size() ); for(uint32 i = 0; i < size(); i++) sLog.outDebugInLine("%c", read(i) ); sLog.outDebug(" "); @@ -361,7 +361,7 @@ class ByteBuffer return; uint32 j = 1, k = 1; - sLog.outDebug("STORAGE_SIZE: %u", size() ); + sLog.outDebug("STORAGE_SIZE: %lu", (unsigned long)size() ); if(sLog.IsIncludeTime()) sLog.outDebugInLine(" "); @@ -420,7 +420,7 @@ class ByteBuffer protected: bool PrintPosError(bool add, size_t pos, size_t esize) const { - sLog.outError("ERROR: Attempt %s in ByteBuffer (pos: %u size: %u) value with size: %u",(add ? "put" : "get"),pos, size(), esize); + sLog.outError("ERROR: Attempt %s in ByteBuffer (pos: %lu size: %lu) value with size: %lu",(add ? "put" : "get"),(unsigned long)pos, (unsigned long)size(), (unsigned long)esize); // assert must fail after function call return false; diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp index a84eada59..2396aded6 100644 --- a/src/shared/Database/DBCStores.cpp +++ b/src/shared/Database/DBCStores.cpp @@ -504,7 +504,7 @@ void LoadDBCStores(const std::string& dataPath) for(std::list::iterator i = bad_dbc_files.begin(); i != bad_dbc_files.end(); ++i) str += *i + "\n"; - sLog.outError("\nSome required *.dbc files (%u from %d) not found or not compatible:\n%s",bad_dbc_files.size(),DBCFilesCount,str.c_str()); + sLog.outError("\nSome required *.dbc files (%u from %d) not found or not compatible:\n%s",(uint32)bad_dbc_files.size(),DBCFilesCount,str.c_str()); exit(1); } diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index e42677208..a43099882 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -95,7 +95,7 @@ bool SqlQueryHolder::SetQuery(size_t index, const char *sql) { if(m_queries.size() <= index) { - sLog.outError("Query index (%u) out of range (size: %u) for query: %s",index,m_queries.size(),sql); + sLog.outError("Query index (%u) out of range (size: %u) for query: %s",index,(uint32)m_queries.size(),sql); return false; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 10a46fe5a..d7eca5059 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7531" + #define REVISION_NR "7532" #endif // __REVISION_NR_H__