Cast time_t to long long when printing

[solanum.git] / extensions / m_ojoin.c

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 430faa31a519491cf44605800b1c0a77df9b2c4a..38b35d1e5a2b0d18e26a4f6e1b3c634c91a4cfb2 100644 (file)
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -15,8 +15,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *   $Id: m_ojoin.c 3554 2007-08-10 22:31:14Z jilles $
  */
 
 #include "stdinc.h"
@@ -37,23 +35,24 @@
 #include "modules.h"
 #include "messages.h"
 
-static int mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static const char ojoin_desc[] = "Allow admins to forcibly join channels with the OJOIN command";
 
+static void mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message ojoin_msgtab = {
-       "OJOIN", 0, 0, 0, MFLG_SLOW,
+       "OJOIN", 0, 0, 0, 0,
        {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_ojoin, 2}}
 };
 
 mapi_clist_av1 ojoin_clist[] = { &ojoin_msgtab, NULL };
 
-DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3554 $");
+DECLARE_MODULE_AV2(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, NULL, NULL, ojoin_desc);
 
 /*
 ** mo_ojoin
 **      parv[1] = channel
 */
-static int
+static void
 mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Channel *chptr;
@@ -63,7 +62,7 @@ mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        if(!IsOperAdmin(source_p))
        {
                sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
-               return 0;
+               return;
        }
 
        if(*parv[1] == '@' || *parv[1] == '+')
@@ -76,13 +75,13 @@ mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        {
                sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
                                   form_str(ERR_NOSUCHCHANNEL), parv[1]);
-               return 0;
+               return;
        }
 
        if(IsMember(source_p, chptr))
        {
                sendto_one_notice(source_p, ":Please part %s before using OJOIN", parv[1]);
-               return 0;
+               return;
        }
 
        if(move_me == 1)
@@ -106,7 +105,7 @@ mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                              ":%s SJOIN %ld %s + :@%s",
                              me.id, (long) chptr->channelts, chptr->chname, source_p->id);
                send_channel_join(chptr, source_p);
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
+               sendto_channel_local(&me, ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
                                     me.name, chptr->chname, source_p->name);
 
        }
@@ -117,7 +116,7 @@ mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                              ":%s SJOIN %ld %s + :+%s",
                              me.id, (long) chptr->channelts, chptr->chname, source_p->id);
                send_channel_join(chptr, source_p);
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +v %s",
+               sendto_channel_local(&me, ALL_MEMBERS, chptr, ":%s MODE %s +v %s",
                                     me.name, chptr->chname, source_p->name);
        }
        else
@@ -135,11 +134,9 @@ mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                sendto_one(source_p, form_str(RPL_TOPIC), me.name,
                           source_p->name, chptr->chname, chptr->topic);
                sendto_one(source_p, form_str(RPL_TOPICWHOTIME), me.name,
-                          source_p->name, chptr->chname, chptr->topic_info, chptr->topic_time);
+                          source_p->name, chptr->chname, chptr->topic_info, (long long)chptr->topic_time);
        }
 
        source_p->localClient->last_join_time = rb_current_time();
        channel_member_names(chptr, source_p, 1);
-
-       return 0;
 }