client: refactor del_all_accepts to allow skipping own accept list

[solanum.git] / modules / m_map.c

diff --git a/modules/m_map.c b/modules/m_map.c
index ba2bd44275e3812848e74cf6627c6b81652759b3..d6aa971c7306484d684b06d3ce1b0c26345c63db 100644 (file)
--- a/modules/m_map.c
+++ b/modules/m_map.c
@@ -30,8 +30,10 @@
 
 #define USER_COL       50      /* display | Users: %d at col 50 */
 
-static int m_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int mo_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static const char map_desc[] = "Provides the MAP command to view network topology information";
+
+static void m_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void mo_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message map_msgtab = {
        "MAP", 0, 0, 0, 0,
@@ -39,7 +41,8 @@ struct Message map_msgtab = {
 };
 
 mapi_clist_av1 map_clist[] = { &map_msgtab, NULL };
-DECLARE_MODULE_AV1(map, NULL, NULL, map_clist, NULL, NULL, "$Revision: 3368 $");
+
+DECLARE_MODULE_AV2(map, NULL, NULL, map_clist, NULL, NULL, NULL, NULL, map_desc);
 
 static void dump_map(struct Client *client_p, struct Client *root, char *pbuf);
 static void flattened_map(struct Client *client_p);
@@ -48,7 +51,7 @@ static char buf[BUFSIZE];
 
 /* m_map
 */
-static int
+static void
 m_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        if((!IsExemptShide(source_p) && ConfigServerHide.flatten_links) ||
@@ -56,25 +59,22 @@ m_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
        {
                flattened_map(client_p);
                sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
-               return 0;
+               return;
        }
 
        dump_map(client_p, &me, buf);
        sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
-       return 0;
 }
 
 /*
 ** mo_map
 */
-static int
+static void
 mo_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        dump_map(client_p, &me, buf);
        scache_send_missing(client_p);
        sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
-
-       return 0;
 }
 
 /*
@@ -108,7 +108,7 @@ dump_map(struct Client *client_p, struct Client *root_p, char *pbuf)
        }
 
        frac = (1000 * rb_dlink_list_length(&root_p->serv->users) + Count.total / 2) / Count.total;
-       snprintf(buf + USER_COL, BUFSIZE - USER_COL,
+       snprintf(buf + USER_COL, sizeof buf - USER_COL,
                 " | Users: %5lu (%2d.%1d%%)", rb_dlink_list_length(&root_p->serv->users),
                 frac / 10, frac % 10);
 
@@ -157,7 +157,7 @@ flattened_map(struct Client *client_p)
        rb_dlink_node *ptr;
        struct Client *target_p;
        int i, len;
-       int cnt = 0;
+       unsigned long cnt = 0;
 
        /* First display me as the root */
        rb_strlcpy(buf, me.name, BUFSIZE);
@@ -172,7 +172,7 @@ flattened_map(struct Client *client_p)
                }
        }
 
-       snprintf(buf + USER_COL, BUFSIZE - USER_COL,
+       snprintf(buf + USER_COL, sizeof buf - USER_COL,
                " | Users: %5lu (%4.1f%%)", rb_dlink_list_length(&me.serv->users),
                100 * (float) rb_dlink_list_length(&me.serv->users) / (float) Count.total);
 
@@ -210,7 +210,7 @@ flattened_map(struct Client *client_p)
                        }
                }
 
-               snprintf(buf + USER_COL, BUFSIZE - USER_COL,
+               snprintf(buf + USER_COL, sizeof buf - USER_COL,
                        " | Users: %5lu (%4.1f%%)", rb_dlink_list_length(&target_p->serv->users),
                        100 * (float) rb_dlink_list_length(&target_p->serv->users) / (float) Count.total);