X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/af81d5a0b09446188fd6f9c292b51519f2c1cedd..3d07b1a5b6a642a55b381193e67cb173ac37c164:/src/s_gline.c

diff --git a/src/s_gline.c b/src/s_gline.c
index 14b784d..326c6da 100644
--- a/src/s_gline.c
+++ b/src/s_gline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
@@ -34,7 +33,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "scache.h"
 #include "send.h"
@@ -42,8 +40,6 @@
 #include "s_serv.h"
 #include "s_gline.h"
 #include "hash.h"
-#include "event.h"
-#include "memory.h"
 
 rb_dlink_list glines;
 
@@ -76,7 +72,7 @@ find_is_glined(const char *host, const char *user)
 	rb_dlink_node *gline_node;
 	struct ConfItem *kill_ptr;
 
-	DLINK_FOREACH(gline_node, glines.head)
+	RB_DLINK_FOREACH(gline_node, glines.head)
 	{
 		kill_ptr = gline_node->data;
 		if((kill_ptr->user && (!user || match(kill_ptr->user, user)))
@@ -120,12 +116,12 @@ expire_glines()
 	rb_dlink_node *next_node;
 	struct ConfItem *kill_ptr;
 
-	DLINK_FOREACH_SAFE(gline_node, next_node, glines.head)
+	RB_DLINK_FOREACH_SAFE(gline_node, next_node, glines.head)
 	{
 		kill_ptr = gline_node->data;
 
 		/* these are in chronological order */
-		if(kill_ptr->hold > CurrentTime)
+		if(kill_ptr->hold > rb_current_time())
 			break;
 
 		rb_dlinkDestroy(gline_node, &glines);
@@ -150,17 +146,17 @@ expire_pending_glines()
 	rb_dlink_node *next_node;
 	struct gline_pending *glp_ptr;
 
-	DLINK_FOREACH_SAFE(pending_node, next_node, pending_glines.head)
+	RB_DLINK_FOREACH_SAFE(pending_node, next_node, pending_glines.head)
 	{
 		glp_ptr = pending_node->data;
 
 		if(((glp_ptr->last_gline_time + GLINE_PENDING_EXPIRE) <=
-		    CurrentTime) || find_is_glined(glp_ptr->host, glp_ptr->user))
+		    rb_current_time()) || find_is_glined(glp_ptr->host, glp_ptr->user))
 
 		{
-			MyFree(glp_ptr->reason1);
-			MyFree(glp_ptr->reason2);
-			MyFree(glp_ptr);
+			rb_free(glp_ptr->reason1);
+			rb_free(glp_ptr->reason2);
+			rb_free(glp_ptr);
 			rb_dlinkDestroy(pending_node, &pending_glines);
 		}
 	}