X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/5b96d9a6b92f3ca219ff2baab7596cc94580813d..43946961df9e7703c8877e4bbd9181507422429d:/modules/m_names.c?ds=sidebyside

diff --git a/modules/m_names.c b/modules/m_names.c
index 8039cae2..76425fe7 100644
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -25,13 +25,11 @@
  */
 
 #include "stdinc.h"
-#include "sprintf_irc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -93,7 +91,7 @@ m_names(struct Client *client_p, struct Client *source_p, int parc, const char *
 	{
 		if(!IsOper(source_p))
 		{
-			if((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
+			if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
 			{
 				sendto_one(source_p, form_str(RPL_LOAD2HI),
 					   me.name, source_p->name, "NAMES");
@@ -102,7 +100,7 @@ m_names(struct Client *client_p, struct Client *source_p, int parc, const char *
 				return 0;
 			}
 			else
-				last_used = CurrentTime;
+				last_used = rb_current_time();
 		}
 
 		names_global(source_p);
@@ -140,7 +138,7 @@ names_global(struct Client *source_p)
 		chptr = ptr->data;
 		channel_member_names(chptr, source_p, 0);
 	}
-	cur_len = mlen = ircsprintf(buf, form_str(RPL_NAMREPLY), 
+	cur_len = mlen = rb_sprintf(buf, form_str(RPL_NAMREPLY), 
 				    me.name, source_p->name, "*", "*");
 	t = buf + mlen;
 
@@ -183,7 +181,7 @@ names_global(struct Client *source_p)
 			t = buf + mlen;
 		}
 
-		tlen = ircsprintf(t, "%s ", target_p->name);
+		tlen = rb_sprintf(t, "%s ", target_p->name);
 		cur_len += tlen;
 		t += tlen;
 	}