Commit patch from danieldg that makes a ton of stuff const-safe for latest warn-happy...

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

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 6d813ae9ae171abf3408a36e177e56b72f52cbb7..25a860ae42bc8e62912630cabee9167d95d610c1 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -21,7 +21,7 @@ class CommandSwhois : public Command
 {
        
  public:
-       CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
+       CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2)
        {
                this->source = "m_swhois.so";
                syntax = "<nick> <swhois>";
@@ -38,12 +38,6 @@ class CommandSwhois : public Command
                        return CMD_FAILURE;
                }
 
-               if (!*parameters[1])
-               {
-                       user->WriteServ("NOTICE %s :*** SWHOIS: Whois line must be specified", user->nick);
-                       return CMD_FAILURE;
-               }
-               
                std::string line;
                for (int i = 1; i < pcnt; i++)
                {
@@ -59,7 +53,6 @@ class CommandSwhois : public Command
                if (text)
                {
                        // We already had it set...
-                       
                        if (!ServerInstance->ULine(user->server))
                                // Ulines set SWHOISes silently
                                ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
@@ -89,6 +82,13 @@ class CommandSwhois : public Command
                Event event((char*)metadata,(Module*)this,"send_metadata");
                event.Send(ServerInstance);
                delete metadata;
+               
+               // If it's an empty swhois, unset it (not ideal, but ok)
+               if (text->empty())
+               {
+                       dest->Shrink("swhois");
+                       delete text;
+               }
 
                return CMD_LOCALONLY;
        }
@@ -204,8 +204,8 @@ class ModuleSWhois : public Module
                        std::string* text;
                        if (!dest->GetExt("swhois", text))
                        {
-                               std::string* text = new std::string(extdata);
-                               dest->Extend("swhois",text);
+                               std::string* text2 = new std::string(extdata);
+                               dest->Extend("swhois",text2);
                        }
                }
        }