Migrate remaining modules to AV2

[solanum.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index 3e6df088312e06babf7d2114136a0d9db4146c55..2e4f7f5a7b2b20250706d86ae51a090e904f7e2d 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.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_info.c 3396 2007-04-05 00:38:52Z jilles $
  */
 
 #include "stdinc.h"
@@ -46,11 +44,11 @@ static void send_birthdate_online_time(struct Client *source_p);
 static void send_info_text(struct Client *source_p);
 static void info_spy(struct Client *);
 
-static int m_info(struct Client *, struct Client *, int, const char **);
-static int mo_info(struct Client *, struct Client *, int, const char **);
+static int m_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int mo_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message info_msgtab = {
-       "INFO", 0, 0, 0, MFLG_SLOW,
+       "INFO", 0, 0, 0, 0,
        {mg_unreg, {m_info, 0}, {mo_info, 0}, mg_ignore, mg_ignore, {mo_info, 0}}
 };
 
@@ -62,7 +60,7 @@ mapi_hlist_av1 info_hlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(info, NULL, NULL, info_clist, info_hlist, NULL, "$Revision: 3396 $");
+DECLARE_MODULE_AV2(info, NULL, NULL, info_clist, info_hlist, NULL, NULL, NULL, NULL);
 
 /*
  * jdc -- Structure for our configuration value table
@@ -584,6 +582,12 @@ static struct InfoStruct info_table[] = {
                &ConfigChannel.max_chans_per_user,
                "Maximum number of channels a user can join",
        },
+       {
+               "max_chans_per_user_large",
+               OUTPUT_DECIMAL,
+               &ConfigChannel.max_chans_per_user_large,
+               "Maximum extended number of channels a user can join",
+       },
        {
                "no_create_on_split",
                OUTPUT_BOOLEAN_YN,
@@ -666,7 +670,7 @@ static struct InfoStruct info_table[] = {
  **  parv[1] = servername
  */
 static int
-m_info(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        static time_t last_used = 0L;
 
@@ -698,7 +702,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
  **  parv[1] = servername
  */
 static int
-mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) == HUNTED_ISME)
        {
@@ -781,7 +785,7 @@ send_conf_options(struct Client *source_p)
        {
                if(infoptr->intvalue)
                {
-                       sendto_one(source_p, ":%s %d %s :%-30s %-5d [%-30s]",
+                       sendto_one(source_p, ":%s %d %s :%-30s %-16d [%s]",
                                        get_id(&me, source_p), RPL_INFO,
                                        get_id(source_p, source_p),
                                        infoptr->name, infoptr->intvalue,
@@ -789,7 +793,7 @@ send_conf_options(struct Client *source_p)
                }
                else
                {
-                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                        get_id(&me, source_p), RPL_INFO,
                                        get_id(source_p, source_p),
                                        infoptr->name, infoptr->strvalue,
@@ -804,14 +808,14 @@ send_conf_options(struct Client *source_p)
        {
                switch (info_table[i].output_type)
                {
-                       /*
-                        * For "char *" references
-                        */
+                               /*
+                                * For "char *" references
+                                */
                        case OUTPUT_STRING:
                                {
                                        char *option = *((char **) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -827,7 +831,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        char *option = (char *) info_table[i].option;
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -843,7 +847,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        int option = *((int *) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5d [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16d [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -860,7 +864,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        int option = *((int *) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -876,7 +880,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        int option = *((int *) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        get_id(&me, source_p), RPL_INFO,
                                                        get_id(source_p, source_p),
                                                        info_table[i].name,
@@ -890,7 +894,7 @@ send_conf_options(struct Client *source_p)
                                {
                                        int option = *((int *) info_table[i].option);
 
-                                       sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]",
+                                       sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]",
                                                        me.name, RPL_INFO, source_p->name,
                                                        info_table[i].name,
                                                        option ? ((option == 1) ? "MASK" : "YES") : "NO",