X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/c88cdb00957d1bafae4587343b5ab7df14b75f8b..8e2ebdb80add54d46c9f7f058ad469d70ddf9457:/modules/m_who.c?ds=sidebyside

diff --git a/modules/m_who.c b/modules/m_who.c
index 8ef2624f..7ab77533 100644
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -24,7 +24,6 @@
  *  $Id: m_who.c 3350 2007-04-02 22:03:08Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
 #include "common.h"
 #include "client.h"
 #include "channel.h"
@@ -36,7 +35,7 @@
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
@@ -75,7 +74,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 	struct Client *target_p;
 	struct membership *msptr;
 	char *mask;
-	dlink_node *lp;
+	rb_dlink_node *lp;
 	struct Channel *chptr = NULL;
 	int server_oper = parc > 2 ? (*parv[2] == 'o') : 0;	/* Show OPERS only */
 	int member;
@@ -143,7 +142,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 		int isinvis = 0;
 
 		isinvis = IsInvisible(target_p);
-		DLINK_FOREACH(lp, target_p->user->channel.head)
+		RB_DLINK_FOREACH(lp, target_p->user->channel.head)
 		{
 			msptr = lp->data;
 			chptr = msptr->chptr;
@@ -177,7 +176,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 	/* it has to be a global who at this point, limit it */
 	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, "WHO");
@@ -186,7 +185,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 			return 0;
 		}
 		else
-			last_used = CurrentTime;
+			last_used = rb_current_time();
 	}
 
 	/* Note: operspy_dont_care_user_info does not apply to
@@ -225,9 +224,9 @@ who_common_channel(struct Client *source_p, struct Channel *chptr,
 {
 	struct membership *msptr;
 	struct Client *target_p;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 
-	DLINK_FOREACH(ptr, chptr->members.head)
+	RB_DLINK_FOREACH(ptr, chptr->members.head)
 	{
 		msptr = ptr->data;
 		target_p = msptr->client_p;
@@ -272,7 +271,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
 {
 	struct membership *msptr;
 	struct Client *target_p;
-	dlink_node *lp, *ptr;
+	rb_dlink_node *lp, *ptr;
 	int maxmatches = 500;
 
 	/* first, list all matching INvisible clients on common channels
@@ -280,7 +279,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
 	 */
 	if(!operspy)
 	{
-		DLINK_FOREACH(lp, source_p->user->channel.head)
+		RB_DLINK_FOREACH(lp, source_p->user->channel.head)
 		{
 			msptr = lp->data;
 			who_common_channel(source_p, msptr->chptr, mask, server_oper, &maxmatches);
@@ -294,7 +293,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
 	 * if this is an operspy who, list all matching clients, no need
 	 * to clear marks
 	 */
-	DLINK_FOREACH(ptr, global_client_list.head)
+	RB_DLINK_FOREACH(ptr, global_client_list.head)
 	{
 		target_p = ptr->data;
 		if(!IsPerson(target_p))
@@ -346,10 +345,10 @@ do_who_on_channel(struct Client *source_p, struct Channel *chptr,
 {
 	struct Client *target_p;
 	struct membership *msptr;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	int combine = IsCapable(source_p, CLICAP_MULTI_PREFIX);
 
-	DLINK_FOREACH(ptr, chptr->members.head)
+	RB_DLINK_FOREACH(ptr, chptr->members.head)
 	{
 		msptr = ptr->data;
 		target_p = msptr->client_p;
@@ -379,7 +378,7 @@ do_who(struct Client *source_p, struct Client *target_p, const char *chname, con
 {
 	char status[5];
 
-	ircsprintf(status, "%c%s%s",
+	rb_sprintf(status, "%c%s%s",
 		   target_p->user->away ? 'G' : 'H', IsOper(target_p) ? "*" : "", op_flags);
 
 	sendto_one(source_p, form_str(RPL_WHOREPLY), me.name, source_p->name,