diff options
| author |  brain | 2006-08-11 12:15:03 +0000 |
|---|---|---|
| committer | brain | 2006-08-11 12:15:03 +0000 |
| commit | d17465716790010b6e3221f9ce49272110276ccf (patch) | |
| tree | d929b9c717e789d818d0eefbfe6e018974ae48f6 /src/channels.cpp | |
| parent | Move all of the xline stuff into class XLineManager, make an instance of it i... (diff) | |
Now two types of log macro, log() and ilog(). log() assumes an InspIRCd object called ServerInstance, ilog() takes an InspIRCd object as first param.
TODO: Run a regexp over these, using perl, to translate them into InspIRCd::Log calls and then eliminate the macro :)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4879 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index b72db32fc..f2f031a5c 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -240,7 +240,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo *Ptr->topic = 0; strlcpy(Ptr->setby, user->nick,NICKMAX-1); Ptr->topicset = 0; - log(DEBUG,"chanrec::JoinUser(): created: %s",cname); + ilog(Instance,DEBUG,"chanrec::JoinUser(): created: %s",cname); /* * set created to 2 to indicate user * is the first in the channel @@ -276,7 +276,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo { if (!key) { - log(DEBUG,"chanrec::JoinUser(): no key given in JOIN"); + ilog(Instance,DEBUG,"chanrec::JoinUser(): no key given in JOIN"); user->WriteServ("475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name); return NULL; } @@ -284,7 +284,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo { if (strcmp(key,Ptr->key)) { - log(DEBUG,"chanrec::JoinUser(): bad key given in JOIN"); + ilog(Instance,DEBUG,"chanrec::JoinUser(): bad key given in JOIN"); user->WriteServ("475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name); return NULL; } @@ -350,7 +350,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } else { - log(DEBUG,"chanrec::JoinUser(): Overridden checks"); + ilog(Instance,DEBUG,"chanrec::JoinUser(): Overridden checks"); } created = 1; } @@ -391,7 +391,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo if (created == 2) { - log(DEBUG,"BLAMMO, Whacking channel."); + ilog(Instance,DEBUG,"BLAMMO, Whacking channel."); /* Things went seriously pear shaped, so take this away. bwahaha. */ chan_hash::iterator n = Instance->chanlist.find(cname); if (n != Instance->chanlist.end()) @@ -443,7 +443,6 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* u /* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */ if (IS_LOCAL(user)) { - log(DEBUG,"Sent JOIN to client"); if (Ptr->topicset) { user->WriteServ("332 %s %s :%s", user->nick, Ptr->name, Ptr->topic); |