From d02011d69fe1e52ec0bc38051eff9ea93a1cc88c Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Thu, 23 Jan 2014 14:37:09 +0100 Subject: [PATCH] Remove whitespace and minor style changes --- include/base.h | 1 - include/modules/cap.h | 1 - include/modules/dns.h | 1 - include/xline.h | 1 - src/base.cpp | 1 - src/cidr.cpp | 2 -- src/commands.cpp | 1 - src/fileutils.cpp | 2 +- src/inspsocket.cpp | 1 - src/modules/m_cgiirc.cpp | 1 - src/modules/m_chgident.cpp | 1 - src/modules/m_chgname.cpp | 1 - src/modules/m_close.cpp | 3 ++- src/modules/m_mlock.cpp | 7 +++++-- src/modules/m_permchannels.cpp | 4 ++-- src/modules/m_sanick.cpp | 1 - src/modules/m_saquit.cpp | 1 - src/modules/m_services_account.cpp | 1 - src/modules/m_servprotect.cpp | 1 - src/modules/m_showwhois.cpp | 1 - src/modules/m_spanningtree/capab.cpp | 1 - src/modules/m_spanningtree/delline.cpp | 1 - src/modules/m_spanningtree/fmode.cpp | 2 -- src/modules/m_spanningtree/netburst.cpp | 1 - src/modules/m_spanningtree/nickcollide.cpp | 1 - src/modules/m_spanningtree/override_squit.cpp | 1 - src/modules/m_spanningtree/override_stats.cpp | 1 - src/modules/m_spanningtree/override_whois.cpp | 1 - src/modules/m_spanningtree/ping.cpp | 2 -- src/modules/m_spanningtree/pong.cpp | 1 - src/modules/m_spanningtree/precommand.cpp | 1 - src/modules/m_spanningtree/push.cpp | 1 - src/modules/m_spanningtree/save.cpp | 1 - src/modules/m_spanningtree/version.cpp | 1 - src/modules/m_xline_db.cpp | 2 +- src/socket.cpp | 1 - src/users.cpp | 2 +- win/inspircd_win32wrapper.h | 4 ++-- 38 files changed, 14 insertions(+), 44 deletions(-) diff --git a/include/base.h b/include/base.h index ec95342fc..dcbb2e5c7 100644 --- a/include/base.h +++ b/include/base.h @@ -255,4 +255,3 @@ class CoreExport ServiceProvider : public classbase */ void DisableAutoRegister(); }; - diff --git a/include/modules/cap.h b/include/modules/cap.h index 7fa5fa969..1b33e05bb 100644 --- a/include/modules/cap.h +++ b/include/modules/cap.h @@ -86,4 +86,3 @@ class GenericCap } } }; - diff --git a/include/modules/dns.h b/include/modules/dns.h index 65a1762b3..905e52a34 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -190,4 +190,3 @@ namespace DNS }; } // namespace DNS - diff --git a/include/xline.h b/include/xline.h index 5403a0933..fe044d0f2 100644 --- a/include/xline.h +++ b/include/xline.h @@ -525,4 +525,3 @@ class CoreExport XLineManager */ void InvokeStats(const std::string &type, int numeric, User* user, string_list &results); }; - diff --git a/src/base.cpp b/src/base.cpp index 211dc2015..cf28f8e7d 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -316,4 +316,3 @@ ModuleException::ModuleException(const std::string &message, Module* who) : CoreException(message, who ? who->ModuleSourceFile : "A Module") { } - diff --git a/src/cidr.cpp b/src/cidr.cpp index f5ecaac5b..d6370b06a 100644 --- a/src/cidr.cpp +++ b/src/cidr.cpp @@ -92,5 +92,3 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr return mask == mask2; } - - diff --git a/src/commands.cpp b/src/commands.cpp index f62f00340..35aada548 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -143,4 +143,3 @@ CmdResult SplitCommand::HandleServer(const std::vector&, FakeUser*) { return CMD_INVALID; } - diff --git a/src/fileutils.cpp b/src/fileutils.cpp index 8a726ba69..731e4ea01 100644 --- a/src/fileutils.cpp +++ b/src/fileutils.cpp @@ -91,7 +91,7 @@ std::string FileSystem::GetFileName(const std::string& name) #ifdef _WIN32 size_t pos = name.find_last_of("\\/"); #else - size_t pos = name.rfind('/'); + size_t pos = name.rfind('/'); #endif return pos == std::string::npos ? name : name.substr(++pos); } diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index ea09a8b1d..798cde9b0 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -541,4 +541,3 @@ void StreamSocket::HandleEvent(EventType et, int errornum) OnError(errcode); } } - diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 5dea028fb..19b29fbcf 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -412,7 +412,6 @@ public: { return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR); } - }; MODULE_INIT(ModuleCgiIRC) diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 4607ae1a3..c855216bf 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -90,7 +90,6 @@ public: { return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR); } - }; MODULE_INIT(ModuleChgIdent) diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index 944e1b99b..830d5070b 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -86,7 +86,6 @@ public: { return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR); } - }; MODULE_INIT(ModuleChgName) diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp index 0583eb201..9c5c9a77b 100644 --- a/src/modules/m_close.cpp +++ b/src/modules/m_close.cpp @@ -28,7 +28,8 @@ class CommandClose : public Command /* Command 'close', needs operator */ CommandClose(Module* Creator) : Command(Creator,"CLOSE", 0) { - flags_needed = 'o'; } + flags_needed = 'o'; + } CmdResult Handle (const std::vector ¶meters, User *src) { diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp index 22faa2119..45f5dd853 100644 --- a/src/modules/m_mlock.cpp +++ b/src/modules/m_mlock.cpp @@ -23,8 +23,11 @@ class ModuleMLock : public Module { StringExtItem mlock; -public: - ModuleMLock() : mlock("mlock", this) {}; + public: + ModuleMLock() + : mlock("mlock", this) + { + } Version GetVersion() CXX11_OVERRIDE { diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 61080b2dd..1de07ba07 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -57,7 +57,7 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list * So, let's write to a temporary file, flush it, then rename the file.. * -- w00t */ - + // If the user has not specified a configuration file then we don't write one. if (permchannelsconf.empty()) return true; @@ -70,7 +70,7 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new db: %s (%d)", strerror(errno), errno); return false; } - + stream << "# This file is automatically generated by m_permchannels. Any changes will be overwritten." << std::endl << "" << std::endl; diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index 4ce6a5fb2..ca6be2211 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -103,4 +103,3 @@ class ModuleSanick : public Module }; MODULE_INIT(ModuleSanick) - diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp index ee6de5e94..3050e70d6 100644 --- a/src/modules/m_saquit.cpp +++ b/src/modules/m_saquit.cpp @@ -84,4 +84,3 @@ class ModuleSaquit : public Module }; MODULE_INIT(ModuleSaquit) - diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 8ab9c9a3b..feb62f858 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -317,4 +317,3 @@ class ModuleServicesAccount : public Module }; MODULE_INIT(ModuleServicesAccount) - diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp index 7610992a0..b35ee3487 100644 --- a/src/modules/m_servprotect.cpp +++ b/src/modules/m_servprotect.cpp @@ -125,5 +125,4 @@ class ModuleServProtectMode : public Module } }; - MODULE_INIT(ModuleServProtectMode) diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index 783f7d3fe..332752f93 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -120,4 +120,3 @@ class ModuleShowwhois : public Module }; MODULE_INIT(ModuleShowwhois) - diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 52404aa1d..07d11ad83 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -388,4 +388,3 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } return true; } - diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp index c4ed1691b..c76af2fb7 100644 --- a/src/modules/m_spanningtree/delline.cpp +++ b/src/modules/m_spanningtree/delline.cpp @@ -35,4 +35,3 @@ CmdResult CommandDelLine::Handle(User* user, std::vector& params) } return CMD_FAILURE; } - diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp index bad68f053..48e4a19b9 100644 --- a/src/modules/m_spanningtree/fmode.cpp +++ b/src/modules/m_spanningtree/fmode.cpp @@ -75,5 +75,3 @@ CmdResult CommandFMode::Handle(User* who, std::vector& params) ServerInstance->Modes->Process(modelist, who, flags); return CMD_SUCCESS; } - - diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp index 0464590e8..aa25fcf68 100644 --- a/src/modules/m_spanningtree/netburst.cpp +++ b/src/modules/m_spanningtree/netburst.cpp @@ -296,4 +296,3 @@ void TreeSocket::SendUsers(BurstState& bs) FOREACH_MOD(OnSyncUser, (user, piserver)); } } - diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp index edc1ac6ff..62e43a0b1 100644 --- a/src/modules/m_spanningtree/nickcollide.cpp +++ b/src/modules/m_spanningtree/nickcollide.cpp @@ -139,4 +139,3 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot return 3; } - diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp index d3caa7bc8..1d0781dc3 100644 --- a/src/modules/m_spanningtree/override_squit.cpp +++ b/src/modules/m_spanningtree/override_squit.cpp @@ -56,4 +56,3 @@ ModResult ModuleSpanningTree::HandleSquit(const std::vector& parame } return MOD_RES_DENY; } - diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp index bdfc6ef43..8affec7b7 100644 --- a/src/modules/m_spanningtree/override_stats.cpp +++ b/src/modules/m_spanningtree/override_stats.cpp @@ -50,4 +50,3 @@ ModResult ModuleSpanningTree::OnStats(char statschar, User* user, string_list &r } return MOD_RES_PASSTHRU; } - diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp index 97fea12ae..d7030e30a 100644 --- a/src/modules/m_spanningtree/override_whois.cpp +++ b/src/modules/m_spanningtree/override_whois.cpp @@ -40,4 +40,3 @@ ModResult ModuleSpanningTree::HandleRemoteWhois(const std::vector& } return MOD_RES_PASSTHRU; } - diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp index 6d8893acf..878f8af3a 100644 --- a/src/modules/m_spanningtree/ping.cpp +++ b/src/modules/m_spanningtree/ping.cpp @@ -39,5 +39,3 @@ CmdResult CommandPing::Handle(User* user, std::vector& params) } return CMD_SUCCESS; } - - diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp index ce1715874..6a29163e4 100644 --- a/src/modules/m_spanningtree/pong.cpp +++ b/src/modules/m_spanningtree/pong.cpp @@ -41,4 +41,3 @@ CmdResult CommandPong::HandleServer(TreeServer* server, std::vector } return CMD_SUCCESS; } - diff --git a/src/modules/m_spanningtree/precommand.cpp b/src/modules/m_spanningtree/precommand.cpp index 29b6ae642..4733d0071 100644 --- a/src/modules/m_spanningtree/precommand.cpp +++ b/src/modules/m_spanningtree/precommand.cpp @@ -55,4 +55,3 @@ ModResult ModuleSpanningTree::OnPreCommand(std::string &command, std::vector& params) } return CMD_SUCCESS; } - diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp index 8f0eced73..03d401211 100644 --- a/src/modules/m_spanningtree/save.cpp +++ b/src/modules/m_spanningtree/save.cpp @@ -44,4 +44,3 @@ CmdResult CommandSave::Handle(User* user, std::vector& params) return CMD_SUCCESS; } - diff --git a/src/modules/m_spanningtree/version.cpp b/src/modules/m_spanningtree/version.cpp index b63fc259c..193b51083 100644 --- a/src/modules/m_spanningtree/version.cpp +++ b/src/modules/m_spanningtree/version.cpp @@ -29,4 +29,3 @@ CmdResult CommandVersion::HandleServer(TreeServer* server, std::vectorSetVersion(params[0]); return CMD_SUCCESS; } - diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp index 222bbe17b..1a7fd8cc5 100644 --- a/src/modules/m_xline_db.cpp +++ b/src/modules/m_xline_db.cpp @@ -166,7 +166,7 @@ class ModuleXLineDB : public Module ServerInstance->SNO->WriteToSnoMask('a', "database: cannot read db: %s (%d)", strerror(errno), errno); return false; } - + std::string line; while (std::getline(stream, line)) { diff --git a/src/socket.cpp b/src/socket.cpp index c65cd5b27..cade49353 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -369,4 +369,3 @@ bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const irc::sockets::cidr_mask tmp(addr, length); return tmp == *this; } - diff --git a/src/users.cpp b/src/users.cpp index dab3aad6c..c855dcad0 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -896,7 +896,7 @@ void User::WriteNumeric(unsigned int numeric, const std::string &text) if (MOD_RESULT == MOD_RES_DENY) return; - + const std::string message = InspIRCd::Format(":%s %03u %s %s", ServerInstance->Config->ServerName.c_str(), numeric, !this->nick.empty() ? this->nick.c_str() : "*", text.c_str()); this->Write(message); diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index 0b9216313..9e6724126 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -28,7 +28,7 @@ * Starting with PSAPI version 2 for Windows 7 and Windows Server 2008 R2, this function is defined as K32GetProcessMemoryInfo in Psapi.h and exported * in Kernel32.lib and Kernel32.dll. However, you should always call this function as GetProcessMemoryInfo. To ensure correct resolution of symbols * for programs that will run on earlier versions of Windows, add Psapi.lib to the TARGETLIBS macro and compile the program with PSAPI_VERSION=1. - * + * * We do this before anything to make sure it's done. */ #define PSAPI_VERSION 1 @@ -114,7 +114,7 @@ __inline void sleep(int seconds) { Sleep(seconds * 1000); } /* IPV4 only convert string to address struct */ __inline int inet_aton(const char *cp, struct in_addr *addr) -{ +{ addr->s_addr = inet_addr(cp); return (addr->s_addr == INADDR_NONE) ? 0 : 1; }; -- 2.39.2