m_cap: Try to append caps even if one is too long

[solanum.git] / modules / m_pong.c

diff --git a/modules/m_pong.c b/modules/m_pong.c
index 3c2b244be8457cb5eb854e13760b30efd41d7fb5..5d17215840525b85c4b928b9bb43a1f84079b79a 100644 (file)
--- a/modules/m_pong.c
+++ b/modules/m_pong.c
@@ -38,19 +38,21 @@
 #include "hash.h"
 #include "modules.h"
 
-static int mr_pong(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_pong(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static const char pong_desc[] = "Provides the PONG command to respond to a PING message";
 
+static void mr_pong(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_pong(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
 struct Message pong_msgtab = {
        "PONG", 0, 0, 0, 0,
        {{mr_pong, 0}, mg_ignore, mg_ignore, {ms_pong, 2}, mg_ignore, mg_ignore}
 };
 
 mapi_clist_av1 pong_clist[] = { &pong_msgtab, NULL };
+
 DECLARE_MODULE_AV2(pong, NULL, NULL, pong_clist, NULL, NULL, NULL, NULL, pong_desc);
 
-static int
+static void
 ms_pong(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
@@ -77,7 +79,7 @@ ms_pong(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                        if(!IsDigit(*destination))
                                sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
                                                   form_str(ERR_NOSUCHSERVER), destination);
-                       return 0;
+                       return;
                }
        }
 
@@ -93,18 +95,16 @@ ms_pong(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                eob_count++;
                call_hook(h_server_eob, source_p);
        }
-
-       return 0;
 }
 
-static int
+static void
 mr_pong(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        if(parc == 2 && !EmptyString(parv[1]))
        {
                if(ConfigFileEntry.ping_cookie && source_p->flags & FLAGS_SENTUSER && source_p->name[0])
                {
-                       unsigned long incoming_ping = strtoul(parv[1], NULL, 16);
+                       uint32_t incoming_ping = strtoul(parv[1], NULL, 16);
                        if(incoming_ping)
                        {
                                if(source_p->localClient->random_ping == incoming_ping)
@@ -117,7 +117,7 @@ mr_pong(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                                        sendto_one(source_p, form_str(ERR_WRONGPONG),
                                                   me.name, source_p->name,
                                                   source_p->localClient->random_ping);
-                                       return 0;
+                                       return;
                                }
                        }
                }
@@ -127,6 +127,4 @@ mr_pong(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                sendto_one(source_p, form_str(ERR_NOORIGIN), me.name, source_p->name);
 
        source_p->flags &= ~FLAGS_PINGSENT;
-
-       return 0;
 }