From 2a3e170bee15421d1e13b0c23778cbb3f6ffa04b Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sat, 4 Jun 2011 13:25:58 +0200
Subject: [PATCH] Changed: #142 Replace atoi and sscanf by fromString when it's
 possible

---
 code/ryzom/server/src/ai_service/ai_outpost.cpp  |  5 ++++-
 .../server/src/ai_service/ai_script_comp.cpp     |  8 ++++++--
 code/ryzom/server/src/ai_service/ai_spire.cpp    |  5 ++++-
 .../src/ai_service/generic_logic_action.cpp      | 16 ++++++++--------
 .../player_manager/cdb_leaf.cpp                  |  6 ++++--
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/code/ryzom/server/src/ai_service/ai_outpost.cpp b/code/ryzom/server/src/ai_service/ai_outpost.cpp
index fb2090617..0ef71b2ee 100644
--- a/code/ryzom/server/src/ai_service/ai_outpost.cpp
+++ b/code/ryzom/server/src/ai_service/ai_outpost.cpp
@@ -1271,7 +1271,10 @@ NLMISC_COMMAND(outpostSpawnSquad, "Spawns a squad in an outpost", "<instance_num
 	string zoneName = args[5];
 	uint32 respawnTimeGC = 5*60*10;
 	if ( args.size() > 6 )
-		respawnTimeGC = atoi( args[6].c_str() ) * 10;
+	{
+		NLMISC::fromString(args[6], respawnTimeGC);
+		respawnTimeGC *= 10;
+	}
 	
 	for (size_t i=0; i<5; ++i)
 		if (args[i]=="")
diff --git a/code/ryzom/server/src/ai_service/ai_script_comp.cpp b/code/ryzom/server/src/ai_service/ai_script_comp.cpp
index 0209eeec0..63f127483 100644
--- a/code/ryzom/server/src/ai_service/ai_script_comp.cpp
+++ b/code/ryzom/server/src/ai_service/ai_script_comp.cpp
@@ -237,7 +237,9 @@ public:
 		if	(params.size()!=2)
 			throw	ReadFightActionException("EVERY_SEC Needs 2 Params: <time in seconds>,<ScriptComp>");
 
-		int	time=atoi(params[0].c_str())*10;
+		sint time;
+		NLMISC::fromString(params[0], time);
+		time *= 10;
 
 		CSmartPtr<CFightScriptComp>	scriptComp;
 		try
@@ -653,7 +655,9 @@ public:
 		if	(strings.size()!=1)
 			throw	ReadFightActionException("AGGRO_BLOCK Needs 1 param");
 
-		uint32	time=atoi(strings[0].c_str())*10;
+		uint32	time;
+		NLMISC::fromString(strings[0], time);
+		time *= 10;
 		return	new	CFightAggroBlock(time);
 	}
 
