inspircd

A modular C++ IRC daemon (ircd). https://www.inspircd.org/
Log | Files | Refs | README

commit 961109ae4fde97144fdedeef25607a5b8b3ec2c2
parent dba2cddc463082ca028617df93e6726253e0866f
Author: Peter Powell <petpow@saberuk.com>
Date:   Thu, 24 Jan 2019 22:06:27 +0000

Remove trailing whitespace from various source files.

Diffstat:
Mdocs/conf/modules.conf.example | 4++--
Minclude/message.h | 2+-
Minclude/modules/server.h | 1-
Mmake/calcdep.pl | 2+-
Mmake/configure.pm | 2+-
Mmake/directive.pm | 2+-
Mmake/template/inspircd.1 | 2+-
Msrc/coremods/core_oper/core_oper.cpp | 3+--
Msrc/coremods/core_serialize_rfc.cpp | 2+-
Msrc/coremods/core_whois.cpp | 2+-
Msrc/inspstring.cpp | 1-
Msrc/mode.cpp | 2+-
Msrc/modules/m_cgiirc.cpp | 4++--
Msrc/modules/m_cloaking.cpp | 12++++++------
Msrc/modules/m_hostchange.cpp | 4++--
Msrc/modules/m_ircv3_sts.cpp | 2+-
Msrc/modules/m_showwhois.cpp | 2+-
Msrc/modules/m_spanningtree/uid.cpp | 2+-
Msrc/socket.cpp | 2+-
Msrc/users.cpp | 2+-
20 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example @@ -498,7 +498,7 @@ #<module name="chgname"> # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Connection class ban module: Adds support for extban 'n' which +# Connection class ban module: Adds support for extban 'n' which # matches against the class name of the user's connection. # This module assumes that connection classes are named in a uniform # way on all servers of the network. @@ -1532,7 +1532,7 @@ # Oper modes module: Allows you to specify modes to add/remove on oper. # Specify the modes as the 'modes' parameter of the <type> tag # and/or as the 'modes' parameter of the <oper> tag. -# This module is oper-only. For the user equivalent, see the +# This module is oper-only. For the user equivalent, see the # conn_umodes module. #<module name="opermodes"> diff --git a/include/message.h b/include/message.h @@ -63,7 +63,7 @@ class CoreExport MessageDetails * @param body The location to store the parsed CTCP body. */ virtual bool IsCTCP(std::string& name, std::string& body) const = 0; - + /** Determines whether the specified message is a CTCP. If the specified message * is a CTCP then the CTCP name is extracted and stored in the name reference. * @param name The location to store the parsed CTCP name. diff --git a/include/modules/server.h b/include/modules/server.h @@ -65,5 +65,4 @@ class ServerEventListener : public Events::ModuleEventListener * @param server The target of the burst. */ virtual void OnSyncNetwork(ProtocolServer& server) { } - }; diff --git a/make/calcdep.pl b/make/calcdep.pl @@ -112,7 +112,7 @@ END } } } - + my $core_mk = join ' ', @core_deps; my $mods = join ' ', @modlist; print MAKE <<END; diff --git a/make/configure.pm b/make/configure.pm @@ -39,7 +39,7 @@ use File::Spec::Functions qw(catdir catfile); use make::common; use make::console; -use constant CONFIGURE_ROOT => dirname dirname __FILE__; +use constant CONFIGURE_ROOT => dirname dirname __FILE__; use constant CONFIGURE_DIRECTORY => catdir(CONFIGURE_ROOT, '.configure'); use constant CONFIGURE_CACHE_FILE => catfile(CONFIGURE_DIRECTORY, 'cache.cfg'); use constant CONFIGURE_CACHE_VERSION => '1'; diff --git a/make/directive.pm b/make/directive.pm @@ -164,7 +164,7 @@ sub __function_execute { return $defaults; } - # Executing the command failed and we don't have any defaults so give up. + # Executing the command failed and we don't have any defaults so give up. __error $file, "`<|GREEN $command|>` exited with a non-zero exit code!"; } diff --git a/make/template/inspircd.1 b/make/template/inspircd.1 @@ -24,7 +24,7 @@ .BR .SH "SYNOPSIS" -\t\fBinspircd\fR [--config <file>] [--debug] [--nofork] [--nolog] [--nopid] [--runasroot] [--version] +\t\fBinspircd\fR [--config <file>] [--debug] [--nofork] [--nolog] [--nopid] [--runasroot] [--version] .SH "OPTIONS" .TP diff --git a/src/coremods/core_oper/core_oper.cpp b/src/coremods/core_oper/core_oper.cpp @@ -42,9 +42,8 @@ class CoreModOper : public Module void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigTag* tag = ServerInstance->Config->ConfValue("power"); - + // The hash method for *BOTH* the die and restart passwords powerhash = tag->getString("hash"); diff --git a/src/coremods/core_serialize_rfc.cpp b/src/coremods/core_serialize_rfc.cpp @@ -59,7 +59,7 @@ bool RFCSerializer::Parse(LocalUser* user, const std::string& line, ClientProtoc // Work out how long the message can actually be. size_t maxline = ServerInstance->Config->Limits.MaxLine - start - 2; if (line[start] == '@') - maxline += MAX_CLIENT_MESSAGE_TAG_LENGTH + 1; + maxline += MAX_CLIENT_MESSAGE_TAG_LENGTH + 1; irc::tokenstream tokens(line, start, maxline); ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I %s", user->uuid.c_str(), tokens.GetMessage().c_str()); diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp @@ -365,7 +365,7 @@ class CoreModWhois : public Module else if (stdalgo::string::equalsci(splitwhois, "splitmsg")) newsplitstate = SPLITWHOIS_SPLITMSG; else - throw ModuleException(splitwhois + " is an invalid <security:splitwhois> value, at " + tag->getTagLocation()); + throw ModuleException(splitwhois + " is an invalid <security:splitwhois> value, at " + tag->getTagLocation()); ConfigTag* security = ServerInstance->Config->ConfValue("security"); cmd.genericoper = security->getBool("genericoper"); diff --git a/src/inspstring.cpp b/src/inspstring.cpp @@ -136,7 +136,6 @@ void TokenList::AddList(const std::string& tokenlist) else Add(token); } - } void TokenList::Add(const std::string& token) { diff --git a/src/mode.cpp b/src/mode.cpp @@ -607,7 +607,7 @@ void ModeParser::AddMode(ModeHandler* mh) if ((mh->GetModeType() == MODETYPE_USER) || (mh->IsParameterMode()) || (!mh->IsListMode())) modeid = AllocateModeId(mh->GetModeType()); - std::pair<ModeHandlerMap::iterator, bool> res = modehandlersbyname[mh->GetModeType()].insert(std::make_pair(mh->name, mh)); + std::pair<ModeHandlerMap::iterator, bool> res = modehandlersbyname[mh->GetModeType()].insert(std::make_pair(mh->name, mh)); if (!res.second) { ModeHandler* othermh = res.first->second; diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp @@ -311,7 +311,7 @@ class ModuleCgiIRC } else { - throw ModuleException(type + " is an invalid <cgihost:mask> type, at " + tag->getTagLocation()); + throw ModuleException(type + " is an invalid <cgihost:mask> type, at " + tag->getTagLocation()); } } @@ -369,7 +369,7 @@ class ModuleCgiIRC user->ChangeIdent(newident); user->SetClientIP(address); - break; + break; } return MOD_RES_PASSTHRU; } diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp @@ -210,24 +210,24 @@ class ModuleCloaking : public Module { // The position at which we found the last dot. std::string::const_reverse_iterator dotpos; - + // The number of dots we have seen so far. unsigned int seendots = 0; - + for (std::string::const_reverse_iterator iter = host.rbegin(); iter != host.rend(); ++iter) { if (*iter != '.') continue; - + // We have found a dot! dotpos = iter; seendots += 1; - + // Do we have enough segments to stop? if (seendots >= domainparts) break; } - + // We only returns a domain part if more than one label is // present. See above for a full explanation. if (!seendots) @@ -435,7 +435,7 @@ class ModuleCloaking : public Module else if (stdalgo::string::equalsci(mode, "full")) newcloaks.push_back(CloakInfo(MODE_OPAQUE, key, prefix, suffix)); else - throw ModuleException(mode + " is an invalid value for <cloak:mode>; acceptable values are 'half' and 'full', at " + tag->getTagLocation()); + throw ModuleException(mode + " is an invalid value for <cloak:mode>; acceptable values are 'half' and 'full', at " + tag->getTagLocation()); } // The cloak configuration was valid so we can apply it. diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp @@ -34,7 +34,7 @@ class HostRule // Add the user's nickname to their hostname. HCA_ADDNICK, - // Set the user's hostname to the specific value. + // Set the user's hostname to the specific value. HCA_SET }; @@ -168,7 +168,7 @@ private: } else { - throw ModuleException(action + " is an invalid <hostchange:action> type, at " + tag->getTagLocation()); + throw ModuleException(action + " is an invalid <hostchange:action> type, at " + tag->getTagLocation()); } } diff --git a/src/modules/m_ircv3_sts.cpp b/src/modules/m_ircv3_sts.cpp @@ -130,7 +130,7 @@ class ModuleIRCv3STS : public Module for (std::vector<ListenSocket*>::const_iterator iter = ServerInstance->ports.begin(); iter != ServerInstance->ports.end(); ++iter) { ListenSocket* ls = *iter; - + // Is this listener on the right port? unsigned int saport = ls->bind_sa.port(); if (saport != port) diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp @@ -51,7 +51,7 @@ class WhoisNoticeCmd : public Command void HandleFast(User* dest, User* src) { dest->WriteNotice("*** " + src->nick + " (" + src->ident + "@" + - src->GetHost(dest->HasPrivPermission("users/auspex")) + + src->GetHost(dest->HasPrivPermission("users/auspex")) + ") did a /whois on you"); } diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp @@ -134,7 +134,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params } CmdResult CommandFHost::HandleRemote(RemoteUser* src, Params& params) -{ +{ src->ChangeDisplayedHost(params[0]); return CMD_SUCCESS; } diff --git a/src/socket.cpp b/src/socket.cpp @@ -39,7 +39,7 @@ bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std:: return true; } } - + ListenSocket* ll = new ListenSocket(tag, sa); if (ll->GetFd() < 0) { diff --git a/src/users.cpp b/src/users.cpp @@ -1026,7 +1026,7 @@ void User::ChangeRealHost(const std::string& host, bool resetdisplay) const bool changehost = (realhost != host); if (!changehost && !resetdisplay) return; - + // If the displayhost is not set and we are not resetting it then // we need to copy it to the displayhost field. if (displayhost.empty() && !resetdisplay)