Tidy up strlens which are not required

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

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index c3b24aeb495c13e5f5a008e09d18cfa8f9f62486..d1f67bb1400a07bc088c8395cbb1d620e363d55b 100644 (file)
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,13 +1,9 @@
 #include "users.h"
 #include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETIDENT command */
 
-
-
-
 class cmd_setident : public command_t
 {
  public:
@@ -19,17 +15,23 @@ class cmd_setident : public command_t
 
        CmdResult Handle(const char** parameters, int pcnt, userrec *user)
        {
-               for(unsigned int x = 0; x < strlen(parameters[0]); x++)
+               size_t len = 0;
+               for(const char* x = parameters[0]; *x; x++, len++)
                {
-                       if(((parameters[0][x] >= 'A') && (parameters[0][x] <= '}')) || strchr(".-0123456789", parameters[0][x]))
+                       if(((*x >= 'A') && (*x <= '}')) || strchr(".-0123456789", *x))
                                continue;
-                       
+
                        user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
                        return CMD_FAILURE;
                }
-               
-               ServerInstance->WriteOpers("%s used SETIDENT to change their ident from '%s' to '%s'", user->nick, user->ident, parameters[0]);
+               if (len > IDENTMAX)
+               {
+                       user->WriteServ("NOTICE %s :*** Ident is too long", user->nick);
+                       return CMD_FAILURE;
+               }
+
                user->ChangeIdent(parameters[0]);
+               ServerInstance->WriteOpers("%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
 
                return CMD_SUCCESS;
        }
@@ -54,7 +56,7 @@ class ModuleSetIdent : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,0,0,0,VF_VENDOR,API_VERSION);
        }
        
 };