aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Cryptography/WardenKeyGeneration.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-07-21 00:33:36 +0200
committerDDuarte <dnpd.dd@gmail.com>2015-07-24 11:51:48 +0100
commitb4adf3f5dd34d8171f10a6a4ee8689286ef4d66a (patch)
tree3eb9fa5816f034fb4782c516e3c52787a39bde5b /src/server/shared/Cryptography/WardenKeyGeneration.h
parentb703d53073e72d5e50aa1d450340464804a8a611 (diff)
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176) Conflicts: cmake/compiler/msvc/settings.cmake src/server/game/DataStores/DBCStores.cpp src/server/game/Entities/GameObject/GameObject.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Object.h src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Garrison/Garrison.cpp src/server/game/Garrison/GarrisonMgr.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h src/server/game/Guilds/GuildMgr.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/QueryHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Server/Packets/ChannelPackets.h src/server/game/Server/Packets/PartyPackets.cpp src/server/game/Server/WorldSession.h src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellInfo.cpp src/server/game/Spells/SpellScript.cpp src/server/scripts/Commands/cs_list.cpp
Diffstat (limited to 'src/server/shared/Cryptography/WardenKeyGeneration.h')
-rw-r--r--src/server/shared/Cryptography/WardenKeyGeneration.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/shared/Cryptography/WardenKeyGeneration.h b/src/server/shared/Cryptography/WardenKeyGeneration.h
index 0e8a8be7e03..bfa0337d347 100644
--- a/src/server/shared/Cryptography/WardenKeyGeneration.h
+++ b/src/server/shared/Cryptography/WardenKeyGeneration.h
@@ -28,16 +28,16 @@ class SHA1Randx
public:
SHA1Randx(uint8* buff, uint32 size)
{
- uint32 taken = size/2;
+ uint32 halfSize = size / 2;
sh.Initialize();
- sh.UpdateData(buff, taken);
+ sh.UpdateData(buff, halfSize);
sh.Finalize();
memcpy(o1, sh.GetDigest(), 20);
sh.Initialize();
- sh.UpdateData(buff + taken, size - taken);
+ sh.UpdateData(buff + halfSize, size - halfSize);
sh.Finalize();
memcpy(o2, sh.GetDigest(), 20);