adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-06-26 13:01:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of most strtoul() and atoi() calls and use CString's features instead

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1320 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2009-01-04 10:48:02 +00:00
parent cae48ab256
commit 607a7f1c16
11 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client.cpp
+6 -6
View File
@@ -388,9 +388,9 @@ void CClient::ReadLine(const CString& sData) {
if (sCTCP.Equals("DCC ", false, 4) && m_pUser->BounceDCCs()) {
CString sType = sCTCP.Token(1);
CString sFile = sCTCP.Token(2);
unsigned long uLongIP = strtoul(sCTCP.Token(3).c_str(), NULL, 10);
unsigned short uPort = strtoul(sCTCP.Token(4).c_str(), NULL, 10);
unsigned long uFileSize = strtoul(sCTCP.Token(5).c_str(), NULL, 10);
unsigned long uLongIP = sCTCP.Token(3).ToULong();
unsigned short uPort = sCTCP.Token(4).ToUShort();
unsigned long uFileSize = sCTCP.Token(5).ToULong();
CString sIP = (m_pIRCSock) ? m_pIRCSock->GetLocalIP() : GetLocalIP();
if (!m_pUser->UseClientIP()) {
@@ -432,8 +432,8 @@ void CClient::ReadLine(const CString& sData) {
}
} else if (sType.Equals("RESUME")) {
// PRIVMSG user :DCC RESUME "znc.o" 58810 151552
unsigned short uResumePort = atoi(sCTCP.Token(3).c_str());
unsigned long uResumeSize = strtoul(sCTCP.Token(4).c_str(), NULL, 10);
unsigned short uResumePort = sCTCP.Token(3).ToUShort();
unsigned long uResumeSize = sCTCP.Token(4).ToULong();
// Need to lookup the connection by port, filter the port, and forward to the user
CString sStatusPrefix = m_pUser->GetStatusPrefix();
@@ -459,7 +459,7 @@ void CClient::ReadLine(const CString& sData) {
CDCCBounce* pSock = (CDCCBounce*) Manager[a];
if (pSock && pSock->GetSockName().Equals("DCC::", false, 5)) {
if (pSock->GetUserPort() == atoi(sCTCP.Token(3).c_str())) {
if (pSock->GetUserPort() == sCTCP.Token(3).ToUShort()) {
PutIRC("PRIVMSG " + sTarget + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetLocalPort()) + " " + sCTCP.Token(4) + "\001");
}
}