Optimisations

[user/henk/code/inspircd.git] / src / helperfuncs.cpp

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 073b5b37c8eb20b004f5351b778a7ec4c4c4622b..9f184e868cd3eec964cc5286fddc6cc41bd1b1f3 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -955,7 +955,7 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text)
  * uses the oper list, which means if you have 2000 users but only 5 opers,
  * it iterates 5 times.
  */
-void WriteOpers(char* text, ...)
+void WriteOpers(const char* text, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
@@ -970,6 +970,17 @@ void WriteOpers(char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       WriteOpers_NoFormat(textbuffer);
+}
+
+void WriteOpers_NoFormat(const char* text)
+{
+       if (!text)
+       {
+               log(DEFAULT,"*** BUG *** WriteOpers_NoFormat was given an invalid parameter");
+               return;
+       }
+
        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
        {
                userrec* a = *i;
@@ -979,7 +990,7 @@ void WriteOpers(char* text, ...)
                        if (a->modebits & UM_SERVERNOTICE)
                        {
                                // send server notices to all with +s
-                               WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
+                               WriteServ(a->fd,"NOTICE %s :%s",a->nick,text);
                        }
                }
        }
@@ -1852,9 +1863,9 @@ void LoadAllModules(InspIRCd* ServerInstance)
        Config->module_names.clear();
        MODCOUNT = -1;
                                         
-       for (int count = 0; count < Config->ConfValueEnum("module",&Config->config_f); count++)
+       for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
        {
-               Config->ConfValue("module","name",count,configToken,&Config->config_f);
+               Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF);
                printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
                
                if (!ServerInstance->LoadModule(configToken))                
@@ -1863,13 +1874,6 @@ void LoadAllModules(InspIRCd* ServerInstance)
                        printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());
                        Exit(0);
                }
-
-               if (!ServerInstance->LoadModule(configToken))
-               {
-                       log(DEFAULT,"Exiting due to a module loader error.");
-                       printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());
-                       Exit(0);
-               }
        }
        
        log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1);