Message handlers should return void.

[solanum.git] / modules / m_trace.c

diff --git a/modules/m_trace.c b/modules/m_trace.c
index 239b224d025209c8912bc09126c494951ef999a0..fb0fdb9204c1e04b33a0377eb93456eb2e5a7416 100644 (file)
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -40,7 +40,10 @@
 #include "parse.h"
 #include "modules.h"
 
-static int m_trace(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char trace_desc[] =
+       "Provides the TRACE command to trace the route to a client or server";
+
+static void m_trace(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 static void trace_spy(struct Client *, struct Client *);
 
@@ -56,7 +59,7 @@ mapi_hlist_av1 trace_hlist[] = {
        { "doing_trace",        &doing_trace_hook },
        { NULL, NULL }
 };
-DECLARE_MODULE_AV2(trace, NULL, NULL, trace_clist, trace_hlist, NULL, NULL, NULL, NULL);
+DECLARE_MODULE_AV2(trace, NULL, NULL, trace_clist, trace_hlist, NULL, NULL, NULL, trace_desc);
 
 static void count_downlinks(struct Client *server_p, int *pservcount, int *pusercount);
 static int report_this_status(struct Client *source_p, struct Client *target_p);
@@ -67,14 +70,14 @@ static const char *empty_sockhost = "255.255.255.255";
  * m_trace
  *      parv[1] = servername
  */
-static int
+static void
 m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p = NULL;
        struct Class *cltmp;
        const char *tname;
-       int doall = 0;
-       int cnt = 0, wilds, dow;
+       bool doall = false, wilds, dow;
+       int cnt = 0;
        rb_dlink_node *ptr;
 
        if(parc > 1)
@@ -85,7 +88,7 @@ m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                {
                        if(hunt_server(client_p, source_p, ":%s TRACE %s :%s", 2, parc, parv) !=
                                        HUNTED_ISME)
-                               return 0;
+                               return;
                }
        }
        else
@@ -131,27 +134,27 @@ m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                                                   ac2ptr ? ac2ptr->name : tname,
                                                   ac2ptr ? ac2ptr->from->name : "EEK!");
 
-                       return 0;
+                       return;
                }
 
                case HUNTED_ISME:
                        break;
 
                default:
-                       return 0;
+                       return;
                }
        }
 
        if(match(tname, me.name))
        {
-               doall = 1;
+               doall = true;
        }
        /* if theyre tracing our SID, we need to move tname to our name so
         * we dont give the sid in ENDOFTRACE
         */
        else if(!MyClient(source_p) && !strcmp(tname, me.id))
        {
-               doall = 1;
+               doall = true;
                tname = me.name;
        }
 
@@ -159,7 +162,7 @@ m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        dow = wilds || doall;
 
        /* specific trace */
-       if(dow == 0)
+       if(!dow)
        {
                if(MyClient(source_p) || parc > 2)
                        target_p = find_named_person(tname);
@@ -179,7 +182,7 @@ m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
                sendto_one_numeric(source_p, RPL_ENDOFTRACE,
                                   form_str(RPL_ENDOFTRACE), tname);
-               return 0;
+               return;
        }
 
        trace_spy(source_p, NULL);
@@ -220,7 +223,7 @@ m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
                sendto_one_numeric(source_p, RPL_ENDOFTRACE,
                                   form_str(RPL_ENDOFTRACE), tname);
-               return 0;
+               return;
        }
 
        /* source_p is opered */
@@ -278,7 +281,7 @@ m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                 */
                sendto_one_numeric(source_p, RPL_ENDOFTRACE,
                                   form_str(RPL_ENDOFTRACE), tname);
-               return 0;
+               return;
        }
 
        if(doall)
@@ -295,8 +298,6 @@ m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        }
 
        sendto_one_numeric(source_p, RPL_ENDOFTRACE, form_str(RPL_ENDOFTRACE), tname);
-
-       return 0;
 }
 
 /*