channel: fix confusing "adding to invite list" debug output

[ngircd-alex.git] / src / ngircd / channel.c

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 0a1ba4552b59b1043b988fe9d316f3b184815075..e49e5a9a6127cc3f34771af77af096fc6d951eb6 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -27,14 +27,12 @@
 
 #include "defines.h"
 #include "conn-func.h"
-#include "client.h"
 
 #include "exp.h"
 #include "channel.h"
 
 #include "imp.h"
 #include "irc-write.h"
-#include "resolve.h"
 #include "conf.h"
 #include "hash.h"
 #include "lists.h"
@@ -198,7 +196,7 @@ Channel_Exit( void )
  * Add_Client().
  */
 GLOBAL bool
-Channel_Join( CLIENT *Client, char *Name )
+Channel_Join( CLIENT *Client, const char *Name )
 {
        CHANNEL *chan;
 
@@ -325,7 +323,7 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name,
 
 
 GLOBAL void
-Channel_Quit( CLIENT *Client, char *Reason )
+Channel_Quit( CLIENT *Client, const char *Reason )
 {
        CHANNEL *c, *next_c;
 
@@ -699,6 +697,14 @@ Channel_TopicWho(CHANNEL *Chan)
        return Chan->topic_who;
 } /* Channel_TopicWho */
 
+
+GLOBAL unsigned int
+Channel_CreationTime(CHANNEL *Chan)
+{
+       assert(Chan != NULL);
+       return (unsigned int) Chan->creation_time;
+} /* Channel_CreationTime */
+
 #endif
 
 
@@ -731,7 +737,7 @@ Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, const char *Topic)
 
 
 GLOBAL void
-Channel_SetModes( CHANNEL *Chan, char *Modes )
+Channel_SetModes( CHANNEL *Chan, const char *Modes )
 {
        assert( Chan != NULL );
        assert( Modes != NULL );
@@ -836,6 +842,9 @@ Channel_Create( const char *Name )
        strlcpy( c->name, Name, sizeof( c->name ));
        c->hash = Hash( c->name );
        c->next = My_Channels;
+#ifndef STRICT_RFC
+       c->creation_time = time(NULL);
+#endif
        My_Channels = c;
        LogDebug("Created new channel structure for \"%s\".", Name);
        return c;
@@ -980,6 +989,7 @@ GLOBAL bool
 Channel_AddBan(CHANNEL *c, const char *mask )
 {
        struct list_head *h = Channel_GetListBans(c);
+       LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "ban");
        return Lists_Add(h, mask, false);
 }
 
@@ -988,6 +998,7 @@ GLOBAL bool
 Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce)
 {
        struct list_head *h = Channel_GetListInvites(c);
+       LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "invite");
        return Lists_Add(h, mask, onlyonce);
 }
 
@@ -1042,7 +1053,7 @@ Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel )
  * Log a message to the local &SERVER channel, if it exists.
  */
 GLOBAL void
-Channel_LogServer(char *msg)
+Channel_LogServer(const char *msg)
 {
        CHANNEL *sc;
        CLIENT *c;
@@ -1085,7 +1096,7 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key)
                return false;
        }
 
-       while (fgets(line, sizeof(line), fd) != NULL) {
+       while (fgets(line, (int)sizeof(line), fd) != NULL) {
                ngt_TrimStr(line);
                if (! (nick = strchr(line, ':')))
                        continue;