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

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

diff --git a/modules/m_services.c b/modules/m_services.c
index 539d20d58c4d516113e942238836cd429b37852f..91999068d0bd951f73e524ffe2f27074748bf1d6 100644 (file)
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -31,7 +31,6 @@
 
 #include "stdinc.h"
 
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -39,7 +38,6 @@
 #include "config.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "memory.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_serv.h"
@@ -47,7 +45,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 
@@ -108,7 +105,7 @@ me_su(struct Client *client_p, struct Client *source_p,
        if(EmptyString(parv[2]))
                target_p->user->suser[0] = '\0';
        else
-               strlcpy(target_p->user->suser, parv[2], sizeof(target_p->user->suser));
+               rb_strlcpy(target_p->user->suser, parv[2], sizeof(target_p->user->suser));
 
        invalidate_bancache_user(target_p);
 
@@ -122,7 +119,7 @@ me_login(struct Client *client_p, struct Client *source_p,
        if(!IsPerson(source_p))
                return 0;
 
-       strlcpy(source_p->user->suser, parv[1], sizeof(source_p->user->suser));
+       rb_strlcpy(source_p->user->suser, parv[1], sizeof(source_p->user->suser));
        return 0;
 }
 
@@ -206,8 +203,8 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
        newts = atol(parv[3]);
 
        /* timestamp is older than 15mins, ignore it */
-       if(newts < (CurrentTime - 900))
-               newts = CurrentTime - 900;
+       if(newts < (rb_current_time() - 900))
+               newts = rb_current_time() - 900;
 
        target_p->tsinfo = newts;
 
@@ -272,7 +269,7 @@ me_nickdelay(struct Client *client_p, struct Client *source_p, int parc, const c
                add_nd_entry(parv[2]);
                nd = irc_dictionary_retrieve(nd_dict, parv[2]);
                if (nd != NULL)
-                       nd->expire = CurrentTime + duration;
+                       nd->expire = rb_current_time() + duration;
        }
 
        return 0;