diff --git a/code/ryzom/server/src/ai_service/ai_spire.cpp b/code/ryzom/server/src/ai_service/ai_spire.cpp
index 4c2355ca2..d4e62e20a 100644
--- a/code/ryzom/server/src/ai_service/ai_spire.cpp
+++ b/code/ryzom/server/src/ai_service/ai_spire.cpp
@@ -1419,7 +1419,10 @@ NLMISC_COMMAND(spireSpawnSquad, "Spawns a squad in an spire", "<instance_number>
 	string zoneName = args[5];
 	uint32 respawnTimeGC = 5*60*10;
 	if ( args.size() > 6 )
-		respawnTimeGC = atoi( args[6].c_str() ) * 10;
+	{
+		NLMISC::fromString(args[6], respawnTimeGC);
+		respawnTimeGC *= 10;
+	}
 	
 	for (size_t i=0; i<5; ++i)
 		if (args[i]=="")
diff --git a/code/ryzom/server/src/ai_service/generic_logic_action.cpp b/code/ryzom/server/src/ai_service/generic_logic_action.cpp
index a1428e8da..5bcb13fca 100644
--- a/code/ryzom/server/src/ai_service/generic_logic_action.cpp
+++ b/code/ryzom/server/src/ai_service/generic_logic_action.cpp
@@ -614,10 +614,10 @@ public:
 
 		switch (args.size())
 		{
-		case 2:	_min=atoi(args[0].c_str()); if (args[0]!=NLMISC::toString(_min)) goto BadArgs;
-				_max=atoi(args[1].c_str()); if (args[1]!=NLMISC::toString(_max)) goto BadArgs;
+		case 2:	NLMISC::fromString(args[0], _min); if (args[0]!=NLMISC::toString(_min)) goto BadArgs;
+				NLMISC::fromString(args[1], _max); if (args[1]!=NLMISC::toString(_max)) goto BadArgs;
 				break;
-		case 1:	_min=atoi(args[0].c_str()); if (args[0]!=NLMISC::toString(_min)) goto BadArgs;
+		case 1:	NLMISC::fromString(args[0], _min); if (args[0]!=NLMISC::toString(_min)) goto BadArgs;
 				_max=_min;
 				break;
 		default: 
@@ -759,10 +759,10 @@ public:
 			_Mode = tm_timer;
 			switch (args.size())
 			{
-			case 2:	_Min=atoi(args[0].c_str()); if (args[0]!=NLMISC::toString(_Min)) goto BadArgs;
-					_Max=atoi(args[1].c_str()); if (args[1]!=NLMISC::toString(_Max)) goto BadArgs;
+			case 2:	NLMISC::fromString(args[0], _Min); if (args[0]!=NLMISC::toString(_Min)) goto BadArgs;
+					NLMISC::fromString(args[1], _Max); if (args[1]!=NLMISC::toString(_Max)) goto BadArgs;
 					break;
-			case 1:	_Min=atoi(args[0].c_str()); if (args[0]!=NLMISC::toString(_Min)) goto BadArgs;
+			case 1:	NLMISC::fromString(args[0], _Min); if (args[0]!=NLMISC::toString(_Min)) goto BadArgs;
 					_Max=_Min;
 					break;
 			default: 
@@ -2945,9 +2945,9 @@ public:
 		if(cstring=="DSS_")
 		{
 			_Id=true;
-			NLMISC::CSString tmp = NLMISC::CSString (_Sentence).right((unsigned int)_Sentence.length()-4);
+			NLMISC::CSString tmp = NLMISC::CSString (_Sentence).right((uint)_Sentence.length()-4);
 			NLMISC::CSString tmp2 = tmp.strtok(" ",false,false,false,false);
-			_ScenarioId = atoi(tmp2.c_str());
+			_ScenarioId = tmp2.atoui();
 			_Sentence = tmp;
 			nlwarning("<npc_say> scenario id : %d string id : %s ",_ScenarioId,_Sentence.c_str());
 		}
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp b/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp
index 0bb8e4d31..fc26bb83a 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp
@@ -51,7 +51,8 @@ void CCDBStructNodeLeaf::init( xmlNodePtr node, NLMISC::IProgressCallback &progr
 	// IF type is an INT with n bits [1,64].
 	if ((type.getDatas()[0] == 'I') || (type.getDatas()[0] == 'U'))
 	{
-		uint nbBit = atoi(type.getDatas() + 1);
+		uint nbBit;
+		NLMISC::fromString(type.getDatas() + 1, nbBit);
 		if(nbBit>=1 && nbBit<=64)
 			_Type=(ICDBStructNode::EPropType)nbBit;
 		else
@@ -62,7 +63,8 @@ void CCDBStructNodeLeaf::init( xmlNodePtr node, NLMISC::IProgressCallback &progr
 	}
 	else if (type.getDatas()[0] == 'S')
 	{
-		uint nbBit = atoi(type.getDatas() + 1);
+		uint nbBit;
+		NLMISC::fromString(type.getDatas() + 1, nbBit);
 		if(nbBit>=1 && nbBit<=64)
 			_Type = (ICDBStructNode::EPropType)nbBit; // all is I on the server (unlike the client)
 		else