From 6cf3cc82b290c8c5c8b651eaf74c8e6f766bf899 Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Wed, 4 Feb 2015 10:40:07 +0000 Subject: [PATCH] slap som,e warnings and other correction --- src/game/WorldHandlers/CalendarHandler.cpp | 2 +- src/shared/Database/SQLStorageImpl.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/game/WorldHandlers/CalendarHandler.cpp b/src/game/WorldHandlers/CalendarHandler.cpp index cde311ec7..8887b4896 100644 --- a/src/game/WorldHandlers/CalendarHandler.cpp +++ b/src/game/WorldHandlers/CalendarHandler.cpp @@ -530,7 +530,7 @@ void WorldSession::HandleCalendarEventRsvp(WorldPacket& recv_data) uint32 status; recv_data >> eventId >> inviteId >> status; - DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD "], InviteId [" UI64FMTD "], status %u", + DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "], InviteId [" UI64FMTD "], status %u", eventId, inviteId, status); if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId)) diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h index a5b7377db..7101aee48 100644 --- a/src/shared/Database/SQLStorageImpl.h +++ b/src/shared/Database/SQLStorageImpl.h @@ -276,6 +276,8 @@ void SQLStorageLoaderBase::Load(StorageClass& store case FT_NA_BYTE: storeValue((char)0, store, record, x, offset); ++x; continue; case FT_NA_FLOAT: storeValue((float)0.0f, store, record, x, offset); ++x; continue; case FT_NA_POINTER: storeValue((char const*)NULL, store, record, x, offset); ++x; continue; + default: + break; } // It is required that the input has at least as many columns set as the output requires @@ -301,6 +303,7 @@ void SQLStorageLoaderBase::Load(StorageClass& store break; default: assert(false && "unknown format character"); + break; } ++y; }