- Merged valid_username() and clean_user_name()

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2068 82007160-df01-0410-b94d-b575c5fd34c7

1 files changed, 1 insertions, 21 deletions

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index d74d81c..2ac8fe7 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -46,26 +46,6 @@
 #include "s_misc.h"
 
 
-/* clean_user_name()
- *
- * input        - username
- * output       - none
- * side effects - walks through the username, returning 0 if erroneous
- */
-static int
-clean_user_name(const char *user)
-{
-  const char *p = user;
-
-  assert(user && *user);
-
-  for (; *p; ++p)
-    if (!IsUserChar(*p))
-      return 0;
-
-  return p - user <= USERLEN;
-}
-
 /* check_clean_nick()
  *
  * input        - pointer to source
@@ -124,7 +104,7 @@ static int
 check_clean_user(struct Client *client_p, char *nick,
                  char *user, struct Client *server_p)
 {
-  if (!clean_user_name(user))
+  if (!valid_user_name(user, 0))
   {
     ++ServerStats.is_kill;
     sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,