Branch merge.

[irc/rqf/shadowircd.git] / modules / m_restart.c

diff --git a/modules/m_restart.c b/modules/m_restart.c
index 04ef9061b93ec091f079db04b8104641c59336f8..e175e9d991070ab2269d5d4d9b2dd483bf71186a 100644 (file)
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -27,14 +27,13 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "restart.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
@@ -58,7 +57,7 @@ static int
 mo_restart(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        char buf[BUFSIZE];
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        struct Client *target_p;
 
        if(!IsOperDie(source_p))
@@ -79,14 +78,14 @@ mo_restart(struct Client *client_p, struct Client *source_p, int parc, const cha
                return 0;
        }
 
-       DLINK_FOREACH(ptr, lclient_list.head)
+       RB_DLINK_FOREACH(ptr, lclient_list.head)
        {
                target_p = ptr->data;
 
                sendto_one_notice(target_p, ":Server Restarting. %s", get_client_name(source_p, HIDE_IP));
        }
 
-       DLINK_FOREACH(ptr, serv_list.head)
+       RB_DLINK_FOREACH(ptr, serv_list.head)
        {
                target_p = ptr->data;
 
@@ -94,7 +93,7 @@ mo_restart(struct Client *client_p, struct Client *source_p, int parc, const cha
                           me.name, get_client_name(source_p, HIDE_IP));
        }
 
-       ircsprintf(buf, "Server RESTART by %s", get_client_name(source_p, HIDE_IP));
+       rb_sprintf(buf, "Server RESTART by %s", get_client_name(source_p, HIDE_IP));
        restart(buf);
 
        return 0;