X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/7cdb0a09b9ba217d30d6e8c35654dc9cc6e3ae57..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/m_user.c?ds=inline

diff --git a/modules/m_user.c b/modules/m_user.c
index 76890cf2..f46ec8b4 100644
--- 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,7 +35,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "blacklist.h"
 
 static int mr_user(struct Client *, struct Client *, int, const char **);
@@ -73,8 +72,8 @@ mr_user(struct Client *client_p, struct Client *source_p, int parc, const char *
 		*p = '\0';
 
 	rb_snprintf(buf, sizeof(buf), "%s %s", parv[2], parv[3]);
-	MyFree(source_p->localClient->fullcaps);
-	DupString(source_p->localClient->fullcaps, buf);
+	rb_free(source_p->localClient->fullcaps);
+	source_p->localClient->fullcaps = rb_strdup(buf);
 
 	do_local_user(client_p, source_p, parv[1], parv[4]);
 	return 0;
@@ -84,12 +83,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 +94,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])