modules/m_set: booleanify.

[solanum.git] / modules / m_who.c

diff --git a/modules/m_who.c b/modules/m_who.c
index 577e23c6b65e47304cb3510b652238dc053d8b4b..aa674582bff08729bcaaa471c3bd51741ee9f769 100644 (file)
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -20,11 +20,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_who.c 3350 2007-04-02 22:03:08Z jilles $
  */
 #include "stdinc.h"
-#include "common.h"
 #include "client.h"
 #include "channel.h"
 #include "hash.h"
@@ -57,16 +54,27 @@
 #define FIELD_ACCOUNT    0x0800
 #define FIELD_OPLEVEL    0x1000 /* meaningless and stupid, but whatever */
 
+static const char who_desc[] =
+       "Provides the WHO command to display information for users on a channel";
+
 struct who_format
 {
        int fields;
        const char *querytype;
 };
 
-static int m_who(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_who(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
+static void do_who_on_channel(struct Client *source_p, struct Channel *chptr,
+                             int server_oper, int member,
+                             struct who_format *fmt);
+static void who_global(struct Client *source_p, const char *mask, int server_oper, int operspy, struct who_format *fmt);
+static void do_who(struct Client *source_p,
+                  struct Client *target_p, struct membership *msptr,
+                  struct who_format *fmt);
 
 struct Message who_msgtab = {
-       "WHO", 0, 0, 0, MFLG_SLOW,
+       "WHO", 0, 0, 0, 0,
        {mg_unreg, {m_who, 2}, mg_ignore, mg_ignore, mg_ignore, {m_who, 2}}
 };
 
@@ -84,25 +92,14 @@ _moddeinit(void)
 }
 
 mapi_clist_av1 who_clist[] = { &who_msgtab, NULL };
-DECLARE_MODULE_AV1(who, _modinit, _moddeinit, who_clist, NULL, NULL, "$Revision: 3350 $");
-
-static void do_who_on_channel(struct Client *source_p, struct Channel *chptr,
-                             int server_oper, int member,
-                             struct who_format *fmt);
-
-static void who_global(struct Client *source_p, const char *mask, int server_oper, int operspy, struct who_format *fmt);
-
-static void do_who(struct Client *source_p,
-                  struct Client *target_p, struct membership *msptr,
-                  struct who_format *fmt);
-
+DECLARE_MODULE_AV2(who, _modinit, _moddeinit, who_clist, NULL, NULL, NULL, NULL, who_desc);
 
 /*
 ** m_who
 **      parv[1] = nickname mask list
 **      parv[2] = additional selection flag and format options
 */
-static int
+static void
 m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        static time_t last_used = 0;
@@ -161,17 +158,17 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
        if((*(mask + 1) == '\0') && (*mask == '*'))
        {
                if(source_p->user == NULL)
-                       return 0;
+                       return;
 
                if((lp = source_p->user->channel.head) != NULL)
                {
                        msptr = lp->data;
-                       do_who_on_channel(source_p, msptr->chptr, server_oper, YES, &fmt);
+                       do_who_on_channel(source_p, msptr->chptr, server_oper, true, &fmt);
                }
 
                sendto_one(source_p, form_str(RPL_ENDOFWHO),
                           me.name, source_p->name, "*");
-               return 0;
+               return;
        }
 
        if(IsOperSpy(source_p) && *mask == '!')
@@ -183,7 +180,7 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
                {
                        sendto_one(source_p, form_str(RPL_ENDOFWHO),
                                        me.name, source_p->name, parv[1]);
-                       return 0;
+                       return;
                }
        }
 
@@ -201,21 +198,21 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
                                                me.name, source_p->name, "WHO");
                                sendto_one(source_p, form_str(RPL_ENDOFWHO),
                                           me.name, source_p->name, "*");
-                               return 0;
+                               return;
                        }
 
                        if(operspy)
                                report_operspy(source_p, "WHO", chptr->chname);
 
                        if(IsMember(source_p, chptr) || operspy)
-                               do_who_on_channel(source_p, chptr, server_oper, YES, &fmt);
+                               do_who_on_channel(source_p, chptr, server_oper, true, &fmt);
                        else if(!SecretChannel(chptr))
-                               do_who_on_channel(source_p, chptr, server_oper, NO, &fmt);
+                               do_who_on_channel(source_p, chptr, server_oper, false, &fmt);
                }
 
                sendto_one(source_p, form_str(RPL_ENDOFWHO),
                           me.name, source_p->name, parv[1] + operspy);
-               return 0;
+               return;
        }
 
        /* '/who nick' */
@@ -250,7 +247,7 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 
                sendto_one(source_p, form_str(RPL_ENDOFWHO),
                           me.name, source_p->name, mask);
-               return 0;
+               return;
        }
 
        if(!IsFloodDone(source_p))
@@ -265,7 +262,7 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
                                        me.name, source_p->name, "WHO");
                        sendto_one(source_p, form_str(RPL_ENDOFWHO),
                                   me.name, source_p->name, "*");
-                       return 0;
+                       return;
                }
                else
                        last_used = rb_current_time();
@@ -287,8 +284,6 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 
        sendto_one(source_p, form_str(RPL_ENDOFWHO),
                   me.name, source_p->name, mask);
-
-       return 0;
 }
 
 /* who_common_channel
@@ -555,12 +550,12 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt
 
                if (pos >= sizeof str)
                {
-                       static int warned = 0;
+                       static bool warned = false;
                        if (!warned)
                                sendto_realops_snomask(SNO_DEBUG, L_NETWIDE,
                                                "WHOX overflow while sending information about %s to %s",
                                                target_p->name, source_p->name);
-                       warned = 1;
+                       warned = true;
                }
                sendto_one(source_p, "%s", str);
        }