X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=0201ec7b4fc1f80a072598c980d01b0af8813dc0;hb=1f1258997c2d63eb54c5addece622af37f637a7b;hp=f1c01b40798c2f5bbfd5a601675dabd671005e6d;hpb=7c1488c4ebbb4fd0cb209a2b1939037578d8a69d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index f1c01b407..0201ec7b4 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -19,7 +19,6 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
@@ -62,10 +61,6 @@ extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern int WHOWAS_STALE;
 extern int WHOWAS_MAX;
-extern time_t startup_time;
-extern std::vector<std::string> module_names;
-extern int boundPortCount;
-extern std::stringstream config_f;
 extern time_t TIME;
 extern chan_hash chanlist;
 
@@ -77,13 +72,8 @@ chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created);
 
 chanrec::chanrec()
 {
-	strcpy(name,"");
-	strcpy(custom_modes,"");
-	strcpy(topic,"");
-	strcpy(setby,"");
-	strcpy(key,"");
-	created = topicset = limit = 0;
-	binarymodes = 0;
+	*name = *custom_modes = *topic = *setby = *key = 0;
+	created = topicset = limit = binarymodes = 0;
 	internal_userlist.clear();
 }
 
@@ -227,7 +217,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                 strlcpy(chanlist[cname]->name, cname,CHANMAX);
                 chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL;
                 chanlist[cname]->created = TIME;
-                strcpy(chanlist[cname]->topic, "");
+                *chanlist[cname]->topic = 0;
                 strncpy(chanlist[cname]->setby, user->nick,NICKMAX);
                 chanlist[cname]->topicset = 0;
                 Ptr = chanlist[cname];
@@ -280,12 +270,13 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                 }
                                 if (Ptr->binarymodes & CM_INVITEONLY)
                                 {
-                                        MOD_RESULT = 0;
+					MOD_RESULT = 0;
+					irc::string xname(Ptr->name);
                                         FOREACH_RESULT(OnCheckInvite(user, Ptr));
                                         if (!MOD_RESULT)
                                         {
                                                 log(DEBUG,"add_channel: channel is +i");
-                                                if (user->IsInvited(Ptr->name))
+                                                if (user->IsInvited(xname))
                                                 {
                                                         /* user was invited to channel */
                                                         /* there may be an optional channel NOTICE here */
@@ -296,7 +287,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                                         return NULL;
                                                 }
                                         }
-                                        user->RemoveInvite(Ptr->name);
+                                        user->RemoveInvite(xname);
                                 }
                                 if (Ptr->limit)
                                 {