diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/os_defcon.c | 36 | ||||
| -rw-r--r-- | src/modes.cpp | 23 | ||||
| -rw-r--r-- | src/protocol/unreal32.c | 6 |
3 files changed, 32 insertions, 33 deletions
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c index 8ebdd33a2..96b945a97 100644 --- a/src/core/os_defcon.c +++ b/src/core/os_defcon.c @@ -507,24 +507,24 @@ void defconParseModeString(const char *str) static char *defconReverseModes(const char *modes) { - char *newmodes = NULL; - unsigned i = 0; - if (!modes) { - return NULL; - } - if (!(newmodes = new char[strlen(modes) + 1])) { - return NULL; - } - for (i = 0; i < strlen(modes); i++) { - if (modes[i] == '+') - newmodes[i] = '-'; - else if (modes[i] == '-') - newmodes[i] = '+'; - else - newmodes[i] = modes[i]; - } - newmodes[i] = '\0'; - return newmodes; + char *newmodes = NULL; + unsigned i = 0; + if (!modes) { + return NULL; + } + if (!(newmodes = new char[strlen(modes) + 1])) { + return NULL; + } + for (i = 0; i < strlen(modes); i++) { + if (modes[i] == '+') + newmodes[i] = '-'; + else if (modes[i] == '-') + newmodes[i] = '+'; + else + newmodes[i] = modes[i]; + } + newmodes[i] = '\0'; + return newmodes; } MODULE_INIT(OSDEFCON) diff --git a/src/modes.cpp b/src/modes.cpp index 5d20c8b7e..4f5879846 100644 --- a/src/modes.cpp +++ b/src/modes.cpp @@ -480,17 +480,16 @@ void StackerInfo::AddMode(void *Mode, bool Set, const std::string &Param) */ StackerInfo *ModeManager::GetInfo(void *Item) { - for (std::list<std::pair<void *, StackerInfo *> >::const_iterator it = StackerObjects.begin(); it != -StackerObjects.end(); ++it) - { - const std::pair<void *, StackerInfo *> &PItem = *it; - if (PItem.first == Item) - return PItem.second; - } + for (std::list<std::pair<void *, StackerInfo *> >::const_iterator it = StackerObjects.begin(); it != StackerObjects.end(); ++it) + { + const std::pair<void *, StackerInfo *> &PItem = *it; + if (PItem.first == Item) + return PItem.second; + } - StackerInfo *s = new StackerInfo; - StackerObjects.push_back(std::make_pair(Item, s)); - return s; + tackerInfo *s = new StackerInfo; + StackerObjects.push_back(std::make_pair(Item, s)); + return s; } /** Build a list of mode strings to send to the IRCd from the mode stacker @@ -628,7 +627,7 @@ bool ModeManager::AddUserMode(UserMode *um) um->Name = static_cast<UserModeName>(UMODE_END + ++GenericUserModes); Alog() << "ModeManager: Added generic support for user mode " << um->ModeChar; } - ModeManager::UserModesByName.insert(std::make_pair(um->Name, um)).second; + ModeManager::UserModesByName.insert(std::make_pair(um->Name, um)); ModeManager::Modes.push_back(um); FOREACH_MOD(I_OnUserModeAdd, OnUserModeAdd(um)); @@ -652,7 +651,7 @@ bool ModeManager::AddChannelMode(ChannelMode *cm) cm->Name = static_cast<ChannelModeName>(CMODE_END + ++GenericChannelModes); Alog() << "ModeManager: Added generic support for channel mode " << cm->ModeChar; } - ModeManager::ChannelModesByName.insert(std::make_pair(cm->Name, cm)).second; + ModeManager::ChannelModesByName.insert(std::make_pair(cm->Name, cm)); ModeManager::Modes.push_back(cm); /* Apply this mode to the new default mlock if its used */ diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 1041352db..3eb24cc62 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -701,9 +701,9 @@ int anope_event_mode(const char *source, int ac, const char **av) /* This is used to strip the TS from the end of the mode stirng */ int anope_event_gmode(const char *source, int ac, const char **av) { - if (findserver(servlist, source)) - --ac; - return anope_event_mode(source, ac, av); + if (findserver(servlist, source)) + --ac; + return anope_event_mode(source, ac, av); } /* Unreal sends USER modes with this */ |