X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/6f3a09ff675b7a415840b3911fcd2e92f23503f6..8e43b0b4146cdbacec61e83e8b8251c0b5a090c9:/modules/m_dline.c

diff --git a/modules/m_dline.c b/modules/m_dline.c
index 0237c13..9bc7def 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
@@ -35,7 +34,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -202,7 +200,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
 
 	if(tdline_time > 0)
 	{
-		ircsnprintf(dlbuffer, sizeof(dlbuffer), 
+		rb_snprintf(dlbuffer, sizeof(dlbuffer), 
 			 "Temporary D-line %d min. - %s (%s)",
 			 (int) (tdline_time / 60), reason, current_date);
 		DupString(aconf->passwd, dlbuffer);
@@ -235,7 +233,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
 	}
 	else
 	{
-		ircsnprintf(dlbuffer, sizeof(dlbuffer), "%s (%s)", reason, current_date);
+		rb_snprintf(dlbuffer, sizeof(dlbuffer), "%s (%s)", reason, current_date);
 		DupString(aconf->passwd, dlbuffer);
 		add_conf_by_address(aconf->host, CONF_DLINE, NULL, aconf);
 		write_confitem(DLINE_TYPE, source_p, NULL, aconf->host, reason,
@@ -262,7 +260,7 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha
 	int pairme = NO, error_on_write = NO;
 	mode_t oldumask;
 
-	ircsnprintf(temppath, sizeof(temppath), "%s.tmp", ConfigFileEntry.dlinefile);
+	rb_snprintf(temppath, sizeof(temppath), "%s.tmp", ConfigFileEntry.dlinefile);
 
 	if(!IsOperUnkline(source_p))
 	{
@@ -451,16 +449,16 @@ flush_write(struct Client *source_p, FILE * out, char *buf, char *temppath)
 static int
 remove_temp_dline(struct ConfItem *aconf)
 {
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	int i;
 
 	for (i = 0; i < LAST_TEMP_TYPE; i++)
 	{
-		DLINK_FOREACH(ptr, temp_dlines[i].head)
+		RB_DLINK_FOREACH(ptr, temp_dlines[i].head)
 		{
 			if (aconf == ptr->data)
 			{
-				dlinkDestroy(ptr, &temp_dlines[i]);
+				rb_dlinkDestroy(ptr, &temp_dlines[i]);
 				delete_one_address_conf(aconf->host, aconf);
 				return YES;
 			}