Merge branch 'elizafox-cleanups' of github.com:charybdis-ircd/charybdis into elizafox...

[solanum.git] / modules / m_links.c

diff --git a/modules/m_links.c b/modules/m_links.c
index 3893e4022cd8dd8f892613357985a093b1164144..499dd674ec62d4ba32a5c4d4f78779ca7cf39e3b 100644 (file)
--- a/modules/m_links.c
+++ b/modules/m_links.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_links.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
@@ -39,8 +37,11 @@
 #include "scache.h"
 #include "s_assert.h"
 
-static int m_links(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int mo_links(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char links_desc[] =
+       "Provides the LINKS command to view servers linked to the host server";
+
+static void m_links(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_links(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static char * clean_string(char *dest, const unsigned char *src, size_t len);
 
 struct Message links_msgtab = {
@@ -56,7 +57,7 @@ mapi_hlist_av1 links_hlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(links, NULL, NULL, links_clist, links_hlist, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(links, NULL, NULL, links_clist, links_hlist, NULL, NULL, NULL, links_desc);
 
 /*
  * m_links - LINKS message handler
@@ -65,18 +66,16 @@ DECLARE_MODULE_AV1(links, NULL, NULL, links_clist, links_hlist, NULL, "$Revision
  *      parv[1] = server to query
  *      parv[2] = servername mask
  */
-static int
+static void
 m_links(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        if(ConfigServerHide.flatten_links && !IsExemptShide(source_p))
                scache_send_flattened_links(source_p);
        else
                mo_links(msgbuf_p, client_p, source_p, parc, parv);
-
-       return 0;
 }
 
-static int
+static void
 mo_links(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        const char *mask = "";
@@ -89,10 +88,10 @@ mo_links(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        if(parc > 2)
        {
                if(strlen(parv[2]) > HOSTLEN)
-                       return 0;
+                       return;
                if(hunt_server(client_p, source_p, ":%s LINKS %s :%s", 1, parc, parv)
                   != HUNTED_ISME)
-                       return 0;
+                       return;
 
                mask = parv[2];
        }
@@ -127,8 +126,6 @@ mo_links(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 
        sendto_one_numeric(source_p, RPL_ENDOFLINKS, form_str(RPL_ENDOFLINKS),
                           EmptyString(mask) ? "*" : mask);
-
-       return 0;
 }
 
 static char *