Remove un-needed strlen and pointer in duration()

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

diff --git a/src/commands.cpp b/src/commands.cpp
index 1715a9ace0223c773ce484648474ba33c9174165..da4deff65754bf757ef133fbb6fcf4058ca6d316 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.