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/core | |
| 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/core')
80 files changed, 384 insertions, 405 deletions
diff --git a/src/core/bs_act.c b/src/core/bs_act.c index e321c37a9..a22748515 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -41,7 +41,7 @@ class CommandBSAct : public Command if (!ci->c || ci->c->usercount < Config.BSMinUsers) { - notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); + notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name.c_str()); return MOD_CONT; } @@ -49,10 +49,10 @@ class CommandBSAct : public Command while ((i = message.find_first_of("\001"), i) && i != std::string::npos) message.erase(i, 1); - ircdproto->SendAction(ci->bi, ci->name, "%s", message.c_str()); + ircdproto->SendAction(ci->bi, ci->name.c_str(), "%s", message.c_str()); ci->bi->lastmsg = time(NULL); if (Config.LogBot && Config.LogChannel && LogChan && !debug && findchan(Config.LogChannel)) - ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "ACT %s %s %s", u->nick, ci->name, message.c_str()); + ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "ACT %s %s %s", u->nick.c_str(), ci->name.c_str(), message.c_str()); return MOD_CONT; } diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index 30b7ef647..56912559e 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -62,7 +62,7 @@ class CommandBSAssign : public Command } bi->Assign(u, ci); - notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name.c_str()); return MOD_CONT; } diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index 06f4eedd0..89de294b8 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -28,7 +28,7 @@ class CommandBSBadwords : public Command if (!ci->GetBadWordCount()) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name.c_str()); return MOD_CONT; } if (!word.empty() && strspn(word.c_str(), "1234567890,-") == word.length()) @@ -48,7 +48,7 @@ class CommandBSBadwords : public Command } } if (!sent_header) - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); return MOD_CONT; } @@ -87,14 +87,14 @@ class CommandBSBadwords : public Command if (!bw->word.empty() && (Config.BSCaseSensitive && !stricmp(bw->word.c_str(), realword.c_str()) || (!Config.BSCaseSensitive && bw->word == realword.c_str()))) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name.c_str()); return MOD_CONT; } } ci->AddBadWord(realword.c_str(), type); - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name.c_str()); return MOD_CONT; } @@ -111,20 +111,20 @@ class CommandBSBadwords : public Command { if (count == 1) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY, last, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY, last, ci->name.c_str()); } else { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); } } else if (deleted == 1) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_ONE, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_ONE, ci->name.c_str()); } else { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL, deleted, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL, deleted, ci->name.c_str()); } if (deleted) @@ -145,13 +145,13 @@ class CommandBSBadwords : public Command if (i == ci->GetBadWordCount()) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name.c_str()); return MOD_CONT; } ci->EraseBadWord(badword); - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name.c_str()); } return MOD_CONT; @@ -261,7 +261,7 @@ int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!*sent_header) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name.c_str()); *sent_header = 1; } diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 2c0195ee4..0d057849e 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -58,7 +58,7 @@ class CommandBSBot : public Command return MOD_CONT; } - for (ch = nick; *ch && (ch - nick) < NICKMAX; ch++) + for (ch = nick; *ch && (ch - nick) < Config.NickLen; ch++) { if (!isvalidnick(*ch)) { @@ -190,7 +190,7 @@ class CommandBSBot : public Command return MOD_CONT; } - for (ch = nick; *ch && (ch - nick) < NICKMAX; ch++) + for (ch = nick; *ch && (ch - nick) < Config.NickLen; ch++) { if (!isvalidnick(*ch)) { @@ -322,7 +322,7 @@ class CommandBSBot : public Command FOREACH_MOD(I_OnBotDelete, OnBotDelete(bi)); - ircdproto->SendQuit(bi, "Quit: Help! I'm being deleted by %s!", u->nick); + ircdproto->SendQuit(bi, "Quit: Help! I'm being deleted by %s!", u->nick.c_str()); ircdproto->SendSQLineDel(bi->nick); delete bi; diff --git a/src/core/bs_info.c b/src/core/bs_info.c index 2f2afb2d8..5cb89c673 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -30,14 +30,14 @@ class CommandBSInfo : public Command for (i = 0; i < 256; i++) { for (ci = chanlists[i]; ci; ci = ci->next) { if (ci->bi == bi) { - if (strlen(buf) + strlen(ci->name) > 300) { + if (strlen(buf) + strlen(ci->name.c_str()) > 300) { u->SendMessage(Config.s_BotServ, "%s", buf); *buf = 0; end = buf; } end += snprintf(end, sizeof(buf) - (end - buf), " %s ", - ci->name); + ci->name.c_str()); } } } @@ -86,7 +86,7 @@ class CommandBSInfo : public Command return MOD_CONT; } - notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name); + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name.c_str()); if (ci->bi) notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_BOT, ci->bi->nick); else diff --git a/src/core/bs_say.c b/src/core/bs_say.c index 7143da298..c1021c79d 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -45,7 +45,7 @@ class CommandBSSay : public Command if (!ci->c || ci->c->usercount < Config.BSMinUsers) { - notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); + notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name.c_str()); return MOD_CONT; } @@ -55,10 +55,10 @@ class CommandBSSay : public Command return MOD_CONT; } - ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text); + ircdproto->SendPrivmsg(ci->bi, ci->name.c_str(), "%s", text); ci->bi->lastmsg = time(NULL); if (Config.LogBot && Config.LogChannel && LogChan && !debug && findchan(Config.LogChannel)) - ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "SAY %s %s %s", u->nick, ci->name, text); + ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "SAY %s %s %s", u->nick.c_str(), ci->name.c_str(), text); return MOD_CONT; } diff --git a/src/core/bs_set.c b/src/core/bs_set.c index 91c69122b..deffc5833 100644 --- a/src/core/bs_set.c +++ b/src/core/bs_set.c @@ -70,11 +70,11 @@ class CommandBSSet : public Command if (value == "ON") { ci->botflags.SetFlag(BS_DONTKICKOPS); notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_ON, - ci->name); + ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_DONTKICKOPS); notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, - ci->name); + ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX); @@ -83,11 +83,11 @@ class CommandBSSet : public Command if (value == "ON") { ci->botflags.SetFlag(BS_DONTKICKVOICES); notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, - ci->name); + ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_DONTKICKVOICES); notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, - ci->name); + ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX); @@ -95,10 +95,10 @@ class CommandBSSet : public Command } else if (option == "FANTASY") { if (value == "ON") { ci->botflags.SetFlag(BS_FANTASY); - notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_ON, ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_FANTASY); - notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX); @@ -106,10 +106,10 @@ class CommandBSSet : public Command } else if (option == "GREET") { if (value == "ON") { ci->botflags.SetFlag(BS_GREET); - notice_lang(Config.s_BotServ, u, BOT_SET_GREET_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_GREET_ON, ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_GREET); - notice_lang(Config.s_BotServ, u, BOT_SET_GREET_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_GREET_OFF, ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX); @@ -119,10 +119,10 @@ class CommandBSSet : public Command ci->botflags.SetFlag(BS_NOBOT); if (ci->bi) ci->bi->UnAssign(u, ci); - notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_ON, ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_NOBOT); - notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX); @@ -130,10 +130,10 @@ class CommandBSSet : public Command } else if (option == "SYMBIOSIS") { if (value == "ON") { ci->botflags.SetFlag(BS_SYMBIOSIS); - notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_SYMBIOSIS); - notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX); diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c index fcd2ee8f1..1d421fc5d 100644 --- a/src/core/bs_unassign.c +++ b/src/core/bs_unassign.c @@ -39,7 +39,7 @@ class CommandBSUnassign : public Command else { ci->bi->UnAssign(u, ci); - notice_lang(Config.s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name); + notice_lang(Config.s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name.c_str()); } return MOD_CONT; } diff --git a/src/core/cs_access.c b/src/core/cs_access.c index 5f875b1c9..1b9db83b9 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -57,7 +57,7 @@ static int access_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!*sent_header) { - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); *sent_header = 1; } @@ -92,7 +92,7 @@ static int access_view(User *u, int index, ChannelInfo *ci, int *sent_header) if (!*sent_header) { - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); *sent_header = 1; } @@ -227,7 +227,7 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nick, level)); - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, nc->display, chan, level); return MOD_CONT; } @@ -243,8 +243,8 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level)); - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name); - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name, level); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name.c_str(), level); } else if (cmd == "DEL") { @@ -273,18 +273,18 @@ class CommandCSAccess : public Command else if (count == 1) { last = atoi(nick); - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY, last, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY, last, ci->name.c_str()); } else - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); } else { - alog("%s: %s!%s@%s (level %d) deleted access of user%s %s on %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), deleted == 1 ? "" : "s", nick, chan); + alog("%s: %s!%s@%s (level %d) deleted access of user%s %s on %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, get_access(u, ci), deleted == 1 ? "" : "s", nick, chan); if (deleted == 1) - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name.c_str()); else - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL, deleted, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL, deleted, ci->name.c_str()); } } else @@ -309,8 +309,8 @@ class CommandCSAccess : public Command } else { - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display, ci->name); - alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), na-&g |
