adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-05 09:21:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed CString::Token() to split on a string rather than char

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@398 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2005-06-30 21:51:41 +00:00
parent edf0434fde
commit 3e0c33b053
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRCSock.cpp
+6 -6
View File
@@ -356,7 +356,7 @@ void CIRCSock::ReadLine(const CString& sData) {
CString sNickMask = sLine.Token(0);
sNickMask.LeftChomp();
CString sNick = sNickMask.Token(0, false, '!');
CString sNick = sNickMask.Token(0, false, "!");
CString sCmd = sLine.Token(1);
CString sRest = sLine.Token(2, true);
@@ -881,12 +881,12 @@ void CIRCSock::ParseISupport(const CString& sLine) {
CString sArg = sLine.Token(i++);
while (!sArg.empty()) {
CString sName = sArg.Token(0, false, '=');
CString sValue = sArg.Token(1, true, '=');
CString sName = sArg.Token(0, false, "=");
CString sValue = sArg.Token(1, true, "=");
if (sName.CaseCmp("PREFIX") == 0) {
CString sPrefixes = sValue.Token(1, false, ')');
CString sPermModes = sValue.Token(0, false, ')');
CString sPrefixes = sValue.Token(1, false, ")");
CString sPermModes = sValue.Token(0, false, ")");
sPermModes.LeftTrim("(");
if (!sPrefixes.empty() && sPermModes.size() == sPrefixes.size()) {
@@ -904,7 +904,7 @@ void CIRCSock::ParseISupport(const CString& sLine) {
m_mueChanModes.clear();
for (unsigned int a = 0; a < 4; a++) {
CString sModes = sValue.Token(a, false, ',');
CString sModes = sValue.Token(a, false, ",");
for (unsigned int b = 0; b < sModes.size(); b++) {
m_mueChanModes[sModes[b]] = (EChanModeArgs) a;
UserSock.cpp
+2 -2
View File
@@ -52,8 +52,8 @@ void CUserSock::ReadLine(const CString& sData) {
m_sPass = sLine.Token(1);
if (m_sPass.find(":") != CString::npos) {
m_sUser = m_sPass.Token(0, false, ':');
m_sPass = m_sPass.Token(1, true, ':');
m_sUser = m_sPass.Token(0, false, ":");
m_sPass = m_sPass.Token(1, true, ":");
}
if ((m_bGotNick) && (m_bGotUser)) {
modules/away.cpp
+6 -3
View File
@@ -20,6 +20,9 @@
*
*
* $Log$
* Revision 1.16 2005/06/30 21:51:06 prozacx
* Changed CString::Token() to split on a string rather than char
*
* Revision 1.15 2005/06/12 09:04:39 prozacx
* Changed to new GetSavePath()
*
@@ -258,9 +261,9 @@ public:
map< CString, vector< CString> > msvOutput;
for( u_int a = 0; a < m_vMessages.size(); a++ )
{
CString sTime = m_vMessages[a].Token( 0, false, ':' );
CString sWhom = m_vMessages[a].Token( 1, false, ':' );
CString sMessage = m_vMessages[a].Token( 2, true, ':' );
CString sTime = m_vMessages[a].Token( 0, false, ":" );
CString sWhom = m_vMessages[a].Token( 1, false, ":" );
CString sMessage = m_vMessages[a].Token( 2, true, ":" );
if ( ( sTime.empty() ) || ( sWhom.empty() ) || ( sMessage.empty() ) )
{
znc.cpp
+3 -3
View File
@@ -105,7 +105,7 @@ int CZNC::Loop() {
}
if (File.Open(O_WRONLY | O_TRUNC | O_CREAT)) {
CString sData = m_sISpoofFormat.Token(0, false, '%') + pUser->GetIdent() + m_sISpoofFormat.Token(1, true, '%');
CString sData = m_sISpoofFormat.Token(0, false, "%") + pUser->GetIdent() + m_sISpoofFormat.Token(1, true, "%");
File.Write(sData + "\n");
File.Close();
}
@@ -635,8 +635,8 @@ bool CZNC::ParseConfig(const CString& sConfig) {
}
// If we have a regular line, figure out where it goes
CString sName = sLine.Token(0, false, '=');
CString sValue = sLine.Token(1, true, '=');
CString sName = sLine.Token(0, false, "=");
CString sValue = sLine.Token(1, true, "=");
sName.Trim();
sValue.Trim();