Threadengine stuff

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index c28ca23dea160e935554dd3d0748264f1d7d3b54..2140a37aea1ae9919f841bbcbd23ad39ff5de95d 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,14 +18,14 @@
 #include "wildcard.h"
 #include "mode.h"
 
-Channel::Channel(InspIRCd* Instance, const std::string &name, time_t ts) : ServerInstance(Instance)
+Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
 {
        chan_hash::iterator findchan = ServerInstance->chanlist->find(name);
        if (findchan != Instance->chanlist->end())
-               throw CoreException("Cannot create duplicate channel " + name);
+               throw CoreException("Cannot create duplicate channel " + cname);
 
-       (*(ServerInstance->chanlist))[name.c_str()] = this;
-       strlcpy(this->name, name.c_str(), CHANMAX);
+       (*(ServerInstance->chanlist))[cname.c_str()] = this;
+       strlcpy(this->name, cname.c_str(), CHANMAX);
        this->created = ts ? ts : ServerInstance->Time(true);
        this->age = this->created;
 
@@ -379,18 +379,15 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
                ModeHandler* mh = Instance->Modes->FindPrefix(status);
                if (mh)
                {
+                       /* Set, and make sure that the mode handler knows this mode was now set */
                        Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
-                       /* Make sure that the mode handler knows this mode was now set */
                        mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true);
 
                        switch (mh->GetPrefix())
                        {
-                               /* These logic ops are SAFE IN THIS CASE
-                                * because if the entry doesnt exist,
-                                * addressing operator[] creates it.
-                                * If they do exist, it points to it.
-                                * At all other times where we dont want
-                                * to create an item if it doesnt exist, we
+                               /* These logic ops are SAFE IN THIS CASE because if the entry doesnt exist,
+                                * addressing operator[] creates it. If they do exist, it points to it.
+                                * At all other times where we dont want to create an item if it doesnt exist, we
                                 * must stick to ::find().
                                 */
                                case '@':
@@ -627,7 +624,7 @@ long Channel::KickUser(User *src, User *user, const char* reason)
        return this->GetUserCounter();
 }
 
-void Channel::WriteChannel(User* user, char* text, ...)
+void Channel::WriteChannel(User* user, const char* text, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
@@ -692,7 +689,7 @@ void Channel::WriteChannelWithServ(const char* ServName, const std::string &text
 
 /* write formatted text from a source user to all users on a channel except
  * for the sender (for privmsg etc) */
-void Channel::WriteAllExceptSender(User* user, bool serversource, char status, char* text, ...)
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
@@ -707,7 +704,7 @@ void Channel::WriteAllExceptSender(User* user, bool serversource, char status, c
        this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
 }
 
-void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, char* text, ...)
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const char* text, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;