From 3b8134c3b0004f621f0c765133fc84a17f530001 Mon Sep 17 00:00:00 2001 From: kroimon Date: Sat, 27 Sep 2008 14:42:34 +0000 Subject: [PATCH] Another whitespace/tab mixup fix. Hopefully the last one... Again, no functional changes in this commit. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1219 726aef4b-f618-498e-8847-2d620e286838 --- Chan.cpp | 4 ++-- Client.cpp | 14 +++++++------- main.cpp | 4 ++-- modules/partyline.cpp | 2 +- znc.cpp | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Chan.cpp b/Chan.cpp index b18de712..cb99141b 100644 --- a/Chan.cpp +++ b/Chan.cpp @@ -191,9 +191,9 @@ CString CChan::GetModeForNames() const { for (map::const_iterator it = m_musModes.begin(); it != m_musModes.end(); it++) { if (it->first == 's') { - sMode = "@"; + sMode = "@"; } else if ((it->first == 'p') && sMode.empty()){ - sMode = "*"; + sMode = "*"; } } diff --git a/Client.cpp b/Client.cpp index 8614941d..34ee53ad 100644 --- a/Client.cpp +++ b/Client.cpp @@ -265,15 +265,15 @@ void CClient::ReadLine(const CString& sData) { CString sModes = sLine.Token(2, true); if (m_pUser && m_pUser->IsChan(sTarget)) { - CChan *pChan = m_pUser->FindChan(sTarget); + CChan *pChan = m_pUser->FindChan(sTarget); - if (pChan && sModes.empty()) { - PutClient(":" + m_pUser->GetIRCServer() + " 324 " + GetNick() + " " + sTarget + " " + pChan->GetModeString()); - if (pChan->GetCreationDate() > 0) { - PutClient(":" + m_pUser->GetIRCServer() + " 329 " + GetNick() + " " + sTarget + " " + CString(pChan->GetCreationDate())); - } + if (pChan && sModes.empty()) { + PutClient(":" + m_pUser->GetIRCServer() + " 324 " + GetNick() + " " + sTarget + " " + pChan->GetModeString()); + if (pChan->GetCreationDate() > 0) { + PutClient(":" + m_pUser->GetIRCServer() + " 329 " + GetNick() + " " + sTarget + " " + CString(pChan->GetCreationDate())); + } return; - } + } } } else if (sCommand.CaseCmp("QUIT") == 0) { if (m_pUser) { diff --git a/main.cpp b/main.cpp index d1f2f280..6245e465 100644 --- a/main.cpp +++ b/main.cpp @@ -90,7 +90,7 @@ int main(int argc, char** argv) { #else while ((iArg = getopt_long(argc, argv, "hvnrcsd:", g_LongOpts, &iOptIndex)) != -1) { #endif /* HAVE_LIBSSL */ - switch (iArg) { + switch (iArg) { case 'h': GenerateHelp(argv[0]); return 0; @@ -124,7 +124,7 @@ int main(int argc, char** argv) { default: GenerateHelp(argv[0]); return 1; - } + } } if (optind < argc) { diff --git a/modules/partyline.cpp b/modules/partyline.cpp index 3435da4f..19069720 100644 --- a/modules/partyline.cpp +++ b/modules/partyline.cpp @@ -252,7 +252,7 @@ public: } } } else { - m_pUser->PutUser(":irc.znc.in 442 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :You're not on that channel"); + m_pUser->PutUser(":irc.znc.in 442 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :You're not on that channel"); } return HALT; } diff --git a/znc.cpp b/znc.cpp index 3a1a7f92..befaa30f 100644 --- a/znc.cpp +++ b/znc.cpp @@ -431,9 +431,9 @@ void CZNC::InitDirs(const CString& sArgvPath, const CString& sDataDir) { } if (sDataDir.empty()) { - m_sZNCPath = m_sHomePath + "/.znc"; + m_sZNCPath = m_sHomePath + "/.znc"; } else { - m_sZNCPath = sDataDir; + m_sZNCPath = sDataDir; } // Other dirs that we use