aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-20 07:58:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings

Browse source
This commit is contained in:
kaetemi 2013-09-27 01:11:19 +02:00
parent 85365fd7bb
commit 3b1d4e3915
7 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/common/src/game_share/security_check.cpp
View file

@ -43,7 +43,7 @@ void CSecurityCheckForFastDisconnection::forwardSecurityCode(NLMISC::IStream& ms
}
//
CSecurityCode CSecurityCheckForFastDisconnection::encode(char *passPhrase)
CSecurityCode CSecurityCheckForFastDisconnection::encode(const char *passPhrase)
{
if (!passPhrase)
throw Exception("Null passPhrase");
@ -56,7 +56,7 @@ CSecurityCode CSecurityCheckForFastDisconnection::encode(char *passPhrase)
}
//
void CSecurityCheckForFastDisconnection::check(char *passPhrase)
void CSecurityCheckForFastDisconnection::check(const char *passPhrase)
{
if (SecurityCode != encode(passPhrase))
throw Exception("Check not passed");

4
code/ryzom/common/src/game_share/security_check.h
View file

@ -61,9 +61,9 @@ public:
/// Set cookie
void setCookie(const NLNET::CLoginCookie& cookie) { Block.Cookie.set(cookie.getUserAddr(), cookie.getUserKey(), cookie.getUserId()); } // don't use the default generated bitwise assignment operator, because of padding junk that would be copied
/// Return the security code
CSecurityCode encode(char *passPhrase);
CSecurityCode encode(const char *passPhrase);
/// Check the security code
void check(char *passPhrase);
void check(const char *passPhrase);
/// Read some data from stream
void receiveSecurityCode(NLMISC::IStream& msgin);

2
code/ryzom/server/src/entities_game_service/harvest_source.cpp
View file

@ -1270,7 +1270,7 @@ bool forageTestDoExtract(
testSource->extractMaterial( req, abs, ForageQualityCeilingFactor.get(), ForageQualitySlowFactor.get(), res, successFactor, 0, row, propDrop );
fprintf( f, "%g;%g;%g;%g;%g;%g;%g;%g;%g;%u;%u;\n",
res[CHarvestSource::A], res[CHarvestSource::Q],
testSource->getD(), testSource->getE(), 0 /*testSource->getC()*/,
testSource->getD(), testSource->getE(), 0.f /*testSource->getC()*/,
reqS, reqA, reqQ,
testSource->quantity(), testSource->getImpactScheme()*5, 127 );
if ( (!eventD) && (testSource->getD() > 127) )

2
code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.cpp
View file

@ -1936,7 +1936,7 @@ void CDepositMapsBatchTask::run()
CSString res;
disp.write( res );
res = res.replace( "\n", "<BR>\n" );
fprintf( outputF, res.c_str() );
fprintf( outputF, "%s", res.c_str() );
// Close files
fclose( inputF );

8
code/ryzom/server/src/entities_game_service/player_manager/character_interface.h
View file

@ -22,13 +22,17 @@ class CEntityState;
class COfflineEntityState;
class CCharacterRespawnPoints;
class CFarPosition;
class NLNET::CMessage;
class CModuleParent;
namespace NLNET
{
class CMessage;
}
namespace R2
{
struct TUserRole;
};
}
class CRingRewardPoints;

7
code/ryzom/server/src/shard_unifier_service/name_manager.cpp
View file

@ -1187,9 +1187,14 @@ bool CNameManager::loadForbiddenNames()
while (true)
{
char str[512];
fgets(str, 511, fp);
char *fgres = fgets(str, 511, fp);
if(feof(fp))
break;
if (fgres == NULL)
{
nlwarning("NAMEMGR: Error reading file");
break;
}
if (strlen(str) > 0)
{
str[strlen(str)-1] = '\0';

2
code/ryzom/server/src/shard_unifier_service/ring_session_manager.cpp
View file

@ -208,7 +208,7 @@ namespace RSMGR
public:
CRingSessionManager()
: _DontUsePerm(false),
_CharSync(false)
_CharSync(NULL)
{
CRingSessionManagerSkel::init(this);
CWelcomeServiceClientSkel::init(this);