This will royally fuck 1.2's linking right now, but..

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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 2ac6ad55e114d06ce434f3982753ee5d5bee85d9..2bf4440b0821cb30712e634b9803f705f6bbd292 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -77,7 +77,7 @@ class ModuleAlias : public Module
                : Module(Me)
        {
                ReadAliases();
-               pars.resize(127);
+               pars.resize(MAXPARAMETERS);
        }
 
        void Implements(char* List)
@@ -101,15 +101,15 @@ class ModuleAlias : public Module
                int index = *(varname.begin()) - 48;
                varname.erase(varname.begin());
                bool everything_after = (varname == "-");
-               std::string word = "";
+               std::string word;
 
                for (int j = 0; j < index; j++)
-                       word = ss.GetToken();
+                       ss.GetToken(word);
 
                if (everything_after)
                {
-                       std::string more = "*";
-                       while ((more = ss.GetToken()) != "")
+                       std::string more;
+                       while (ss.GetToken(more))
                        {
                                word.append(" ");
                                word.append(more);
@@ -170,7 +170,7 @@ class ModuleAlias : public Module
                                if ((Aliases[i].operonly) && (!IS_OPER(user)))
                                        return 0;
 
-                               if (Aliases[i].requires != "")
+                               if (!Aliases[i].requires.empty())
                                {
                                        u = ServerInstance->FindNick(Aliases[i].requires);
                                        if (!u)
@@ -179,7 +179,7 @@ class ModuleAlias : public Module
                                                return 1;
                                        }
                                }
-                               if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
+                               if ((u != NULL) && (!Aliases[i].requires.empty()) && (Aliases[i].uline))
                                {
                                        if (!ServerInstance->ULine(u->server))
                                        {
@@ -201,8 +201,8 @@ class ModuleAlias : public Module
                                else
                                {
                                        irc::sepstream commands(Aliases[i].replace_with, '\n');
-                                       std::string command = "*";
-                                       while ((command = commands.GetToken()) != "")
+                                       std::string command;
+                                       while (commands.GetToken(command))
                                        {
                                                DoCommand(command, user, safe);
                                        }
@@ -251,10 +251,10 @@ class ModuleAlias : public Module
                SearchAndReplace(newline, "\r", "$");
 
                irc::tokenstream ss(newline);
-               const char* parv[127];
+               const char* parv[MAXPARAMETERS];
                int x = 0;
 
-               while (ss.GetToken(pars[x]))
+               while (ss.GetToken(pars[x]) && x < MAXPARAMETERS)
                {
                        parv[x] = pars[x].c_str();
                        x++;
@@ -269,27 +269,4 @@ class ModuleAlias : public Module
        }
 };
 
-
-class ModuleAliasFactory : public ModuleFactory
-{
- public:
-       ModuleAliasFactory()
-       {
-       }
-
-       ~ModuleAliasFactory()
-       {
-       }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAlias(Me);
-       }
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleAliasFactory;
-}
-
+MODULE_INIT(ModuleAlias)