Remove s_assert definition from ircd_defs.h and add it to its own header.

[solanum.git] / modules / m_user.c

diff --git a/modules/m_user.c b/modules/m_user.c
index aa12a6cc8966690ef6fe0e1f4c933e20204235b7..f258007d8f64c8490984aeacc6855065c767ec66 100644 (file)
--- a/modules/m_user.c
+++ b/modules/m_user.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
@@ -35,8 +35,8 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "blacklist.h"
+#include "s_assert.h"
 
 static int mr_user(struct Client *, struct Client *, int, const char **);
 
@@ -84,12 +84,10 @@ static int
 do_local_user(struct Client *client_p, struct Client *source_p,
              const char *username, const char *realname)
 {
-       struct User *user;
-
        s_assert(NULL != source_p);
        s_assert(source_p->username != username);
 
-       user = make_user(source_p);
+       make_user(source_p);
 
        if (!(source_p->flags & FLAGS_SENTUSER))
        {
@@ -97,14 +95,14 @@ do_local_user(struct Client *client_p, struct Client *source_p,
                source_p->flags |= FLAGS_SENTUSER;
        }
 
-       strlcpy(source_p->info, realname, sizeof(source_p->info));
+       rb_strlcpy(source_p->info, realname, sizeof(source_p->info));
 
        if(!IsGotId(source_p))
        {
                /* This is in this location for a reason..If there is no identd
                 * and ping cookies are enabled..we need to have a copy of this
                 */
-               strlcpy(source_p->username, username, sizeof(source_p->username));
+               rb_strlcpy(source_p->username, username, sizeof(source_p->username));
        }
 
        if(source_p->name[0])