Fix a bunch of weird indentation and spacing issues.

diff --git a/include/channels.h b/include/channels.h
index 0b38958cc456d36c04a8eab6989e34d5f98ce201..aa025d4e74569e6ea1ef722deb89e10d7b25e447 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -42,7 +42,7 @@ class CoreExport Channel : public Extensible
  public:
        /** A map of Memberships on a channel keyed by User pointers
         */
-       typedef std::map<User*, insp::aligned_storage<Membership> > MemberMap;
+       typedef std::map<User*, insp::aligned_storage<Membership> > MemberMap;
 
  private:
        /** Set default modes for the channel on creation
@@ -117,23 +117,23 @@ class CoreExport Channel : public Extensible
        void SetMode(ModeHandler* mode, bool value);
 
        /** Returns true if a mode is set on a channel
-         * @param mode The mode character you wish to query
-         * @return True if the custom mode is set, false if otherwise
-         */
+        * @param mode The mode character you wish to query
+        * @return True if the custom mode is set, false if otherwise
+        */
        bool IsModeSet(ModeHandler* mode) { return ((mode->GetId() != ModeParser::MODEID_MAX) && (modes[mode->GetId()])); }
        bool IsModeSet(ModeHandler& mode) { return IsModeSet(&mode); }
        bool IsModeSet(ChanModeReference& mode);
 
        /** Returns the parameter for a custom mode on a channel.
-         * @param mode The mode character you wish to query
-         *
-         * For example if "+L #foo" is set, and you pass this method
-         * 'L', it will return '\#foo'. If the mode is not set on the
-         * channel, or the mode has no parameters associated with it,
-         * it will return an empty string.
-         *
-         * @return The parameter for this mode is returned, or an empty string
-         */
+        * @param mode The mode character you wish to query
+        *
+        * For example if "+L #foo" is set, and you pass this method
+        * 'L', it will return '\#foo'. If the mode is not set on the
+        * channel, or the mode has no parameters associated with it,
+        * it will return an empty string.
+        *
+        * @return The parameter for this mode is returned, or an empty string
+        */
        std::string GetModeParameter(ModeHandler* mode);
        std::string GetModeParameter(ChanModeReference& mode);
        std::string GetModeParameter(ParamModeBase* pm);

diff --git a/include/clientprotocol.h b/include/clientprotocol.h
index 29035250d34e04bc9fceb32f031747bd2f333368..decb2fcf496a69693513a6c71f5c63deca023cf4 100644 (file)
--- a/include/clientprotocol.h
+++ b/include/clientprotocol.h
@@ -249,7 +249,7 @@ class ClientProtocol::Message : public ClientProtocol::MessageSource
                        : ptr(NULL)
                        , owned(true)
                {
-                        new(str) std::string(s);
+                       new(str) std::string(s);
                }
 
                Param(const Param& other)

diff --git a/include/command_parse.h b/include/command_parse.h
index d1a9d5e038f653233b26a7fbce27285330c0c4db..64981c634434eb2b0065bac343e8b7f9121b30c7 100644 (file)
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -34,7 +34,7 @@
 class CoreExport CommandParser
 {
  public:
-       typedef TR1NS::unordered_map<std::string, Command*, irc::insensitive, irc::StrHashComp> CommandMap;
+       typedef TR1NS::unordered_map<std::string, Command*, irc::insensitive, irc::StrHashComp> CommandMap;
 
  private:
        /** Process a command from a user.

diff --git a/include/cull_list.h b/include/cull_list.h
index d29b7b267c21a9fcc5629bbb58222e0f214f8480..41dab51875d76e7307c8620d601e6615d572dcd6 100644 (file)
--- a/include/cull_list.h
+++ b/include/cull_list.h
@@ -49,7 +49,7 @@ class CoreExport CullList
 class CoreExport ActionBase : public classbase
 {
  public:
-        /** Executes this action. */
+       /** Executes this action. */
        virtual void Call() = 0;
 };
 

diff --git a/include/inspsocket.h b/include/inspsocket.h
index f9cc87b1daf679473cd0b88d03d85bf8601e40dd..45fa46a5b6a4c528a3dd2997dba56759084f0407 100644 (file)
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -216,7 +216,7 @@ class CoreExport StreamSocket : public EventHandler
                }
 
         private:
-               /** Private send queue. Note that individual strings may be shared.
+               /** Private send queue. Note that individual strings may be shared.
                 */
                Container data;
 
@@ -276,7 +276,7 @@ class CoreExport StreamSocket : public EventHandler
         * @param hook Next IOHook in the chain, can be NULL
         * @param rq Receive queue to put incoming data into
         * @return < 0 on error or close, 0 if no new data is ready (but the socket is still connected), > 0 if data was read from
-        the socket and put into the recvq
+        * the socket and put into the recvq
         */
        int HookChainRead(IOHook* hook, std::string& rq);
 

