Merge pull request #53 from SaberUK/clang-analyze

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

diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index c3bc1b081da4c4436078eb2008c0cdf1e9f8c6e6..8e063394a9ec3c62f440bbba50b826de2a0e91fa 100644 (file)
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,43 +12,35 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "commands.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-bool TreeSocket::ServicePart(const std::string &prefix, std::deque<std::string> &params)
+CmdResult CommandSVSPart::Handle(const std::vector<std::string>& parameters, User *user)
 {
-       if (params.size() < 2)
-               return true;
-
        std::string reason = "Services forced part";
 
-       if (params.size() == 3)
-               reason = params[2];
+       if (parameters.size() == 3)
+               reason = parameters[2];
 
-       User* u = this->Instance->FindNick(params[0]);
-       Channel* c = this->Instance->FindChan(params[1]);
+       User* u = ServerInstance->FindNick(parameters[0]);
+       Channel* c = ServerInstance->FindChan(parameters[1]);
 
-       if (u)
-       {
-               /* only part if it's local, otherwise just pass it on! */
-               if (IS_LOCAL(u))
-                       if (!c->PartUser(u, reason))
-                               delete c;
-               Utils->DoOneToAllButSender(prefix,"SVSPART",params,prefix);
-       }
-
-       return true;
+       if (u && IS_LOCAL(u))
+               c->PartUser(u, reason);
+
+       return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandSVSPart::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+       User* u = ServerInstance->FindNick(parameters[0]);
+       if (u)
+               return ROUTE_OPT_UCAST(u->server);
+       return ROUTE_LOCALONLY;
+}