From b9a54637aee7b44c0bc880cd5f89b59ec6dd15e8 Mon Sep 17 00:00:00 2001 From: prozacx Date: Mon, 18 Jul 2005 03:07:34 +0000 Subject: [PATCH] Fixed some empty whitespace issues in WriteConfig() git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@443 726aef4b-f618-498e-8847-2d620e286838 --- User.cpp | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/User.cpp b/User.cpp index 6c240213..c6da0ff4 100644 --- a/User.cpp +++ b/User.cpp @@ -349,42 +349,50 @@ bool CUser::WriteConfig(CFile& File) { File.Write("\r\n"); // Allow Hosts - for (set::iterator it = m_ssAllowedHosts.begin(); it != m_ssAllowedHosts.end(); it++) { - PrintLine(File, "Allow", *it); - } + if (!m_ssAllowedHosts.empty()) { + for (set::iterator it = m_ssAllowedHosts.begin(); it != m_ssAllowedHosts.end(); it++) { + PrintLine(File, "Allow", *it); + } - File.Write("\r\n"); + File.Write("\r\n"); + } // CTCP Replies - for (MCString::iterator itb = m_mssCTCPReplies.begin(); itb != m_mssCTCPReplies.end(); itb++) { - PrintLine(File, "CTCPReply", itb->first.AsUpper() + " " + itb->second); + if (!m_mssCTCPReplies.empty()) { + for (MCString::iterator itb = m_mssCTCPReplies.begin(); itb != m_mssCTCPReplies.end(); itb++) { + PrintLine(File, "CTCPReply", itb->first.AsUpper() + " " + itb->second); + } + + File.Write("\r\n"); } - File.Write("\r\n"); #ifdef _MODULES // Modules CModules& Mods = GetModules(); - for (unsigned int a = 0; a < Mods.size(); a++) { - CString sArgs = Mods[a]->GetArgs(); + if (!Mods.empty()) { + for (unsigned int a = 0; a < Mods.size(); a++) { + CString sArgs = Mods[a]->GetArgs(); - if (!sArgs.empty()) { - sArgs = " " + sArgs; + if (!sArgs.empty()) { + sArgs = " " + sArgs; + } + + PrintLine(File, "LoadModule", Mods[a]->GetModName() + sArgs); } - PrintLine(File, "LoadModule", Mods[a]->GetModName() + sArgs); + File.Write("\r\n"); } - File.Write("\r\n"); #endif // Servers for (unsigned int b = 0; b < m_vServers.size(); b++) { PrintLine(File, "Server", m_vServers[b]->GetString()); } - File.Write("\r\n"); // Chans for (unsigned int c = 0; c < m_vChans.size(); c++) { + File.Write("\r\n"); if (!m_vChans[c]->WriteConfig(File)) { return false; }