Change the syntax of FOREACH macros to be less dumb.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / uid.cpp

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 8e4c631f2845b4e73466816db0048e044d1ea47d..dd4591a9ba71185f8473e662767a08e90fdac3af 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -23,10 +23,7 @@
 #include "commands.h"
 
 #include "utils.h"
-#include "link.h"
-#include "treesocket.h"
 #include "treeserver.h"
-#include "resolvers.h"
 
 CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 {
@@ -65,7 +62,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
                 * Nick collision.
                 */
                int collide = sock->DoCollision(iter->second, age_t, params[5], params[6], params[0]);
-               ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
+               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
                if (collide != 1)
                {
@@ -88,7 +85,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        }
        catch (...)
        {
-               ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
                return CMD_INVALID;
        }
        (*(ServerInstance->Users->clientlist))[params[2]] = _new;
@@ -103,15 +100,17 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
        unsigned int paramptr = 9;
 
-       // Accept more '+' chars, for now
-       std::string::size_type pos = modestr.find_first_not_of('+');
-       for (std::string::const_iterator v = modestr.begin()+pos; v != modestr.end(); ++v)
+       for (std::string::const_iterator v = modestr.begin(); v != modestr.end(); ++v)
        {
+               // Accept more '+' chars, for now
+               if (*v == '+')
+                       continue;
+
                /* For each mode thats set, find the mode handler and set it on the new user */
                ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
                if (!mh)
                {
-                       ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v);
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v);
                        return CMD_INVALID;
                }
 
@@ -133,13 +132,13 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
                }
                else
                        mh->OnModeChange(_new, _new, NULL, empty, true);
-               _new->SetMode(*v, true);
+               _new->SetMode(mh, true);
        }
 
        _new->SetClientIP(params[6].c_str());
 
        ServerInstance->Users->AddGlobalClone(_new);
-       remoteserver->SetUserCount(1); // increment by 1
+       remoteserver->UserCount++;
 
        bool dosend = true;
 
@@ -149,7 +148,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        if (dosend)
                ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", _new->server.c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->fullname.c_str());
 
-       FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new));
+       FOREACH_MOD(OnPostConnect, (_new));
 
        return CMD_SUCCESS;
 }