Add WriteOpers_NoFormat, now to remember what I wanted it for

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

diff --git a/src/commands.cpp b/src/commands.cpp
index 1715a9ace0223c773ce484648474ba33c9174165..904b4277eaeae67a483253244f3c717bfd5e0fe7 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -216,17 +216,16 @@ long duration(const char* str)
 {
        char n_field[MAXBUF];
        long total = 0;
-       const char* str_end = str + strlen(str);
        n_field[0] = 0;
 
        if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y')))
        {
                std::string n = str;
-               n = n + "s";
+               n += 's';
                return duration(n.c_str());
        }
        
-       for (char* i = (char*)str; i < str_end; i++)
+       for (char* i = (char*)str; *i; i++)
        {
                // if we have digits, build up a string for the value in n_field,
                // up to 10 digits in size.
@@ -279,8 +278,8 @@ bool host_matches_everyone(const std::string &mask, userrec* user)
        char insanemasks[MAXBUF];
        char buffer[MAXBUF];
        char itrigger[MAXBUF];
-       Config->ConfValue("insane","hostmasks",0,insanemasks,&Config->config_f);
-       Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f);
+       Config->ConfValue(Config->config_data, "insane","hostmasks", 0, insanemasks, MAXBUF);
+       Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF);
        if (*itrigger == 0)
                strlcpy(itrigger,"95.5",MAXBUF);
        if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
@@ -307,8 +306,8 @@ bool ip_matches_everyone(const std::string &ip, userrec* user)
 {
        char insanemasks[MAXBUF];
        char itrigger[MAXBUF];
-       Config->ConfValue("insane","ipmasks",0,insanemasks,&Config->config_f);
-       Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f);
+       Config->ConfValue(Config->config_data, "insane","ipmasks",0,insanemasks,MAXBUF);
+       Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF);
        if (*itrigger == 0)
                strlcpy(itrigger,"95.5",MAXBUF);
        if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
@@ -332,8 +331,8 @@ bool nick_matches_everyone(const std::string &nick, userrec* user)
 {
        char insanemasks[MAXBUF];
        char itrigger[MAXBUF];
-       Config->ConfValue("insane","nickmasks",0,insanemasks,&Config->config_f);
-       Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f);
+       Config->ConfValue(Config->config_data, "insane","nickmasks",0,insanemasks,MAXBUF);
+       Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF);
        if (*itrigger == 0)
                strlcpy(itrigger,"95.5",MAXBUF);
        if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))