feat(Core/Common): delete old Tokenizer (#10121)

1 files changed, 5 insertions, 7 deletions

diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp
index 90d5ddaa29..0aa2339921 100644
--- a/src/server/database/Database/MySQLConnection.cpp
+++ b/src/server/database/Database/MySQLConnection.cpp
@@ -27,6 +27,7 @@
 #include "Tokenize.h"
 #include "Transaction.h"
 #include "Util.h"
+#include "StringConvert.h"
 #include <errmsg.h>
 #include <mysqld_error.h>
 
@@ -87,20 +88,17 @@ void MySQLConnection::Close()
 
 uint32 MySQLConnection::Open()
 {
-    MYSQL *mysqlInit;
-    mysqlInit = mysql_init(nullptr);
+    MYSQL* mysqlInit = mysql_init(nullptr);
     if (!mysqlInit)
     {
         LOG_ERROR("sql.sql", "Could not initialize Mysql connection to database `%s`", m_connectionInfo.database.c_str());
         return CR_UNKNOWN_ERROR;
     }
 
-    int port;
+    uint32 port;
     char const* unix_socket;
-    //unsigned int timeout = 10;
 
     mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
-    //mysql_options(mysqlInit, MYSQL_OPT_READ_TIMEOUT, (char const*)&timeout);
     #ifdef _WIN32
     if (m_connectionInfo.host == ".")                                           // named pipe use option (Windows)
     {
@@ -111,7 +109,7 @@ uint32 MySQLConnection::Open()
     }
     else                                                    // generic case
     {
-        port = atoi(m_connectionInfo.port_or_socket.c_str());
+        port = *Acore::StringTo<uint32>(m_connectionInfo.port_or_socket);
         unix_socket = 0;
     }
     #else
@@ -125,7 +123,7 @@ uint32 MySQLConnection::Open()
     }
     else                                                    // generic case
     {
-        port = atoi(m_connectionInfo.port_or_socket.c_str());
+        port = *Acore::StringTo<uint32>(m_connectionInfo.port_or_socket);
         unix_socket = nullptr;
     }
     #endif