Move RPL_WHOISLOGGEDIN to sendto_one_numeric().

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

diff --git a/modules/m_services.c b/modules/m_services.c
index 539d20d58c4d516113e942238836cd429b37852f..42ea29dc7056876b2ff067220be250f0af1c2663 100644 (file)
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -26,12 +26,10 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: m_services.c 1907 2006-08-29 19:18:15Z jilles $
  */
 
 #include "stdinc.h"
 
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -39,7 +37,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 +44,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 
@@ -108,7 +104,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 +118,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;
 }
 
@@ -198,7 +194,7 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
                        kill_client_serv_butone(NULL, exist_p, "%s (Nickname regained by services)",
                                                me.name);
 
-               snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
+               rb_snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
                        me.name);
                exit_client(NULL, exist_p, &me, buf);
        }
@@ -206,8 +202,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;
 
@@ -227,8 +223,6 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
        add_history(target_p, 1);
        sendto_server(NULL, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
                        use_id(target_p), parv[2], (long) target_p->tsinfo);
-       sendto_server(NULL, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-                       target_p->name, parv[2], (long) target_p->tsinfo);
 
        del_from_client_hash(target_p->name, target_p);
        strcpy(target_p->name, parv[2]);
@@ -245,7 +239,6 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
 
 /*
 ** me_nickdelay
-**      parv[0] = sender prefix
 **      parv[1] = duration in seconds (0 to remove)
 **      parv[2] = nick
 */
@@ -272,7 +265,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;
@@ -308,9 +301,8 @@ h_svc_whois(hook_data_client *data)
                if(*p == '\0')
                        p = data->target->user->suser;
 
-               sendto_one(data->client, form_str(RPL_WHOISLOGGEDIN),
-                               get_id(&me, data->client),
-                               get_id(data->client, data->client),
+               sendto_one_numeric(data->client, RPL_WHOISLOGGEDIN,
+                               form_str(RPL_WHOISLOGGEDIN),
                                data->target->name, p);
        }
 }