Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #825 Remove all warnings when compiling Ryzom

Browse source
This commit is contained in:
kervala 2011-05-26 16:07:35 +02:00
parent 9008bb14ef
commit db57bd0c11
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/misc/sha1.cpp
View file

@ -232,7 +232,7 @@ CHashKey getHMacSHA1(const uint8 *text, uint32 text_len, const uint8 *key, uint3
// Get hash // Get hash
SHA1Reset(&sha); SHA1Reset(&sha);
SHA1Input(&sha, (const uint8_t*)buffer1.c_str(), buffer1.size()); SHA1Input(&sha, (const uint8_t*)buffer1.c_str(), (uint)buffer1.size());
SHA1Result(&sha, SHA1_Key1); SHA1Result(&sha, SHA1_Key1);
CHashKey hk1 (SHA1_Key1); CHashKey hk1 (SHA1_Key1);
@ -246,7 +246,7 @@ CHashKey getHMacSHA1(const uint8 *text, uint32 text_len, const uint8 *key, uint3
// Get new hash // Get new hash
SHA1Reset(&sha); SHA1Reset(&sha);
SHA1Input(&sha, (const uint8_t*)buffer2.c_str(), buffer2.size()); SHA1Input(&sha, (const uint8_t*)buffer2.c_str(), (uint)buffer2.size());
SHA1Result(&sha, SHA1_Key2); SHA1Result(&sha, SHA1_Key2);
CHashKey hk (SHA1_Key2); CHashKey hk (SHA1_Key2);

2
code/ryzom/client/src/client_cfg.cpp
View file

@ -1942,7 +1942,7 @@ void CClientConfig::init(const string &configFileName)
// save the updated config file // save the updated config file
NLMISC::COFile configFile(configFileName, false, true, false); NLMISC::COFile configFile(configFileName, false, true, false);
configFile.serialBuffer((uint8*)contentUtf8.c_str(), contentUtf8.size()); configFile.serialBuffer((uint8*)contentUtf8.c_str(), (uint)contentUtf8.size());
configFile.close(); configFile.close();
// now we can continue loading and parsing the config file // now we can continue loading and parsing the config file