diff options
| author | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-05-27 01:51:14 +0000 |
|---|---|---|
| committer | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-05-27 01:51:14 +0000 |
| commit | a5ddbb0217af75606c7c694e54d771a8bde8d834 (patch) | |
| tree | 1a6d89331be9c4033465922ec930ef37d8b18a48 | |
| parent | 3d396f245b99b7469b742f45639367e47d6f7456 (diff) | |
Fixed some compiler warnings found on 64bit systems
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2989 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | src/botserv.c | 2 | ||||
| -rw-r--r-- | src/core/cs_info.c | 7 | ||||
| -rw-r--r-- | src/users.c | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/botserv.c b/src/botserv.c index 893d3af3b..8998e888e 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -746,7 +746,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, const char *rea ci->c->SetMode(NULL, CMODE_BAN, mask); /* Check if we need to do a signkick or not -GD */ - if (ci->HasFlag(CI_SIGNKICK) || ci->HasFlag(CI_SIGNKICK_LEVEL) && !check_access(requester, ci, CA_SIGNKICK)) + if (ci->HasFlag(CI_SIGNKICK) || (ci->HasFlag(CI_SIGNKICK_LEVEL) && !check_access(requester, ci, CA_SIGNKICK))) ci->c->Kick(ci->bi, u, "%s (%s)", reason ? reason : ci->bi->nick.c_str(), requester->nick.c_str()); else ci->c->Kick(ci->bi, u, "%s", reason ? reason : ci->bi->nick.c_str()); diff --git a/src/core/cs_info.c b/src/core/cs_info.c index 1322b8736..2a8c0b905 100644 --- a/src/core/cs_info.c +++ b/src/core/cs_info.c @@ -47,7 +47,6 @@ class CommandCSInfo : public Command bool has_auspex = u->Account() && u->Account()->HasPriv("chanserv/auspex"); int show_all = 0; time_t expt; - ChannelMode *cm; ci = cs_findchan(chan); @@ -82,11 +81,7 @@ class CommandCSInfo : public Command strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); notice_lang(Config.s_ChanServ, u, CHAN_INFO_LAST_USED, buf); - cm = ModeManager::FindChannelModeByName(CMODE_SECRET); - // XXX: yuck. - if (ci->last_topic && - (show_all || (!ci->HasMLock(cm->Name, true)) - && (!ci->c || !(ci->c->HasMode(CMODE_SECRET))))) + if (ci->last_topic && (show_all || (!ci->HasMLock(CMODE_SECRET, true) && (!ci->c || !ci->c->HasMode(CMODE_SECRET))))) { notice_lang(Config.s_ChanServ, u, CHAN_INFO_LAST_TOPIC, ci->last_topic); notice_lang(Config.s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter.c_str()); diff --git a/src/users.c b/src/users.c index 16d85796d..e6853eeeb 100644 --- a/src/users.c +++ b/src/users.c @@ -498,7 +498,7 @@ void User::UpdateHost() { NickAlias *na = findnick(this->nick); - if (na && (this->nc && na->nc == this->nc || !na->nc->HasFlag(NI_SECURE) && IsRecognized())) + if (na && ((this->nc && na->nc == this->nc) || (!na->nc->HasFlag(NI_SECURE) && IsRecognized()))) { if (na->last_usermask) delete [] na->last_usermask; |