Message handlers should return void.

[solanum.git] / modules / m_names.c

diff --git a/modules/m_names.c b/modules/m_names.c
index d01baeb50969a982771328e6214fd8b5e0e95c2f..1bb8a556c7465d852e5ce57d5f520fae43e88e5d 100644 (file)
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -20,8 +20,6 @@
  *  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_names.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
@@ -39,15 +37,18 @@
 #include "parse.h"
 #include "modules.h"
 
-static int m_names(struct Client *, struct Client *, int, const char **);
+static const char names_desc[] = "Provides the NAMES command to view users on a channel";
+
+static void m_names(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message names_msgtab = {
-       "NAMES", 0, 0, 0, MFLG_SLOW,
+       "NAMES", 0, 0, 0, 0,
        {mg_unreg, {m_names, 0}, mg_ignore, mg_ignore, mg_ignore, {m_names, 0}}
 };
 
 mapi_clist_av1 names_clist[] = { &names_msgtab, NULL };
-DECLARE_MODULE_AV1(names, NULL, NULL, names_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(names, NULL, NULL, names_clist, NULL, NULL, NULL, NULL, names_desc);
 
 static void names_global(struct Client *source_p);
 
@@ -59,8 +60,8 @@ static void names_global(struct Client *source_p);
  * m_names
  *      parv[1] = channel
  */
-static int
-m_names(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_names(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        static time_t last_used = 0;
        struct Channel *chptr = NULL;
@@ -77,13 +78,13 @@ m_names(struct Client *client_p, struct Client *source_p, int parc, const char *
                        sendto_one_numeric(source_p, ERR_BADCHANNAME,
                                           form_str(ERR_BADCHANNAME),
                                           (unsigned char *) p);
-                       return 0;
+                       return;
                }
 
                if((chptr = find_channel(p)) != NULL)
                        channel_member_names(chptr, source_p, 1);
                else
-                       sendto_one(source_p, form_str(RPL_ENDOFNAMES), 
+                       sendto_one(source_p, form_str(RPL_ENDOFNAMES),
                                   me.name, source_p->name, p);
        }
        else
@@ -96,18 +97,18 @@ m_names(struct Client *client_p, struct Client *source_p, int parc, const char *
                                           me.name, source_p->name, "NAMES");
                                sendto_one(source_p, form_str(RPL_ENDOFNAMES),
                                           me.name, source_p->name, "*");
-                               return 0;
+                               return;
                        }
                        else
                                last_used = rb_current_time();
                }
 
                names_global(source_p);
-               sendto_one(source_p, form_str(RPL_ENDOFNAMES), 
+               sendto_one(source_p, form_str(RPL_ENDOFNAMES),
                           me.name, source_p->name, "*");
        }
 
-       return 0;
+       return;
 }
 
 /*
@@ -123,7 +124,7 @@ names_global(struct Client *source_p)
        int mlen;
        int tlen;
        int cur_len;
-       int dont_show = NO;
+       bool dont_show = false;
        rb_dlink_node *lp, *ptr;
        struct Client *target_p;
        struct Channel *chptr = NULL;
@@ -137,7 +138,7 @@ names_global(struct Client *source_p)
                chptr = ptr->data;
                channel_member_names(chptr, source_p, 0);
        }
-       cur_len = mlen = rb_sprintf(buf, form_str(RPL_NAMREPLY), 
+       cur_len = mlen = sprintf(buf, form_str(RPL_NAMREPLY),
                                    me.name, source_p->name, "*", "*");
        t = buf + mlen;
 
@@ -145,7 +146,7 @@ names_global(struct Client *source_p)
        RB_DLINK_FOREACH(ptr, global_client_list.head)
        {
                target_p = ptr->data;
-               dont_show = NO;
+               dont_show = false;
 
                if(!IsPerson(target_p) || IsInvisible(target_p))
                        continue;
@@ -165,7 +166,7 @@ names_global(struct Client *source_p)
                        if(PubChannel(chptr) || IsMember(source_p, chptr) ||
                           SecretChannel(chptr))
                        {
-                               dont_show = YES;
+                               dont_show = true;
                                break;
                        }
                }
@@ -180,7 +181,7 @@ names_global(struct Client *source_p)
                        t = buf + mlen;
                }
 
-               tlen = rb_sprintf(t, "%s ", target_p->name);
+               tlen = sprintf(t, "%s ", target_p->name);
                cur_len += tlen;
                t += tlen;
        }