diff --git a/include/iohook.h b/include/iohook.h
index dd5acda1271cc02a8c1bde5be5cb2b1ba0d5755d..1985ea891247e789c8c90d3b5d416a4755a4afd6 100644 (file)
--- a/include/iohook.h
+++ b/include/iohook.h
@@ -24,7 +24,7 @@ class StreamSocket;
 
 class IOHookProvider : public refcountbase, public ServiceProvider
 {
-       const bool middlehook;
+       const bool middlehook;
 
  public:
        enum Type

diff --git a/include/message.h b/include/message.h
index 068f3124659182b02e08609df9f90bedb78db94b..ed44868eeff4fd248f89d408e5aa6f827ea1b068 100644 (file)
--- a/include/message.h
+++ b/include/message.h
@@ -42,7 +42,7 @@ class CoreExport MessageDetails
        /** Whether to update the source user's idle time. */
        bool update_idle;
 
-        /** The users who are exempted from receiving this message. */
+       /** The users who are exempted from receiving this message. */
        CUList exemptions;
 
        /* The original message as sent by the user. */

diff --git a/include/mode.h b/include/mode.h
index 82dd75770a1c4c5fa3b78d6e4551c1ec8866345c..940ed2144b34ab1b8863c9d3bb4e160f89eb25ad 100644 (file)
--- a/include/mode.h
+++ b/include/mode.h
@@ -99,7 +99,7 @@ class ParamModeBase;
 class CoreExport ModeHandler : public ServiceProvider
 {
  public:
-       typedef size_t Id;
+       typedef size_t Id;
 
        enum Class
        {
@@ -579,7 +579,7 @@ class CoreExport ModeParser : public fakederef<ModeParser>
  private:
        /** Type of the container that maps mode names to ModeWatchers
         */
-       typedef insp::flat_multimap<std::string, ModeWatcher*> ModeWatcherMap;
+       typedef insp::flat_multimap<std::string, ModeWatcher*> ModeWatcherMap;
 
        /** Last item in the ModeType enum
         */

diff --git a/include/modules/callerid.h b/include/modules/callerid.h
index eda930d2899fb05e9f64696fa35254a2fa9af29b..989a5918c32efa1fece7067a82de25007452cf93 100644 (file)
--- a/include/modules/callerid.h
+++ b/include/modules/callerid.h
@@ -28,7 +28,7 @@ namespace CallerID
 class CallerID::APIBase : public DataProvider
 {
  public:
-       APIBase(Module* parent)
+       APIBase(Module* parent)
                : DataProvider(parent, "m_callerid_api")
        {
        }

diff --git a/include/modules/dns.h b/include/modules/dns.h
index bce842bd8821a769c22a907b91f683ed9fdf814d..aa6092788e35a55e87e466875c7b7346e2af5836 100644 (file)
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -162,8 +162,8 @@ namespace DNS
                /* Use result cache if available */
                bool use_cache;
                /* Request id */
-               RequestId id;
-               /* Creator of this request */
+               RequestId id;
+               /* Creator of this request */
                Module* const creator;
 
                Request(Manager* mgr, Module* mod, const std::string& addr, QueryType qt, bool usecache = true, unsigned int timeout = 0)

diff --git a/include/modules/regex.h b/include/modules/regex.h
index 5a0ea49031037046c00436299dd9db22f21c2c60..6d036e148063e0615163b968fcfb357fd13a0a77 100644 (file)
--- a/include/modules/regex.h
+++ b/include/modules/regex.h
@@ -59,9 +59,9 @@ class RegexFactory : public DataProvider
 class RegexException : public ModuleException
 {
  public:
-        RegexException(const std::string& regex, const std::string& error)
-                : ModuleException("Error in regex '" + regex + "': " + error) { }
+       RegexException(const std::string& regex, const std::string& error)
+               : ModuleException("Error in regex '" + regex + "': " + error) { }
 
-        RegexException(const std::string& regex, const std::string& error, int offset)
-                : ModuleException("Error in regex '" + regex + "' at offset " + ConvToStr(offset) + ": " + error) { }
+       RegexException(const std::string& regex, const std::string& error, int offset)
+               : ModuleException("Error in regex '" + regex + "' at offset " + ConvToStr(offset) + ": " + error) { }
 };

diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index c9229cf9d0a7593365a8458ae008a58e99c287fb..ec16a56c3caacf12fbe8c1310d9c73a8db127266 100644 (file)
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -250,7 +250,7 @@ class SSLIOHook : public IOHook
 class SSLClientCert
 {
  public:
-       /**
+       /**
         * Get the client certificate from a socket
         * @param sock The socket to get the certificate from, the socket does not have to use TLS (SSL)
         * @return The TLS (SSL) client certificate information, NULL if the peer is not using TLS (SSL)
@@ -283,7 +283,7 @@ class SSLClientCert
 class UserCertificateAPIBase : public DataProvider
 {
  public:
-       UserCertificateAPIBase(Module* parent)
+       UserCertificateAPIBase(Module* parent)
                : DataProvider(parent, "m_sslinfo_api")
        {
        }

diff --git a/include/parammode.h b/include/parammode.h
index 06f127e11e8a501504ff474378917f047f16d2a7..002246d9b88711f0eb8742558a634c1b4bd03a8b 100644 (file)
--- a/include/parammode.h
+++ b/include/parammode.h
@@ -23,7 +23,7 @@
 class CoreExport ParamModeBase : public ModeHandler
 {
  private:
-       virtual void OnUnsetInternal(User* source, Channel* chan) = 0;
+       virtual void OnUnsetInternal(User* source, Channel* chan) = 0;
 
  public:
        ParamModeBase(Module* Creator, const std::string& Name, char modeletter, ParamSpec ps)

diff --git a/include/serialize.h b/include/serialize.h
index 192fd29d3cdba3b44be69178b9746fea336d58a3..df0cbd5d58fa43379bb19dd2da982280c02377a2 100644 (file)
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -44,7 +44,7 @@ class CoreExport Serializable
                EntryMap entries;
 
         public:
-                /** Retrieves the child elements. */
+               /** Retrieves the child elements. */
                const ChildMap& GetChildren() const { return children; }
                ChildMap& GetChildren() { return children; }
 

diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 77999e541bbceed68fc337d507de1f7e8191593f..1b88179b60b29bf060c2d3210af5ccbe7833b39a 100644 (file)
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -51,11 +51,11 @@ class CoreExport ThreadEngine
        static DWORD WINAPI Entry(void* parameter);
 
        /** Create a new thread. This takes an already allocated
-         * Thread* pointer and initializes it to use this threading
-         * engine. On failure, this function may throw a CoreException.
-         * @param thread_to_init Pointer to a newly allocated Thread
-         * derived object.
-         */
+        * Thread* pointer and initializes it to use this threading
+        * engine. On failure, this function may throw a CoreException.
+        * @param thread_to_init Pointer to a newly allocated Thread
+        * derived object.
+        */
        void Start(Thread* thread_to_init);
 
        /** Stop a thread gracefully.

diff --git a/include/users.h b/include/users.h
index 8045d57050c5d56ff670e27f7aae466ebec11146..1283d9fb34f906c9b85ce94f7143dcda485c30f9 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -61,8 +61,8 @@ enum RegistrationState {
 
        REG_USER = 1,           /* Has sent USER */
        REG_NICK = 2,           /* Has sent NICK */
-       REG_NICKUSER = 3,       /* Bitwise combination of REG_NICK and REG_USER */
-       REG_ALL = 7             /* REG_NICKUSER plus next bit along */
+       REG_NICKUSER = 3,       /* Bitwise combination of REG_NICK and REG_USER */
+       REG_ALL = 7                     /* REG_NICKUSER plus next bit along */
 };
 
 enum UserType {
@@ -712,7 +712,7 @@ class CoreExport User : public Extensible
 class CoreExport UserIOHandler : public StreamSocket
 {
  private:
-        size_t checked_until;
+       size_t checked_until;
  public:
        LocalUser* const user;
        UserIOHandler(LocalUser* me)

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 9f5a49f1daffc65d401304f36803fb982d268a3d..32b705e8b666a8e98228d3d44616f774ce727606 100644 (file)
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -535,7 +535,7 @@ bool ConfigTag::readString(const std::string& key, std::string& value, bool allo
                if(j->first != key)
                        continue;
                value = j->second;
-               if (!allow_lf && (value.find('\n') != std::string::npos))
+               if (!allow_lf && (value.find('\n') != std::string::npos))
                {
                        ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Value of <" + tag + ":" + key + "> at " + getTagLocation() +
                                " contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces.");

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 2d3ecc3dead9b4848ef87c01ce98c4c0d37186f8..a739bf5b5ae13b9fc3a6eaf91747b0a65be605c3 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -506,8 +506,8 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 
        ConfigTagList binds = ConfTags("bind");
        if (binds.first == binds.second)
-                errstr << "Possible configuration error: you have not defined any <bind> blocks." << std::endl
-                        << "You will need to do this if you want clients to be able to connect!" << std::endl;
+               errstr << "Possible configuration error: you have not defined any <bind> blocks." << std::endl
+                       << "You will need to do this if you want clients to be able to connect!" << std::endl;
 
        if (old && valid)
        {

diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index 7624ce05f0d26275526c467243d956e7f3be3135..76ec6db7d04dc71d3bf2b5eaaa7010f2479dfc2e 100644 (file)
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -63,7 +63,7 @@ CmdResult CommandModules::Handle(User* user, const Params& parameters)
 
        const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
 
-       for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
+       for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
        {
                Module* m = i->second;
                Version V = m->GetVersion();

diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index f3299db906165db4be25f27d0b40dea56d59a1a7..ce1f636677694ef7b48edddc7dc0e41dc8c93cb8 100644 (file)
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -31,10 +31,10 @@ static ClientProtocol::Serializer* dummyserializer;
 
 class DummySerializer : public ClientProtocol::Serializer
 {
-       bool Parse(LocalUser* user, const std::string& line, ClientProtocol::ParseOutput& parseoutput) CXX11_OVERRIDE
-       {
-               return false;
-       }
+       bool Parse(LocalUser* user, const std::string& line, ClientProtocol::ParseOutput& parseoutput) CXX11_OVERRIDE
+       {
+               return false;
+       }
 
        ClientProtocol::SerializedMessage Serialize(const ClientProtocol::Message& msg, const ClientProtocol::TagSelection& tagwl) const CXX11_OVERRIDE
        {

diff --git a/src/coremods/core_serialize_rfc.cpp b/src/coremods/core_serialize_rfc.cpp
index dcd67d49e041c1061d05dd25913022a87739c8ed..23d7b4aff02b9c06d6776097aa0e3d322fc1f38b 100644 (file)
--- a/src/coremods/core_serialize_rfc.cpp
+++ b/src/coremods/core_serialize_rfc.cpp
@@ -43,7 +43,7 @@ class RFCSerializer : public ClientProtocol::Serializer
        {
        }
 
-       bool Parse(LocalUser* user, const std::string& line, ClientProtocol::ParseOutput& parseoutput) CXX11_OVERRIDE;
+       bool Parse(LocalUser* user, const std::string& line, ClientProtocol::ParseOutput& parseoutput) CXX11_OVERRIDE;
        ClientProtocol::SerializedMessage Serialize(const ClientProtocol::Message& msg, const ClientProtocol::TagSelection& tagwl) const CXX11_OVERRIDE;
 };
 

diff --git a/src/coremods/core_stub.cpp b/src/coremods/core_stub.cpp
index 460068da5dc8b4dd2ba605f64e358b4da8b39c1c..0695e4d995a7ced2fb6f201d4faba06b7f9b5772 100644 (file)
--- a/src/coremods/core_stub.cpp
+++ b/src/coremods/core_stub.cpp
@@ -167,7 +167,7 @@ class CommandUsers
 class CoreModStub : public Module
 {
  private:
-       CommandCapab cmdcapab;
+       CommandCapab cmdcapab;
        CommandConnect cmdconnect;
        CommandLinks cmdlinks;
        CommandSquit cmdsquit;

diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index c1c4777ef24c397b4bcaff5c555ed290a47ce811..b342f723f07b3f418c01b92a51fcdeb0e8d691c4 100644 (file)
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -80,10 +80,10 @@ class CommandWhois : public SplitCommand
        void SendChanList(WhoisContextImpl& whois);
 
  public:
-        /** If true then all opers are shown with a generic 'is a server operator' line rather than the oper type. */
+       /** If true then all opers are shown with a generic 'is a server operator' line rather than the oper type. */
        bool genericoper;
 
-        /** How to handle private/secret channels in the WHOIS response. */
+       /** How to handle private/secret channels in the WHOIS response. */
        SplitWhoisState splitwhois;
 
 

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 800d147ebf8e4989b22bbe11b1631c7effd2499e..795f858fa35018171d424ebb70a9051866936355 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -338,7 +338,7 @@ bool InspIRCd::IsSID(const std::string &str)
         */
        return ((str.length() == 3) && isdigit(str[0]) &&
                        ((str[1] >= 'A' && str[1] <= 'Z') || isdigit(str[1])) &&
-                        ((str[2] >= 'A' && str[2] <= 'Z') || isdigit(str[2])));
+                       ((str[2] >= 'A' && str[2] <= 'Z') || isdigit(str[2])));
 }
 
 /** A lookup table of values for multiplier characters used by

diff --git a/src/mode.cpp b/src/mode.cpp
index 3ce7ee10ffc3a59b72ad712f266fa94eb2de37f9..3538052b7a3e4d4310527366853aa659bdcf7530 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -575,7 +575,7 @@ void ModeParser::CleanMask(std::string &mask)
        else if ((pos_of_pling == std::string::npos) && (pos_of_at != std::string::npos))
        {
                /* Has an @ but no !, its a user@host */
-                mask = "*!" + mask;
+               mask = "*!" + mask;
        }
        else if ((pos_of_pling != std::string::npos) && (pos_of_at == std::string::npos))
        {
@@ -759,9 +759,9 @@ std::string ModeParser::GiveModeList(ModeType mt)
        for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
                ModeHandler* mh = modehandlers[mt][mode-65];
-                /* One parameter when adding */
                if (mh)
                {
+                       /* One parameter when adding */
                        if (mh->NeedsParam(true))
                        {
                                PrefixMode* pm = mh->IsPrefixMode();

diff --git a/src/modules.cpp b/src/modules.cpp
index 6bb789753eb58f9a85c19e5e6603b7775ec2c2f5..f940a0fd8948e20aaf0cf6ed53a99fd3a3eb50fa 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -138,13 +138,13 @@ void              Module::OnChangeIdent(User*, const std::string&) { DetachEvent(I_OnChangeI
 void           Module::OnAddLine(User*, XLine*) { DetachEvent(I_OnAddLine); }
 void           Module::OnDelLine(User*, XLine*) { DetachEvent(I_OnDelLine); }
 void           Module::OnExpireLine(XLine*) { DetachEvent(I_OnExpireLine); }
-void           Module::OnCleanup(ExtensionItem::ExtensibleType, Extensible*) { }
+void           Module::OnCleanup(ExtensionItem::ExtensibleType, Extensible*) { }
 ModResult      Module::OnChannelPreDelete(Channel*) { DetachEvent(I_OnChannelPreDelete); return MOD_RES_PASSTHRU; }
 void           Module::OnChannelDelete(Channel*) { DetachEvent(I_OnChannelDelete); }
 void           Module::OnBuildNeighborList(User*, IncludeChanList&, std::map<User*,bool>&) { DetachEvent(I_OnBuildNeighborList); }
 void           Module::OnGarbageCollect() { DetachEvent(I_OnGarbageCollect); }
 ModResult      Module::OnSetConnectClass(LocalUser* user, ConnectClass* myclass) { DetachEvent(I_OnSetConnectClass); return MOD_RES_PASSTHRU; }
-void           Module::OnUserMessage(User*, const MessageTarget&, const MessageDetails&) { DetachEvent(I_OnUserMessage); }
+void           Module::OnUserMessage(User*, const MessageTarget&, const MessageDetails&) { DetachEvent(I_OnUserMessage); }
 ModResult      Module::OnNumeric(User*, const Numeric::Numeric&) { DetachEvent(I_OnNumeric); return MOD_RES_PASSTHRU; }
 ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { DetachEvent(I_OnAcceptConnection); return MOD_RES_PASSTHRU; }
 void           Module::OnSetUserIP(LocalUser*) { DetachEvent(I_OnSetUserIP); }

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 36156013df7ad703f189bb23511577c97dc8c11e..e1db996c896d918867bd8677b6190a174df03daa 100644 (file)
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -186,7 +186,7 @@ class SQLConn : public SQL::Provider, public EventHandler
  public:
        reference<ConfigTag> conf;      /* The <database> entry */
        std::deque<QueueItem> queue;
-       PGconn*                 sql;            /* PgSQL database connection handle */
+       PGconn*                 sql;            /* PgSQL database connection handle */
        SQLstatus               status;         /* PgSQL database connection status */
        QueueItem               qinprog;        /* If there is currently a query in progress */
 

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 5dadda1845e354ee5fb427d0074f5d924cb4edcf..e02c4a697d62407c9c20bbddacc7dede404d5002 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -1248,7 +1248,7 @@ class GnuTLSIOHookProvider : public SSLIOHookProvider
        GnuTLS::Profile profile;
 
  public:
-       GnuTLSIOHookProvider(Module* mod, GnuTLS::Profile::Config& config)
+       GnuTLSIOHookProvider(Module* mod, GnuTLS::Profile::Config& config)
                : SSLIOHookProvider(mod, config.name)
                , profile(config)
        {

diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index 5c768ce3cb21c9bef89a64b3cf42ad3d4d7fb886..c3d040ad03b394714e1b3b1403dec5720b70eec1 100644 (file)
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -822,7 +822,7 @@ class mbedTLSIOHookProvider : public SSLIOHookProvider
        mbedTLS::Profile profile;
 
  public:
-       mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config)
+       mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config)
                : SSLIOHookProvider(mod, config.name)
                , profile(config)
        {

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 14f7012b6f4d631073a179eca2fd312b71e02634..ec1114cb97b5ad367ae6678cacd2fc1a0f6def67 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -45,7 +45,7 @@ enum
 class callerid_data
 {
  public:
-       typedef insp::flat_set<User*> UserSet;
+       typedef insp::flat_set<User*> UserSet;
        typedef std::vector<callerid_data*> CallerIdDataSet;
 
        time_t lastnotify;

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 1cf6c29bfe4517d5b1cb35aac15bdeb9e80653a5..c7960c836d0ca6a5a77d7143440b21b3c7d59c5c 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -83,7 +83,7 @@ class CBanFactory : public XLineFactory
        CBanFactory() : XLineFactory("CBAN") { }
 
        /** Generate a CBAN
-       */
+       */
        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
        {
                return new CBan(set_time, duration, source, reason, xline_specific_mask);
@@ -218,7 +218,7 @@ class ModuleCBan : public Module, public Stats::EventListener
                        // Channel is banned.
                        user->WriteNumeric(ERR_BADCHANNEL, cname, InspIRCd::Format("Channel %s is CBANed: %s", cname.c_str(), rl->reason.c_str()));
                        ServerInstance->SNO->WriteGlobalSno('a', "%s tried to join %s which is CBANed (%s)",
-                                user->nick.c_str(), cname.c_str(), rl->reason.c_str());
+                               user->nick.c_str(), cname.c_str(), rl->reason.c_str());
                        return MOD_RES_DENY;
                }
 

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 1210c7c126adddcf04922ace4ddf405a5399192e..3336b18178502ecbc8dffc5cad643b3c5f4d23ad 100644 (file)
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -39,7 +39,7 @@ class CommandClones : public SplitCommand
        IRCv3::Batch::Batch batch;
 
  public:
-       CommandClones(Module* Creator)
+       CommandClones(Module* Creator)
                : SplitCommand(Creator,"CLONES", 1)
                , batchmanager(Creator)
                , batch("inspircd.org/clones")

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 98bcbf4cd46506083603d3fd5adb813a2907516b..007f0efef0b084d5bd5231ad72359a8e3697c224 100644 (file)
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -352,7 +352,7 @@ class CommandDccallow : public Command
 
        void DisplayDCCAllowList(User* user)
        {
-                // display current DCCALLOW list
+               // display current DCCALLOW list
                user->WriteNumeric(RPL_DCCALLOWSTART, "Users on your DCCALLOW list:");
 
                dl = ext.get(user);

diff --git a/src/modules/m_haproxy.cpp b/src/modules/m_haproxy.cpp
index cf551d5455cf19d385fd705c80401cbfb37d5593..f7ef5221329e0c446d0e8604daa49cab86a969b0 100644 (file)
--- a/src/modules/m_haproxy.cpp
+++ b/src/modules/m_haproxy.cpp
@@ -110,7 +110,7 @@ struct HAProxyHeader
 class HAProxyHookProvider : public IOHookProvider
 {
  private:
-        UserCertificateAPI sslapi;
+       UserCertificateAPI sslapi;
 
  public:
        HAProxyHookProvider(Module* mod)

diff --git a/src/modules/m_hidemode.cpp b/src/modules/m_hidemode.cpp
index 66e70fb892352f2b090ff6b2e1d1ec8c60c83d31..3f041344f1ceb53a3366b6f93423bbc6e0e9647d 100644 (file)
--- a/src/modules/m_hidemode.cpp
+++ b/src/modules/m_hidemode.cpp
@@ -91,7 +91,7 @@ class ModeHook : public ClientProtocol::EventHook
                        const Modes::Change& curr = *i;
                        if (settings.GetRequiredRank(*curr.mh) <= rank)
                        {
-                                // No restriction on who can see this mode or there is one but the member's rank is sufficient
+                               // No restriction on who can see this mode or there is one but the member's rank is sufficient
                                if (modechangelist)
                                        modechangelist->push(curr);
 

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index eefb3ed93c09f10f74950efa9e6d97ecaddecbc3..f3ec3298bd8823b154b4c9fb5017159ba7bea800 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -359,7 +359,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
                        {
                                if (pathsegment == ".")
                                {
-                                        // Stay at the current level.
+                                       // Stay at the current level.
                                        continue;
                                }
 

diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 197bf589ef999ac82600ffc7216fe3bf5bebf36d..270e8b007ec94ef93e18122594f8bc83f70b25cf 100644 (file)
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -48,7 +48,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
        HTTPdAPI API;
 
  public:
-       ModuleHTTPAccessList()
+       ModuleHTTPAccessList()
                : HTTPACLEventListener(this)
                , API(this)
        {

diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index 54163f2b1beafc4ec69b7edb4f1a68c8cc6dcae0..e23999045934fe66e83c97e275d62254e7625410 100644 (file)
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -51,10 +51,10 @@ class JoinHook : public ClientProtocol::EventHook
        ClientProtocol::Events::Join extendedjoinmsg;
 
  public:
-       const std::string asterisk;
+       const std::string asterisk;
        ClientProtocol::EventProvider awayprotoev;
        AwayMessage awaymsg;
-       Cap::Capability extendedjoincap;
+       Cap::Capability extendedjoincap;
        Cap::Capability awaycap;
 
        JoinHook(Module* mod)

diff --git a/src/modules/m_ircv3_batch.cpp b/src/modules/m_ircv3_batch.cpp
index aa464f9fe3cfb07666d2ef7062406ca0a72158ce..e280339e434ba70d6de8277cd976cf0f800bbe43 100644 (file)
--- a/src/modules/m_ircv3_batch.cpp
+++ b/src/modules/m_ircv3_batch.cpp
@@ -59,12 +59,12 @@ struct IRCv3::Batch::BatchInfo
 
 class IRCv3::Batch::ManagerImpl : public Manager
 {
-       typedef std::vector<Batch*> BatchList;
+       typedef std::vector<Batch*> BatchList;
 
        Cap::Capability cap;
        ClientProtocol::EventProvider protoevprov;
        LocalIntExt batchbits;
-       BatchList active_batches;
+       BatchList active_batches;
        bool unloading;
 
        bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) CXX11_OVERRIDE

diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp
index 4885bc0e5d484b06b369e7c0d55f124287db568e..8d4b956e71390277d01bfb3c7edf15206acc330f 100644 (file)
--- a/src/modules/m_ldapauth.cpp
+++ b/src/modules/m_ldapauth.cpp
@@ -325,7 +325,7 @@ public:
                whitelistedcidrs.clear();
                requiredattributes.clear();
 
-               base                    = tag->getString("baserdn");
+               base                    = tag->getString("baserdn");
                attribute               = tag->getString("attribute");
                killreason              = tag->getString("killreason");
                vhost                   = tag->getString("host");

diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index ea631b2e86830d6bf6ee31decb0f0a691d5ef3be..823a6fe5dc9a0560330ec1abe8a12c0308ad6771 100644 (file)
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -190,7 +190,7 @@ class IRCv3::Monitor::Manager
        }
 
  private:
-       typedef TR1NS::unordered_map<std::string, Entry, irc::insensitive, irc::StrHashComp> NickHash;
+       typedef TR1NS::unordered_map<std::string, Entry, irc::insensitive, irc::StrHashComp> NickHash;
 
        Entry* Find(const std::string& nick)
        {
@@ -239,9 +239,9 @@ class IRCv3::Monitor::Manager
                return &extdata->list;
        }
 
-       NickHash nicks;
-       ExtItem ext;
-       WatchedList emptywatchedlist;
+       NickHash nicks;
+       ExtItem ext;
+       WatchedList emptywatchedlist;
 };
 
 void IRCv3::Monitor::Manager::ExtItem::FromInternal(Extensible* container, const std::string& value)

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 3b9afd5bde1cc292dacc4f208f7e432adfa39207..91293573fab2a4df6a3d93a810682e009dda5970 100644 (file)
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -40,7 +40,6 @@ class lwbNickHandler
        static bool Call(const std::string&);
 };
 
-                                                                /*,m_reverse_additionalUp[256];*/
 static unsigned char m_reverse_additional[256],m_additionalMB[256],m_additionalUtf8[256],m_additionalUtf8range[256],m_additionalUtf8interval[256];
 
 char utf8checkrest(unsigned char * mb, unsigned char cnt)
@@ -417,7 +416,7 @@ class ModuleNationalChars : public Module
                                        if (*p == '0')
                                        {
                                                if (p[1] == 'x')
-                                                        /* hex with the leading "0x" */
+                                                       /* hex with the leading "0x" */
                                                        chartable[i] = symtoi(p + 2, 16);
                                                else
                                                        chartable[i] = symtoi(p + 1, 8);
@@ -426,12 +425,13 @@ class ModuleNationalChars : public Module
                                        else if (*p == 'x')
                                        {
                                                chartable[i] = symtoi(p + 1, 16);
-                                       }else    /* decimal form */
+                                       }
+                                       else /* decimal form */
                                        {
                                                chartable[i] = symtoi(p, 10);
                                        }
                                }
-                               else             /* plain-text char between '' */
+                               else /* plain-text char between '' */
                                {
                                        if (*(p + 1) == '\\')
                                        {

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index e0dbabf42b3ccf794b76d00a72ab4a60471a2957..cd59f07bcf4f6191e9ebbbfb8f6e8ab318f88fb0 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -44,7 +44,7 @@ class RemoveBase : public Command
        ChanModeReference& nokicksmode;
 
  public:
-       unsigned int protectedrank;
+       unsigned int protectedrank;
 
        RemoveBase(Module* Creator, bool& snk, ChanModeReference& nkm, const char* cmdn)
                : Command(Creator, cmdn, 2, 3)
@@ -108,7 +108,7 @@ class RemoveBase : public Command
                {
                        /* We'll let everyone remove their level and below, eg:
                         * ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1)
-                         a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
+                        * a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
                         * Nobody may remove people with >= protectedrank rank.
                         */
                        unsigned int ulevel = channel->GetPrefixValue(user);

diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 5a532389a8eef17b7ff35343afd05689589fc522..33ca5b057d33d8de42fa3c876e3ad7ea6dce247e 100644 (file)
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -30,7 +30,7 @@
 class ChannelSettings
 {
  public:
-       enum RepeatAction
+       enum RepeatAction
        {
                ACT_KICK,
                ACT_BLOCK,

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index e202bae45181f8538153c6bc2417d59823548240..57e605d61a0bcb59698a15caefb5ce4b7bc50a01 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -235,11 +235,11 @@ class SaslAuthenticator
        {
                switch (this->state)
                {
-                case SASL_INIT:
+               case SASL_INIT:
                        this->agent = msg[0];
                        this->state = SASL_COMM;
                        /* fall through */
-                case SASL_COMM:
+               case SASL_COMM:
                        if (msg[0] != this->agent)
                                return this->state;
 
@@ -267,9 +267,9 @@ class SaslAuthenticator
                                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str());
 
                        break;
-                case SASL_DONE:
+               case SASL_DONE:
                        break;
-                default:
+               default:
                        ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WTF: SaslState is not a known state (%d)", this->state);
                        break;
                }
@@ -301,16 +301,16 @@ class SaslAuthenticator
 
                switch (this->result)
                {
-                case SASL_OK:
+               case SASL_OK:
                        this->user->WriteNumeric(RPL_SASLSUCCESS, "SASL authentication successful");
                        break;
-                case SASL_ABORT:
+               case SASL_ABORT:
                        this->user->WriteNumeric(ERR_SASLABORTED, "SASL authentication aborted");
                        break;
-                case SASL_FAIL:
+               case SASL_FAIL:
                        this->user->WriteNumeric(ERR_SASLFAIL, "SASL authentication failed");
                        break;
-                default:
+               default:
                        break;
                }
 
@@ -321,8 +321,8 @@ class SaslAuthenticator
 class CommandAuthenticate : public SplitCommand
 {
  private:
-        // The maximum length of an AUTHENTICATE request.
-        static const size_t MAX_AUTHENTICATE_SIZE = 400;
+       // The maximum length of an AUTHENTICATE request.
+       static const size_t MAX_AUTHENTICATE_SIZE = 400;
 
  public:
        SimpleExtItem<SaslAuthenticator>& authExt;

diff --git a/src/modules/m_sha1.cpp b/src/modules/m_sha1.cpp
index 2d8ce635ce32e055659f0a13818197851be2a17e..69af2eba611ddf2f210fec1d93305ef1ae0f6ea2 100644 (file)
--- a/src/modules/m_sha1.cpp
+++ b/src/modules/m_sha1.cpp
@@ -166,7 +166,7 @@ class SHA1Context
 class SHA1HashProvider : public HashProvider
 {
  public:
-       SHA1HashProvider(Module* mod)
+       SHA1HashProvider(Module* mod)
                : HashProvider(mod, "sha1", 20, 64)
        {
        }

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index d63b721a0ebe5938c285cbcbbfcfacb948692e58..c68afc494491177ced33e0bfa8de8bdc24d958a7 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -43,7 +43,7 @@ class ShunFactory : public XLineFactory
        ShunFactory() : XLineFactory("SHUN") { }
 
        /** Generate a shun
-       */
+       */
        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
        {
                return new Shun(set_time, duration, source, reason, xline_specific_mask);

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 01387c753c85ca7b68e476ac9bc771574ce7ef28..507897a4e843a4c26cfc7de3f844394ea873e13f 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -128,7 +128,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
                {
                        if (user->IsOper())
                        {
-                                ShowLinks(server, user, hops+1);
+                               ShowLinks(server, user, hops+1);
                        }
                }
                else

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 80b4e87c7cdbe37181c5f18ea7b6935b20375dbe..bef739ed011ee174bad2220a11f39ce19bce6fd5 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -78,8 +78,7 @@ bool SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remo
                 * if ident@ip is equal, and theirs is newer, or
                 * ident@ip differ, and ours is newer
                 */
-               if((SamePerson && remotets < localts) ||
-                  (!SamePerson && remotets > localts))
+               if ((SamePerson && remotets < localts) || (!SamePerson && remotets > localts))
                {
                        // Only remote needs to change
                        bChangeLocal = false;

diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp
index 32f8caf04f3bab5422f3830de0730afc0f5cdcf2..64c02e1499ad1e6e8c317e0a20f4ed514e3d180c 100644 (file)
--- a/src/modules/m_spanningtree/override_squit.cpp
+++ b/src/modules/m_spanningtree/override_squit.cpp
@@ -54,7 +54,7 @@ ModResult ModuleSpanningTree::HandleSquit(const CommandBase::Params& parameters,
        }
        else
        {
-                user->WriteNotice("*** SQUIT: The server \002" + parameters[0] + "\002 does not exist on the network.");
+               user->WriteNotice("*** SQUIT: The server \002" + parameters[0] + "\002 does not exist on the network.");
        }
        return MOD_RES_DENY;
 }

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index f705887b70ac7b6517947cebed2d8220d91713b0..5d0fc9f2d7598508bcfdd60561353b01e2495b90 100644 (file)
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -55,10 +55,10 @@
  * CONNECTING: indicates an outbound socket which is
  *                                                     waiting to be writeable.
  * WAIT_AUTH_1:        indicates the socket is outbound and
- *                                                     has successfully connected, but has not
+ *                                                     has successfully connected, but has not
  *                                                     yet sent and received SERVER strings.
  * WAIT_AUTH_2:        indicates that the socket is inbound
- *                                                     but has not yet sent and received
+ *                                                     but has not yet sent and received
  *                                                     SERVER strings.
  * CONNECTED:   represents a fully authorized, fully
  *                                                     connected server.

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 889cd182e0193086fe7c2d3e8c205120801feea8..26e6e7c22aaaec8dda4b65cb7aadbaa5b9b306d0 100644 (file)
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -50,7 +50,7 @@ class SpanningTreeUtilities : public classbase
        CacheRefreshTimer RefreshTimer;
 
  public:
-       typedef std::set<TreeSocket*> TreeSocketSet;
+       typedef std::set<TreeSocket*> TreeSocketSet;
        typedef std::map<TreeSocket*, std::pair<std::string, unsigned int> > TimeoutList;
 
        /** Creator module

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index ec7fb1a1100283e59cf462bdec8fe92b03bdc200..48dad2ca4d8dce21a370370d0f653c88a90cf709 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -82,7 +82,7 @@ class SVSHoldFactory : public XLineFactory
        SVSHoldFactory() : XLineFactory("SVSHOLD") { }
 
        /** Generate an SVSHOLD
-       */
+       */
        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
        {
                return new SVSHold(set_time, duration, source, reason, xline_specific_mask);

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 6928e43d75a330ffe79dc18a87f1fe01a2888537..9db27716404a6326e29213e41e89870a3dab803e 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -48,9 +48,9 @@ class ModuleXLineDB
        {
                /* Load the configuration
                 * Note:
-                *              This is on purpose not changed on a rehash. It would be non-trivial to change the database on-the-fly.
-                *              Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea
-                *              ...and so is discarding all current in-memory XLines for the ones in the database.
+                *              This is on purpose not changed on a rehash. It would be non-trivial to change the database on-the-fly.
+                *              Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea
+                *              ...and so is discarding all current in-memory XLines for the ones in the database.
                 */
                ConfigTag* Conf = ServerInstance->Config->ConfValue("xlinedb");
                xlinedbpath = ServerInstance->Config->Paths.PrependData(Conf->getString("filename", "xline.db", 1));
@@ -119,7 +119,7 @@ class ModuleXLineDB
                 * xline types may not have a conf tag, so let's just write them.
                 * In addition, let's use a file version, so we can maintain some
                 * semblance of backwards compatibility for reading on startup..
-                *              -- w00t
+                *              -- w00t
                 */
                stream << "VERSION 1" << std::endl;
 

diff --git a/src/xline.cpp b/src/xline.cpp
index 8b61ab6848a4f4e4d5c67941fd4af6e4c529e469..4e18a0dea347083524916b3fb0b68da4e512d30e 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -400,7 +400,7 @@ XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pat
 
        const time_t current = ServerInstance->Time();
 
-        LookupIter safei;
+       LookupIter safei;
 
        for (LookupIter i = x->second.begin(); i != x->second.end(); )
        {

diff --git a/win/win32service.cpp b/win/win32service.cpp
index 45aba726824c0d3af6146934f159887c97a500fa..846cc3273dbc78961986f990d0fd7e8a437f4575 100644 (file)
--- a/win/win32service.cpp
+++ b/win/win32service.cpp
@@ -120,7 +120,7 @@ VOID ServiceMain(DWORD argc, LPCSTR *argv)
                g_ServiceData.argc = argc;
 
                // Note: since this memory is going to stay allocated for the rest of the execution,
-               //               it doesn't make sense to free it, as it's going to be "freed" on process termination
+               // it doesn't make sense to free it, as it's going to be "freed" on process termination
                try {
                        g_ServiceData.argv = new char*[argc];