X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=2140a37aea1ae9919f841bbcbd23ad39ff5de95d;hb=4507fa2302b7dd0a8f6f0a43d9b46f6c21bf3345;hp=cab05caeb1b7a607c3faba8d2c74d6c1a58431d4;hpb=366a6768437ef753dc31f3ce73e8b2e20a66d243;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index cab05caeb..2140a37ae 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -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;
 
@@ -624,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;
@@ -689,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;
@@ -704,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;