flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Replaced atoi() with StringToInteger().

This commit is contained in:
Mattes D 2015-01-25 16:25:15 +01:00
parent f243aa387c
commit 6ec5e8caa7
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Generating/BioGen.cpp
View File

@ -205,8 +205,7 @@ void cBiomeGenList::InitializeBiomes(const AString & a_Biomes)
int Count = 1;
if (Split2.size() >= 2)
{
Count = atol(Split2[1].c_str());
if (Count <= 0)
if (!StringToInteger(Split2[1], Count))
{
LOGWARNING("Cannot decode biome count: \"%s\"; using 1.", Split2[1].c_str());
Count = 1;

5
src/HTTPServer/HTTPMessage.cpp
View File

@ -55,7 +55,10 @@ void cHTTPMessage::AddHeader(const AString & a_Key, const AString & a_Value)
}
else if (Key == "content-length")
{
m_ContentLength = static_cast<size_t>(atol(m_Headers[Key].c_str()));
if (!StringToInteger(m_Headers[Key], m_ContentLength))
{
m_ContentLength = 0;
}
}
}

4
src/HTTPServer/HTTPServer.cpp
View File

@ -225,8 +225,8 @@ bool cHTTPServer::Start(cCallbacks & a_Callbacks, const AStringVector & a_Ports)
// Open up requested ports:
for (auto port : a_Ports)
{
UInt16 PortNum = static_cast<UInt16>(atoi(port.c_str()));
if (PortNum == 0)
UInt16 PortNum;
if (!StringToInteger(port, PortNum))
{
LOGWARNING("WebServer: Invalid port value: \"%s\". Ignoring.", port.c_str());
continue;

4
src/RCONServer.cpp
View File

@ -155,8 +155,8 @@ void cRCONServer::Initialize(cIniFile & a_IniFile)
// Start listening on each specified port:
for (auto port: Ports)
{
UInt16 PortNum = static_cast<UInt16>(atol(port.c_str()));
if (PortNum == 0)
UInt16 PortNum;
if (!StringToInteger(port, PortNum))
{
LOGINFO("Invalid RCON port value: \"%s\". Ignoring.", port.c_str());
continue;

4
src/Server.cpp
View File

@ -393,8 +393,8 @@ bool cServer::Start(void)
{
for (auto port: m_Ports)
{
UInt16 PortNum = static_cast<UInt16>(atoi(port.c_str()));
if (PortNum == 0)
UInt16 PortNum;
if (!StringToInteger(port, PortNum))
{
LOGWARNING("Invalid port specified for server: \"%s\". Ignoring.", port.c_str());
continue;