m_oper: receive ircd-seven-style opernames

[solanum.git] / modules / m_help.c

diff --git a/modules/m_help.c b/modules/m_help.c
index 96dbd53fbc0b91d58c823ed0d6424160f4388b7b..9e56c861362838b4ee155f1c8e03364f5e08d780 100644 (file)
--- a/modules/m_help.c
+++ b/modules/m_help.c
@@ -34,11 +34,14 @@
 #include "modules.h"
 #include "hash.h"
 #include "cache.h"
-#include "irc_dictionary.h"
+#include "rb_dictionary.h"
 
-static int m_help(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int mo_help(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int mo_uhelp(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char help_desc[] =
+       "Provides the help facility for commands, modes, and server concepts";
+
+static void m_help(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_help(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_uhelp(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static void dohelp(struct Client *, int, const char *);
 
 struct Message help_msgtab = {
@@ -51,38 +54,35 @@ struct Message uhelp_msgtab = {
 };
 
 mapi_clist_av1 help_clist[] = { &help_msgtab, &uhelp_msgtab, NULL };
-DECLARE_MODULE_AV1(help, NULL, NULL, help_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(help, NULL, NULL, help_clist, NULL, NULL, NULL, NULL, help_desc);
 
 /*
  * m_help - HELP message handler
  */
-static int
+static void
 m_help(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        dohelp(source_p, HELP_USER, parc > 1 ? parv[1] : NULL);
-
-       return 0;
 }
 
 /*
  * mo_help - HELP message handler
  */
-static int
+static void
 mo_help(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        dohelp(source_p, HELP_OPER, parc > 1 ? parv[1] : NULL);
-       return 0;
 }
 
 /*
  * mo_uhelp - HELP message handler
  * This is used so that opers can view the user help file without deopering
  */
-static int
+static void
 mo_uhelp(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        dohelp(source_p, HELP_USER, parc > 1 ? parv[1] : NULL);
-       return 0;
 }
 
 static void
@@ -97,7 +97,7 @@ dohelp(struct Client *source_p, int flags, const char *topic)
        if(EmptyString(topic))
                topic = ntopic;
 
-       hptr = irc_dictionary_retrieve(flags & HELP_OPER ? help_dict_oper : help_dict_user, topic);
+       hptr = rb_dictionary_retrieve((flags & HELP_OPER) ? help_dict_oper : help_dict_user, topic);
 
        if(hptr == NULL || !(hptr->flags & flags))
        {
@@ -123,5 +123,4 @@ dohelp(struct Client *source_p, int flags, const char *topic)
 
        sendto_one(source_p, form_str(RPL_ENDOFHELP),
                   me.name, source_p->name, topic);
-       return;
 }