irc_string.h -> match.h, irc_string.h; includes changed

[solanum.git] / modules / m_dline.c

diff --git a/modules/m_dline.c b/modules/m_dline.c
index 1cf22a0794bacfb3e5520436a0c3944d521514dc..97e0aa65733dde61e70855c47bdbaf1573e12f69 100644 (file)
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -29,14 +29,13 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "hash.h"
 #include "s_serv.h"
@@ -76,7 +75,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
        const char *dlhost;
        char *oper_reason;
        char *reason = def;
-       struct irc_sockaddr_storage daddr;
+       struct rb_sockaddr_storage daddr;
        char cidr_form_host[HOSTLEN + 1];
        struct ConfItem *aconf;
        int bits;
@@ -103,7 +102,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
        }
 
        dlhost = parv[loc];
-       strlcpy(cidr_form_host, dlhost, sizeof(cidr_form_host));
+       rb_strlcpy(cidr_form_host, dlhost, sizeof(cidr_form_host));
 
        if(!parse_netmask(dlhost, NULL, &bits))
        {
@@ -154,7 +153,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
                const char *creason;
                int t = AF_INET, ty, b;
                ty = parse_netmask(dlhost, (struct sockaddr *)&daddr, &b);
-#ifdef IPV6
+#ifdef RB_IPV6
                if(ty == HM_IPV6)
                        t = AF_INET6;
                 else
@@ -181,7 +180,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
                }
        }
 
-       set_time();
+       rb_set_time();
        current_date = smalldate();
 
        aconf = make_conf();
@@ -284,7 +283,7 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha
                return 0;
        }
 
-       strlcpy(buf, aconf->host, sizeof buf);
+       rb_strlcpy(buf, aconf->host, sizeof buf);
        if(remove_temp_dline(aconf))
        {
                sendto_one(source_p,
@@ -318,7 +317,7 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha
 
        while (fgets(buf, sizeof(buf), in))
        {
-               strlcpy(buff, buf, sizeof(buff));
+               rb_strlcpy(buff, buf, sizeof(buff));
 
                if((p = strchr(buff, '\n')) != NULL)
                        *p = '\0';