clean up some code duplication when checking nicks for validity

[solanum.git] / modules / m_services.c

diff --git a/modules/m_services.c b/modules/m_services.c
index 8355b15315d9b8c728ecd4a019831712bb972814..a1c93be6cd39fbb5ebfcb183a6666b327883c202 100644 (file)
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -154,27 +154,6 @@ me_login(struct Client *client_p, struct Client *source_p,
        return 0;
 }
 
-static int
-clean_nick(const char *nick)
-{
-       int len = 0;
-
-       if(EmptyString(nick) || *nick == '-' || IsDigit(*nick))
-               return 0;
-
-       for(; *nick; nick++)
-       {
-               len++;
-               if(!IsNickChar(*nick))
-                       return 0;
-       }
-
-       if(len >= NICKLEN)
-               return 0;
-
-       return 1;
-}
-
 static int
 me_rsfnc(struct Client *client_p, struct Client *source_p,
        int parc, const char *parv[])
@@ -197,7 +176,7 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
        if(!MyClient(target_p))
                return 0;
 
-       if(!clean_nick(parv[2]))
+       if(!is_valid_nick(parv[2]))
                return 0;
 
        curts = atol(parv[4]);