diff options
| author | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-01-04 05:45:58 +0000 |
|---|---|---|
| committer | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-01-04 05:45:58 +0000 |
| commit | 2708eea5d13c249143b83fbaa8b552992f0ac8b6 (patch) | |
| tree | 5afffad5f83ca6daa89784c27f4d4e9c5f4eb8fc /src | |
| parent | f58026749b0c0770a322893b27c013168be5cdbc (diff) | |
Removed NICKMAX and CHANMAX, replaced user->nick, c->name, and ci->name with std::string
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2732 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
108 files changed, 624 insertions, 657 deletions
diff --git a/src/actions.c b/src/actions.c index 6ed840653..0e15f2cf4 100644 --- a/src/actions.c +++ b/src/actions.c @@ -97,8 +97,8 @@ void sqline(const std::string &mask, const std::string &reason) cunext = cu->next; if (is_oper(cu->user)) continue; - av[0] = c->name; - av[1] = cu->user->nick; + av[0] = c->name.c_str(); + av[1] = cu->user->nick.c_str(); av[2] = reason.c_str(); ircdproto->SendKick(findbot(Config.s_OperServ), c, cu->user, "Q-Lined: %s", av[2]); do_kick(Config.s_ChanServ, 3, av); @@ -158,7 +158,7 @@ void common_unban(ChannelInfo *ci, const std::string &nick) for (ban = ci->c->bans->entries; ban; ban = next) { next = ban->next; - if (entry_match(ban, u->nick, u->GetIdent().c_str(), u->host, ip) || entry_match(ban, u->nick, u->GetIdent().c_str(), u->GetDisplayedHost().c_str(), ip)) + if (entry_match(ban, u->nick.c_str(), u->GetIdent().c_str(), u->host, ip) || entry_match(ban, u->nick.c_str(), u->GetIdent().c_str(), u->GetDisplayedHost().c_str(), ip)) ci->c->RemoveMode(NULL, CMODE_BAN, ban->mask); } } diff --git a/src/bots.cpp b/src/bots.cpp index cae202bf2..ddd517b77 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -167,7 +167,7 @@ void BotInfo::UnAssign(User *u, ChannelInfo *ci) if (ci->c && ci->c->usercount >= Config.BSMinUsers) { if (u) - ircdproto->SendPart(ci->bi, ci->c, "UNASSIGN from %s", u->nick); + ircdproto->SendPart(ci->bi, ci->c, "UNASSIGN from %s", u->nick.c_str()); else ircdproto->SendPart(ci->bi, ci->c, ""); } diff --git a/src/botserv.c b/src/botserv.c index bbe3f30c9..f145e7028 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -91,7 +91,7 @@ void botserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { *s = 0; } - ircdproto->SendCTCP(findbot(Config.s_BotServ), u->nick, "PING %s", s); + ircdproto->SendCTCP(findbot(Config.s_BotServ), u->nick.c_str(), "PING %s", s); } else { mod_run_cmd(Config.s_BotServ, u, BOTSERV, cmd); } @@ -114,7 +114,7 @@ void botmsgs(User * u, BotInfo * bi, char *buf) if (!(s = strtok(NULL, ""))) { *s = 0; } - ircdproto->SendCTCP(bi, u->nick, "PING %s", s); + ircdproto->SendCTCP(bi, u->nick.c_str(), "PING %s", s); } else if (cmd && bi->cmdTable) { @@ -145,7 +145,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) /* Answer to ping if needed, without breaking the buffer. */ if (!strnicmp(buf, "\1PING", 5)) { - ircdproto->SendCTCP(ci->bi, u->nick, "PING %s", buf); + ircdproto->SendCTCP(ci->bi, u->nick.c_str(), "PING %s", buf); } /* If it's a /me, cut the CTCP part at the beginning (not @@ -409,7 +409,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) /* return if the user is on the ignore list */ - if (get_ignore(u->nick) != NULL) { + if (get_ignore(u->nick.c_str()) != NULL) { return; } @@ -650,7 +650,7 @@ void bot_join(ChannelInfo * ci) "%s invited %s into the channel.", ci->bi->nick, ci->bi->nick); } - ircdproto->SendJoin(ci->bi, ci->c->name, ci->c->creation_time); + ircdproto->SendJoin(ci->bi, ci->c->name.c_str(), ci->c->creation_time); ci->c->SetMode(NULL, CMODE_PROTECT, ci->bi->nick); ci->c->SetMode(NULL, CMODE_OP, ci->bi->nick); FOREACH_MOD(I_OnBotJoin, OnBotJoin(ci, ci->bi)); @@ -707,8 +707,8 @@ static void bot_kick(ChannelInfo * ci, User * u, int message, ...) vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); - av[0] = ci->name; - av[1] = u->nick; + av[0] = ci->name.c_str(); + av[1] = u->nick.c_str(); av[2] = buf; ircdproto->SendKick(ci->bi, ci->c, u, "%s", av[2]); do_kick(ci->bi->nick, 3, av); @@ -732,20 +732,18 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, if ((ModeManager::FindUserModeByName(UMODE_PROTECTED))) { if (is_protected(u) && (requester != u)) { - ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", - getstring(ACCESS_DENIED)); + ircdproto->SendPrivmsg(ci->bi, ci->name.c_str(), "%s", getstring(ACCESS_DENIED)); return; } } - if (ci->HasFlag(CI_PEACE) && stricmp(requester->nick, nick) && (get_access(u, ci) >= get_access(requester, ci))) + if (ci->HasFlag(CI_PEACE) && stricmp(requester->nick.c_str(), nick) && (get_access(u, ci) >= get_access(requester, ci))) return; if (ModeManager::FindChannelModeByName(CMODE_EXCEPT)) { if (is_excepted(ci, u) == 1) { - ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", - getstring(BOT_EXCEPT)); + ircdproto->SendPrivmsg(ci->bi, ci->name.c_str(), "%s", getstring(BOT_EXCEPT)); return; } } @@ -754,7 +752,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, ci->c->SetMode(NULL, CMODE_BAN, mask); - kav[0] = ci->name; + kav[0] = ci->name.c_str(); kav[1] = nick; if (!reason) { @@ -767,7 +765,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, /* 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)) - ircdproto->SendKick(ci->bi, ci->c, u, "%s (%s)", kav[2], requester->nick); + ircdproto->SendKick(ci->bi, ci->c, u, "%s (%s)", kav[2], requester->nick.c_str()); else ircdproto->SendKick(ci->bi, ci->c, u, "%s", kav[2]); @@ -791,16 +789,15 @@ void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick, if ((ModeManager::FindUserModeByName(UMODE_PROTECTED))) { if (is_protected(u) && (requester != u)) { - ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", - getstring(ACCESS_DENIED)); + ircdproto->SendPrivmsg(ci->bi, ci->name.c_str(), "%s", getstring(ACCESS_DENIED)); return; } } - if (ci->HasFlag(CI_PEACE) && stricmp(requester->nick, nick) && (get_access(u, ci) >= get_access(requester, ci))) + if (ci->HasFlag(CI_PEACE) && stricmp(requester->nick.c_str(), nick) && (get_access(u, ci) >= get_access(requester, ci))) return; - av[0] = ci->name; + av[0] = ci->name.c_str(); av[1] = nick; if (!reason) { @@ -812,7 +809,7 @@ void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick, } if (ci->HasFlag(CI_SIGNKICK) || ((ci->HasFlag(CI_SIGNKICK_LEVEL)) && !check_access(requester, ci, CA_SIGNKICK))) - ircdproto->SendKick(ci->bi, ci->c, u, "%s (%s)", av[2], requester->nick); + ircdproto->SendKick(ci->bi, ci->c, u, "%s (%s)", av[2], requester->nick.c_str()); else ircdproto->SendKick(ci->bi, ci->c, u, "%s", av[2]); do_kick(ci->bi->nick, 3, av); @@ -839,15 +836,13 @@ void bot_raw_mode(User * requester, ChannelInfo * ci, const char *mode, if ((ModeManager::FindUserModeByName(UMODE_PROTECTED))) { if (is_protected(u) && *mode == '-' && (requester != u)) { - ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", - getstring(ACCESS_DENIED)); + ircdproto->SendPrivmsg(ci->bi, ci->name.c_str(), "%s", getstring(ACCESS_DENIED)); return; } } if (*mode == '-' && ci->HasFlag(CI_PEACE) - && stricmp(requester->nick, nick) - && (get_access(u, ci) >= get_access(requester, ci))) + && stricmp(requester->nick.c_str(), nick) && (get_access(u, ci) >= get_access(requester, ci))) return; ci->c->SetModes(NULL, "%s %s", mode, nick); diff --git a/src/channels.c b/src/channels.c index 79f956581..5e9ca98de 100644 --- a/src/channels.c +++ b/src/channels.c @@ -33,7 +33,7 @@ Channel::Channel(const std::string &name, time_t ts) if (name.empty()) throw CoreException("A channel without a name ?"); - strscpy(this->name, name.c_str(), sizeof(this->name)); + this->name = name; list = &chanlist[HASH(this->name)]; this->prev = NULL; this->next = *list; @@ -43,7 +43,6 @@ Channel::Channel(const std::string &name, time_t ts) this->creation_time = ts; this->topic = NULL; - *this->topic_setter = 0; this->bans = this->excepts = this->invites = NULL; this->users = NULL; this->usercount = 0; @@ -51,7 +50,7 @@ Channel::Channel(const std::string &name, time_t ts) this->server_modetime = this->chanserv_modetime = 0; this->server_modecount = this->chanserv_modecount = this->bouncy_modes = this->topic_sync = 0; - this->ci = cs_findchan(this->name); + this->ci = cs_findchan(this->name.c_str()); if (this->ci) { this->ci->c = this; @@ -75,7 +74,7 @@ Channel::~Channel() FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this)); if (debug) - alog("debug: Deleting channel %s", this->name); + alog("debug: Deleting channel %s", this->name.c_str()); for (bd = this->bd; bd; bd = next) { @@ -148,7 +147,7 @@ void Channel::SetModeInternal(ChannelMode *cm, const std::string ¶m, bool En { if (param.empty()) { - alog("Channel: |
