diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index fa6774c49f3..3f1002946f3 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -6,6 +6,9 @@ if(WARNINGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual") message(STATUS "Clang: All warnings enabled") +else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused*result") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result") endif() if(DEBUG) diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index a6192557eba..52f5cfa8cfe 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -6,7 +6,11 @@ if(PLATFORM EQUAL X86) set(SSE_FLAGS "-msse2 -mfpmath=sse") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}") +else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused*result") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result") endif() + add_definitions(-DHAVE_SSE2) message(STATUS "GCC: SFMT enabled, SSE2 flags forced") diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp index 5463342e655..0a63808e49f 100644 --- a/src/game/CalendarHandler.cpp +++ b/src/game/CalendarHandler.cpp @@ -44,7 +44,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/) sCalendarMgr.GetPlayerInvitesList(guid, invites); data << uint32(invites.size()); - DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Sending > %u invites", invites.size()); + DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Sending > %u invites", uint32(invites.size())); for (CalendarInvitesList::const_iterator itr = invites.begin(); itr != invites.end(); ++itr) { @@ -66,7 +66,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/) sCalendarMgr.GetPlayerEventsList(guid, events); data << uint32(events.size()); - DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Sending > %u events", events.size()); + DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Sending > %u events", uint32(events.size())); for (CalendarEventsList::const_iterator itr = events.begin(); itr != events.end(); ++itr) { @@ -368,7 +368,7 @@ void WorldSession::HandleCalendarUpdateEvent(WorldPacket& recv_data) CharacterDatabase.PExecute("UPDATE calendar_events SET " "type=%hu, flags=%u, dungeonId=%d, eventTime=%u, title='%s', description='%s'" "WHERE eventid=" UI64FMTD, - type, flags, dungeonId, event->EventTime, title.c_str(), description.c_str(), eventId); + type, flags, dungeonId, uint32(event->EventTime), title.c_str(), description.c_str(), eventId); } else sCalendarMgr.SendCalendarCommandResult(_player, CALENDAR_ERROR_EVENT_INVALID); @@ -510,7 +510,7 @@ void WorldSession::HandleCalendarEventInvite(WorldPacket& recv_data) invite.LastUpdateTime = time(NULL); sCalendarMgr.SendCalendarEventInvite(&invite); - DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "PREINVITE> sender[%s], Invitee[%u]", playerGuid.GetString().c_str(), inviteeGuid.GetString().c_str()); + DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "PREINVITE> sender[%s], Invitee[%s]", playerGuid.GetString().c_str(), inviteeGuid.GetString().c_str()); } } diff --git a/src/game/Player.cpp b/src/game/Player.cpp index b36cc6b695d..6cf33ea1b8b 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -20225,7 +20225,7 @@ void Player::SendTransferAbortedByLockStatus(MapEntry const* mapEntry, AreaLockS case AREA_LOCKSTATUS_QUEST_NOT_COMPLETED: if (mapEntry->MapID == 269) // Exception for Black Morass { - GetSession()->SendAreaTriggerMessage(GetSession()->GetMangosString(LANG_TELEREQ_QUEST_BLACK_MORASS)); + GetSession()->SendAreaTriggerMessage("%s", GetSession()->GetMangosString(LANG_TELEREQ_QUEST_BLACK_MORASS)); break; } else if (mapEntry->IsContinent()) // do not report anything for quest areatrigge diff --git a/src/scriptdev2/base/escort_ai.cpp b/src/scriptdev2/base/escort_ai.cpp index eec66678b14..c6e7cb34b99 100644 --- a/src/scriptdev2/base/escort_ai.cpp +++ b/src/scriptdev2/base/escort_ai.cpp @@ -40,7 +40,7 @@ void npc_escortAI::GetAIInformation(ChatHandler& reader) m_creature->GetMotionMaster()->GetWaypointPathInformation(oss); } - reader.PSendSysMessage(oss.str().c_str()); + reader.PSendSysMessage("%s", oss.str().c_str()); } bool npc_escortAI::IsVisible(Unit* pWho) const diff --git a/src/scriptdev2/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/scriptdev2/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index 2f3578a7b3f..196b14ac256 100644 --- a/src/scriptdev2/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/scriptdev2/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -68,7 +68,7 @@ struct npc_anubisath_sentinelAI : public ScriptedAI if (m_lAssistList.size() == MAX_BUDDY) reader.PSendSysMessage("Anubisath Sentinel - proper group found"); else - reader.PSendSysMessage("Anubisath Sentinel - not correct number of mobs for group found. Number found %u, should be %u", m_lAssistList.size(), MAX_BUDDY); + reader.PSendSysMessage("Anubisath Sentinel - not correct number of mobs for group found. Number found %u, should be %u", uint32(m_lAssistList.size()), MAX_BUDDY); } void JustReachedHome() override diff --git a/src/shared/ByteBuffer.cpp b/src/shared/ByteBuffer.cpp index e74b6694513..8135ba0725b 100644 --- a/src/shared/ByteBuffer.cpp +++ b/src/shared/ByteBuffer.cpp @@ -51,7 +51,7 @@ void ByteBuffer::print_storage() const for (size_t i = 0; i < size(); ++i) ss << uint32(read(i)) << " - "; - sLog.outDebug(ss.str().c_str()); + sLog.outDebug("%s", ss.str().c_str()); } void ByteBuffer::textlike() const @@ -68,7 +68,7 @@ void ByteBuffer::textlike() const for (size_t i = 0; i < size(); ++i) ss << read(i); - sLog.outDebug(ss.str().c_str()); + sLog.outDebug("%s", ss.str().c_str()); } void ByteBuffer::hexlike() const @@ -107,5 +107,5 @@ void ByteBuffer::hexlike() const ss << buf << " "; } - sLog.outDebug(ss.str().c_str()); + sLog.outDebug("%s", ss.str().c_str()); } diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp index c171ab7f273..75dc5e548e8 100644 --- a/src/shared/Database/SQLStorage.cpp +++ b/src/shared/Database/SQLStorage.cpp @@ -156,7 +156,7 @@ void SQLStorage::prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 re // Set index array m_Index = new char* [maxRecordId]; - memset(m_Index, NULL, maxRecordId * sizeof(char*)); + memset(m_Index, 0, maxRecordId * sizeof(char*)); SQLStorageBase::prepareToLoad(maxRecordId, recordCount, recordSize); }