Fix various warnnigs messages.

Close cmangos/issues#786 (based on cmangos/mangos-wotlk@cf77ece)
cmangos · Nov 4, 2015 · 60ede89 · 60ede89
1 parent d838b4b
commit 60ede89
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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(nullptr);
 
         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
@@ -20203,7 +20203,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
@@ -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
@@ -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
@@ -72,6 +72,6 @@ void BitStream::Print()
     for (uint32 i = 0; i < GetLength(); ++i)
         ss << uint32(GetBit(i)) << " ";
 
-    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
@@ -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);
 }