librb: fix socklen_t check

[solanum.git] / modules / m_tb.c

diff --git a/modules/m_tb.c b/modules/m_tb.c
index a66dab6b6e09b6e6da5f50eefbad3ebbb385e212..2ca66a505339d98efd5469c27dc021863e26d302 100644 (file)
--- a/modules/m_tb.c
+++ b/modules/m_tb.c
@@ -33,7 +33,7 @@
 #include "channel.h"
 #include "client.h"
 #include "common.h"
-#include "config.h"
+#include "defaults.h"
 #include "ircd.h"
 #include "match.h"
 #include "s_conf.h"
@@ -42,11 +42,12 @@
 #include "hash.h"
 #include "s_serv.h"
 
-static int ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int ms_etb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static const char tb_desc[] =
        "Provides TS6 TB and ETB commands for topic bursting between servers";
 
+static void ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void ms_etb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+
 struct Message tb_msgtab = {
        "TB", 0, 0, 0, 0,
        {mg_unreg, mg_ignore, mg_ignore, {ms_tb, 4}, mg_ignore, mg_ignore}
@@ -67,7 +68,7 @@ DECLARE_MODULE_AV2(tb, NULL, NULL, tb_clist, NULL, NULL, NULL, NULL, tb_desc);
  * parv[3] - optional topicwho/topic
  * parv[4] - topic
  */
-static int
+static void
 ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Channel *chptr;
@@ -79,7 +80,7 @@ ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
        chptr = find_channel(parv[1]);
 
        if(chptr == NULL)
-               return 0;
+               return;
 
        newtopicts = atol(parv[2]);
 
@@ -101,7 +102,7 @@ ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
        }
 
        if (EmptyString(newtopic))
-               return 0;
+               return;
 
        if(chptr->topic == NULL || chptr->topic_time > newtopicts)
        {
@@ -110,7 +111,7 @@ ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
                 * same topic just drop the message --fl
                 */
                if(chptr->topic != NULL && strcmp(chptr->topic, newtopic) == 0)
-                       return 0;
+                       return;
 
                set_channel_topic(chptr, newtopic, newtopicwho, newtopicts);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s TOPIC %s :%s",
@@ -121,8 +122,6 @@ ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
                              ConfigChannel.burst_topicwho ? chptr->topic_info : "",
                              ConfigChannel.burst_topicwho ? " " : "", chptr->topic);
        }
-
-       return 0;
 }
 
 /* ms_etb()
@@ -133,7 +132,7 @@ ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
  * parv[4] - topicwho
  * parv[5] - topic
  */
-static int
+static void
 ms_etb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Channel *chptr;
@@ -147,7 +146,7 @@ ms_etb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
        chptr = find_channel(parv[2]);
 
        if(chptr == NULL)
-               return 0;
+               return;
 
        newtopicts = atol(parv[3]);
 
@@ -249,6 +248,4 @@ ms_etb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
                                      me.id, chptr->chname, chptr->chname);
                }
        }
-
-       return 0;
 }