s_log.* -> logger.* (s_foo looks ugly, lets try to get rid of it)

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

diff --git a/modules/m_whois.c b/modules/m_whois.c
index c139c29367404380b5b3f5089a153e54076ff30a..516863e5e5a005a1b928b05c712af9100148d548 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -21,11 +21,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_whois.c 3287 2007-03-28 13:49:57Z jilles $
+ *  $Id: m_whois.c 3536 2007-07-14 21:50:21Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "common.h"
 #include "client.h"
 #include "hash.h"
@@ -39,7 +38,7 @@
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
@@ -67,7 +66,7 @@ mapi_hlist_av1 whois_hlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3287 $");
+DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3536 $");
 
 /*
  * m_whois
@@ -91,16 +90,16 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
                if(!IsOper(source_p))
                {
                        /* seeing as this is going across servers, we should limit it */
-                       if((last_used + ConfigFileEntry.pace_wait_simple) > CurrentTime)
+                       if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time())
                        {
                                sendto_one(source_p, form_str(RPL_LOAD2HI),
                                           me.name, source_p->name, "WHOIS");
                                sendto_one_numeric(source_p, RPL_ENDOFWHOIS, 
-                                                  form_str(RPL_ENDOFWHOIS), parv[1]);
+                                                  form_str(RPL_ENDOFWHOIS), parv[2]);
                                return 0;
                        }
                        else
-                               last_used = CurrentTime;
+                               last_used = rb_current_time();
                }
 
                if(hunt_server(client_p, source_p, ":%s WHOIS %s :%s", 1, parc, parv) !=
@@ -201,7 +200,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
 
                        snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
                                target_p->name, target_p->username,
-                               target_p->host, target_p->user->server);
+                               target_p->host, target_p->servptr->name);
                        report_operspy(source_p, "WHOIS", buffer);
                }
 
@@ -210,7 +209,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
        else
                sendto_one_numeric(source_p, ERR_NOSUCHNICK,
                                   form_str(ERR_NOSUCHNICK), 
-                                  IsDigit(*nick) ? "*" : nick);
+                                  nick);
 
        sendto_one_numeric(source_p, RPL_ENDOFWHOIS, 
                           form_str(RPL_ENDOFWHOIS), parv[1]);
@@ -230,8 +229,7 @@ static void
 single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 {
        char buf[BUFSIZE];
-       dlink_node *ptr;
-       struct Client *a2client_p;
+       rb_dlink_node *ptr;
        struct membership *msptr;
        struct Channel *chptr;
        int cur_len = 0;
@@ -255,13 +253,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                return;
        }
 
-       a2client_p = target_p->servptr;
-
        sendto_one_numeric(source_p, RPL_WHOISUSER, form_str(RPL_WHOISUSER),
                           target_p->name, target_p->username, 
                           target_p->host, target_p->info);
 
-       cur_len = mlen = ircsprintf(buf, form_str(RPL_WHOISCHANNELS), 
+       cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS), 
                                    get_id(&me, source_p), get_id(source_p, source_p), 
                                    target_p->name);
 
@@ -282,7 +278,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        if (!IsService(target_p))
        {
-               DLINK_FOREACH(ptr, target_p->user->channel.head)
+               RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
                {
                        msptr = ptr->data;
                        chptr = msptr->chptr;
@@ -298,7 +294,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                        t = buf + mlen;
                                }
 
-                               tlen = ircsprintf(t, "%s%s%s ",
+                               tlen = rb_sprintf(t, "%s%s%s ",
                                                visible ? "" : "!",
                                                find_channel_status(msptr, 1),
                                                chptr->chname);
@@ -312,8 +308,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                sendto_one(source_p, "%s", buf);
 
        sendto_one_numeric(source_p, RPL_WHOISSERVER, form_str(RPL_WHOISSERVER),
-                          target_p->name, target_p->user->server,
-                          a2client_p ? a2client_p->info : "*Not On This Net*");
+                          target_p->name, target_p->servptr->name,
+                          target_p->servptr->info);
 
        if(target_p->user->away)
                sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
@@ -349,7 +345,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
                sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
                                   target_p->name, 
-                                  CurrentTime - target_p->localClient->last, 
+                                  rb_current_time() - target_p->localClient->last, 
                                   target_p->localClient->firsttime);
        }
        else