Can IGNORE_BOGUS_TS at the behest of @kaniini and @jilest

[solanum.git] / modules / core / m_kill.c

diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 06bbe9a2ed924dbe29c6d20f6af51cdcd25ccc92..dd4e71d52c12e15d3f453957cd03609929543c79 100644 (file)
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -38,11 +38,13 @@
 #include "modules.h"
 #include "s_newconf.h"
 
+static const char kill_desc[] = "Provides the KILL command to remove a user from the network";
+
 static int h_can_kill;
 static char buf[BUFSIZE];
 
-static int ms_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int mo_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static void relay_kill(struct Client *, struct Client *, struct Client *,
                       const char *, const char *);
 
@@ -58,14 +60,14 @@ mapi_hlist_av1 kill_hlist[] = {
        { NULL, NULL},
 };
 
-DECLARE_MODULE_AV2(kill, NULL, NULL, kill_clist, kill_hlist, NULL, NULL, NULL, NULL);
+DECLARE_MODULE_AV2(kill, NULL, NULL, kill_clist, kill_hlist, NULL, NULL, NULL, kill_desc);
 
 /*
 ** mo_kill
 **      parv[1] = kill victim
 **      parv[2] = kill path
 */
-static int
+static void
 mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
@@ -79,7 +81,7 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        if(!IsOperLocalKill(source_p))
        {
                sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "local_kill");
-               return 0;
+               return;
        }
 
        if(!EmptyString(parv[2]))
@@ -107,7 +109,7 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                        else
                                sendto_one_numeric(source_p, ERR_NOSUCHNICK,
                                                   form_str(ERR_NOSUCHNICK), user);
-                       return 0;
+                       return;
                }
                sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
        }
@@ -117,7 +119,7 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                sendto_one_notice(source_p, ":Nick %s is not on your server "
                                            "and you do not have the global_kill flag",
                                target_p->name);
-               return 0;
+               return;
        }
 
        /* Last chance to stop the kill */
@@ -128,7 +130,7 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
        if (moduledata.approved == 0)
                /* The callee should have sent a message. */
-               return 0;
+               return;
 
        if(MyConnect(target_p))
                sendto_one(target_p, ":%s!%s@%s KILL %s :%s",
@@ -166,8 +168,6 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        sprintf(buf, "Killed (%s (%s))", source_p->name, reason);
 
        exit_client(client_p, target_p, source_p, buf);
-
-       return 0;
 }
 
 /*
@@ -175,7 +175,7 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
  *      parv[1] = kill victim
  *      parv[2] = kill path and reason
  */
-static int
+static void
 ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
@@ -223,7 +223,7 @@ ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                {
                        sendto_one_numeric(source_p, ERR_NOSUCHNICK,
                                           form_str(ERR_NOSUCHNICK), IsDigit(*user) ? "*" : user);
-                       return 0;
+                       return;
                }
                sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
        }
@@ -231,7 +231,7 @@ ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        if(IsServer(target_p) || IsMe(target_p))
        {
                sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
-               return 0;
+               return;
        }
 
        if(MyConnect(target_p))
@@ -285,8 +285,6 @@ ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        sprintf(buf, "Killed (%s %s)", source_p->name, reason);
 
        exit_client(client_p, target_p, source_p, buf);
-
-       return 0;
 }
 
 static void