From 0ded22502384bd69c45fbc2ecd9d99172ff51910 Mon Sep 17 00:00:00 2001 From: "Naram Qashat cyberbotx@cyberbotx.com" Date: Thu, 2 Oct 2008 18:26:56 +0000 Subject: Replaced anope_SendMode() with direct call to SendMode() in IRCDProto class. Also added SendModeInternal() function to IRCDProto class, now SendMode() is a stub to handle varargs. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1329 5417fbe8-f217-4b02-8779-1006273d7864 --- src/core/cs_ban.c | 4 ++-- src/core/cs_clear.c | 26 +++++++++++++------------- src/core/cs_drop.c | 6 +++--- src/core/cs_modes.c | 12 ++++++------ src/core/cs_register.c | 8 ++++---- src/core/cs_topic.c | 2 +- src/core/os_clearmodes.c | 24 ++++++++++++------------ src/core/os_mode.c | 2 +- src/core/os_oline.c | 6 +++--- src/core/os_umode.c | 6 +++--- 10 files changed, 48 insertions(+), 48 deletions(-) (limited to 'src/core') diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index 570589ead..92f8b7733 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -118,7 +118,7 @@ int do_ban(User * u) av[0] = "+b"; get_idealban(ci, u, mask, sizeof(mask)); av[1] = mask; - anope_SendMode(whosends(ci), uc->chan->name, "+b %s", + ircdproto->SendMode(whosends(ci), uc->chan->name, "+b %s", av[1]); chan_set_modes(s_ChanServ, uc->chan, 2, av, 1); @@ -175,7 +175,7 @@ int do_ban(User * u) av[0] = "+b"; get_idealban(ci, u2, mask, sizeof(mask)); av[1] = mask; - anope_SendMode(whosends(ci), c->name, "+b %s", av[1]); + ircdproto->SendMode(whosends(ci), c->name, "+b %s", av[1]); chan_set_modes(s_ChanServ, c, 2, av, 1); /* We still allow host banning while not allowing to kick */ diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index f40b46f37..989c8ffce 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -91,7 +91,7 @@ int do_clear(User * u) next = ban->next; av[0] = "-b"; av[1] = ban->mask; - anope_SendMode(whosends(ci), chan, "-b %s", ban->mask); + ircdproto->SendMode(whosends(ci), chan, "-b %s", ban->mask); chan_set_modes(whosends(ci), c, 2, av, 0); } } @@ -106,7 +106,7 @@ int do_clear(User * u) next = except->next; av[0] = "-e"; av[1] = except->mask; - anope_SendMode(whosends(ci), chan, "-e %s", except->mask); + ircdproto->SendMode(whosends(ci), chan, "-e %s", except->mask); chan_set_modes(whosends(ci), c, 2, av, 0); } } @@ -121,7 +121,7 @@ int do_clear(User * u) next = invite->next; av[0] = "-I"; av[1] = invite->mask; - anope_SendMode(whosends(ci), chan, "-I %s", invite->mask); + ircdproto->SendMode(whosends(ci), chan, "-I %s", invite->mask); chan_set_modes(whosends(ci), c, 2, av, 0); } } @@ -132,7 +132,7 @@ int do_clear(User * u) if (c->mode) { /* Clear modes the bulk of the modes */ - anope_SendMode(whosends(ci), c->name, "%s", + ircdproto->SendMode(whosends(ci), c->name, "%s", ircd->modestoremove); argv[0] = ircd->modestoremove; chan_set_modes(whosends(ci), c, 1, argv, 0); @@ -140,13 +140,13 @@ int do_clear(User * u) /* to prevent the internals from complaining send -k, -L, -f by themselves if we need to send them - TSL */ if (c->key) { - anope_SendMode(whosends(ci), c->name, "-k %s", c->key); + ircdproto->SendMode(whosends(ci), c->name, "-k %s", c->key); argv[0] = "-k"; argv[1] = c->key; chan_set_modes(whosends(ci), c, 2, argv, 0); } if (ircd->Lmode && c->redirect) { - anope_SendMode(whosends(ci), c->name, "-L %s", + ircdproto->SendMode(whosends(ci), c->name, "-L %s", c->redirect); argv[0] = "-L"; argv[1] = c->redirect; @@ -154,7 +154,7 @@ int do_clear(User * u) } if (ircd->fmode && c->flood) { if (flood_mode_char_remove) { - anope_SendMode(whosends(ci), c->name, "%s %s", + ircdproto->SendMode(whosends(ci), c->name, "%s %s", flood_mode_char_remove, c->flood); argv[0] = flood_mode_char_remove; argv[1] = c->flood; @@ -242,7 +242,7 @@ int do_clear(User * u) av[i+3] = cu->user->nick; ac = 3 + i; - anope_SendMode(whosends(ci), av[0], "%s %s", av[2], tmp2); + ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[2], tmp2); } else { av[1] = tmp; /* We have to give as much nicks as modes.. - Viper */ @@ -250,7 +250,7 @@ int do_clear(User * u) av[i+2] = cu->user->nick; ac = 2 + i; - anope_SendMode(whosends(ci), av[0], "%s %s", av[1], tmp2); + ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1], tmp2); } do_cmode(s_ChanServ, ac, av); @@ -292,10 +292,10 @@ int do_clear(User * u) break; } else { if (ircdcap->tsmode) - anope_SendMode(whosends(ci), av[0], "%s %s", av[2], + ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[2], av[3]); else - anope_SendMode(whosends(ci), av[0], "%s %s", av[1], + ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1], av[2]); } do_cmode(s_ChanServ, ac, av); @@ -336,10 +336,10 @@ int do_clear(User * u) break; } else { if (ircdcap->tsmode) { - anope_SendMode(whosends(ci), av[0], "%s %s", av[2], + ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[2], av[3]); } else { - anope_SendMode(whosends(ci), av[0], "%s %s", av[1], + ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1], av[2]); } } diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index 61aad543a..6ec5ecb37 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -99,7 +99,7 @@ int do_drop(User * u) if (ci->c) { if (ircd->regmode) { ci->c->mode &= ~ircd->regmode; - anope_SendMode(whosends(ci), ci->name, "-r"); + ircdproto->SendMode(whosends(ci), ci->name, "-r"); } } diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index d41b4bcda..0597f2f4f 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -227,7 +227,7 @@ int do_owner(User * u) for (uc = u->chans; uc; uc = uc->next) { if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN) && is_founder(u, ci)) { - anope_SendMode(whosends(ci), uc->chan->name, "%s %s", + ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s", av[0], u->nick); chan_set_modes(s_ChanServ, uc->chan, 2, av, 1); } @@ -247,7 +247,7 @@ int do_owner(User * u) } else if (!is_founder(u, ci)) { notice_lang(s_ChanServ, u, ACCESS_DENIED); } else { - anope_SendMode(whosends(ci), c->name, "%s %s", ircd->ownerset, + ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerset, u->nick); av[0] = ircd->ownerset; @@ -281,7 +281,7 @@ int do_deowner(User * u) for (uc = u->chans; uc; uc = uc->next) { if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN) && is_founder(u, ci)) { - anope_SendMode(whosends(ci), uc->chan->name, "%s %s", + ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s", av[0], u->nick); chan_set_modes(s_ChanServ, uc->chan, 2, av, 1); } @@ -301,7 +301,7 @@ int do_deowner(User * u) } else if (!is_founder(u, ci)) { notice_lang(s_ChanServ, u, ACCESS_DENIED); } else { - anope_SendMode(whosends(ci), c->name, "%s %s", ircd->ownerunset, + ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerunset, u->nick); av[0] = ircd->ownerunset; @@ -336,7 +336,7 @@ int do_util(User * u, CSModeUtil * util) for (uc = u->chans; uc; uc = uc->next) { if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN) && check_access(u, ci, util->levelself)) { - anope_SendMode(whosends(ci), uc->chan->name, "%s %s", + ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s", util->mode, u->nick); chan_set_modes(s_ChanServ, uc->chan, 2, av, 2); @@ -373,7 +373,7 @@ int do_util(User * u, CSModeUtil * util) } else if (*util->mode == '-' && is_protected(u2) && !is_same) { notice_lang(s_ChanServ, u, PERMISSION_DENIED); } else { - anope_SendMode(whosends(ci), c->name, "%s %s", util->mode, + ircdproto->SendMode(whosends(ci), c->name, "%s %s", util->mode, u2->nick); av[0] = util->mode; diff --git a/src/core/cs_register.c b/src/core/cs_register.c index 54aa113b6..38b54c709 100644 --- a/src/core/cs_register.c +++ b/src/core/cs_register.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -179,11 +179,11 @@ int do_register(User * u) check_modes(c); /* On most ircds you do not receive the admin/owner mode till its registered */ if (ircd->admin) { - anope_SendMode(s_ChanServ, chan, "%s %s", ircd->adminset, + ircdproto->SendMode(s_ChanServ, chan, "%s %s", ircd->adminset, u->nick); } if (ircd->owner && ircd->ownerset) { - anope_SendMode(s_ChanServ, chan, "%s %s", ircd->ownerset, + ircdproto->SendMode(s_ChanServ, chan, "%s %s", ircd->ownerset, u->nick); } send_event(EVENT_CHAN_REGISTERED, 1, chan); diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index 7d3ae40c1..c352f52d9 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -104,7 +104,7 @@ int do_cs_topic(User * u) if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { anope_SendJoin(s_ChanServ, c->name, c->creation_time); - anope_SendMode(NULL, c->name, "+o %s", s_ChanServ); + ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ); } } ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic ? topic : "", diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c index 46adf090a..23c4a2993 100644 --- a/src/core/os_clearmodes.c +++ b/src/core/os_clearmodes.c @@ -122,7 +122,7 @@ int do_clearmodes(User * u) continue; argv[0] = "-o"; argv[1] = cu->user->nick; - anope_SendMode(s_OperServ, c->name, "-o %s", + ircdproto->SendMode(s_OperServ, c->name, "-o %s", cu->user->nick); chan_set_modes(s_OperServ, c, 2, argv, 0); } @@ -147,7 +147,7 @@ int do_clearmodes(User * u) continue; argv[0] = "-v"; argv[1] = cu->user->nick; - anope_SendMode(s_OperServ, c->name, "-v %s", + ircdproto->SendMode(s_OperServ, c->name, "-v %s", cu->user->nick); chan_set_modes(s_OperServ, c, 2, argv, 0); } @@ -172,7 +172,7 @@ int do_clearmodes(User * u) continue; argv[0] = "-h"; argv[1] = cu->user->nick; - anope_SendMode(s_OperServ, c->name, "-h %s", + ircdproto->SendMode(s_OperServ, c->name, "-h %s", cu->user->nick); chan_set_modes(s_OperServ, c, 2, argv, 0); } @@ -196,7 +196,7 @@ int do_clearmodes(User * u) continue; argv[0] = ircd->ownerunset; argv[1] = cu->user->nick; - anope_SendMode(s_OperServ, c->name, "%s %s", + ircdproto->SendMode(s_OperServ, c->name, "%s %s", ircd->ownerunset, cu->user->nick); chan_set_modes(s_OperServ, c, 2, argv, 0); } @@ -221,7 +221,7 @@ int do_clearmodes(User * u) continue; argv[0] = ircd->adminunset; argv[1] = cu->user->nick; - anope_SendMode(s_OperServ, c->name, "%s %s", + ircdproto->SendMode(s_OperServ, c->name, "%s %s", ircd->adminunset, cu->user->nick); chan_set_modes(s_OperServ, c, 2, argv, 0); } @@ -232,27 +232,27 @@ int do_clearmodes(User * u) if (c->mode) { /* Clear modes the bulk of the modes */ - anope_SendMode(s_OperServ, c->name, "%s", ircd->modestoremove); + ircdproto->SendMode(s_OperServ, c->name, "%s", ircd->modestoremove); argv[0] = ircd->modestoremove; chan_set_modes(s_OperServ, c, 1, argv, 0); /* to prevent the internals from complaining send -k, -L, -f by themselves if we need to send them - TSL */ if (c->key) { - anope_SendMode(s_OperServ, c->name, "-k %s", c->key); + ircdproto->SendMode(s_OperServ, c->name, "-k %s", c->key); argv[0] = "-k"; argv[1] = c->key; chan_set_modes(s_OperServ, c, 2, argv, 0); } if (ircd->Lmode && c->redirect) { - anope_SendMode(s_OperServ, c->name, "-L %s", c->redirect); + ircdproto->SendMode(s_OperServ, c->name, "-L %s", c->redirect); argv[0] = "-L"; argv[1] = c->redirect; chan_set_modes(s_OperServ, c, 2, argv, 0); } if (ircd->fmode && c->flood) { if (flood_mode_char_remove) { - anope_SendMode(s_OperServ, c->name, "%s %s", + ircdproto->SendMode(s_OperServ, c->name, "%s %s", flood_mode_char_remove, c->flood); argv[0] = flood_mode_char_remove; argv[1] = c->flood; @@ -271,7 +271,7 @@ int do_clearmodes(User * u) nexte = entry->next; argv[0] = "-b"; argv[1] = entry->mask; - anope_SendMode(s_OperServ, c->name, "-b %s", entry->mask); + ircdproto->SendMode(s_OperServ, c->name, "-b %s", entry->mask); chan_set_modes(s_OperServ, c, 2, argv, 0); } } @@ -282,7 +282,7 @@ int do_clearmodes(User * u) nexte = entry->next; argv[0] = "-e"; argv[1] = entry->mask; - anope_SendMode(s_OperServ, c->name, "-e %s", entry->mask); + ircdproto->SendMode(s_OperServ, c->name, "-e %s", entry->mask); chan_set_modes(s_OperServ, c, 2, argv, 0); } } @@ -293,7 +293,7 @@ int do_clearmodes(User * u) nexte = entry->next; argv[0] = "-I"; argv[1] = entry->mask; - anope_SendMode(s_OperServ, c->name, "-I %s", entry->mask); + ircdproto->SendMode(s_OperServ, c->name, "-I %s", entry->mask); chan_set_modes(s_OperServ, c, 2, argv, 0); } } diff --git a/src/core/os_mode.c b/src/core/os_mode.c index 7925679d7..43cd96f9f 100644 --- a/src/core/os_mode.c +++ b/src/core/os_mode.c @@ -88,7 +88,7 @@ int do_os_mode(User * u) notice_lang(s_OperServ, u, PERMISSION_DENIED); return MOD_CONT; } else { - anope_SendMode(s_OperServ, chan, "%s", modes); + ircdproto->SendMode(s_OperServ, chan, "%s", modes); ac = split_buf(modes, &av, 1); chan_set_modes(s_OperServ, c, ac, av, -1); diff --git a/src/core/os_oline.c b/src/core/os_oline.c index 7b3d2fbc5..9ae96a39c 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -90,7 +90,7 @@ int do_operoline(User * u) notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick); } else if (u2 && flags[0] == '+') { anope_SendSVSO(s_OperServ, nick, flags); - anope_SendMode(s_OperServ, nick, "+o"); + ircdproto->SendMode(s_OperServ, nick, "+o"); common_svsmode(u2, "+o", NULL); notice_lang(s_OperServ, u2, OPER_OLINE_IRCOP); notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick); diff --git a/src/core/os_umode.c b/src/core/os_umode.c index d09627fc2..bc33e07d7 100644 --- a/src/core/os_umode.c +++ b/src/core/os_umode.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -101,7 +101,7 @@ int do_operumodes(User * u) if (!(u2 = finduser(nick))) { notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick); } else { - anope_SendMode(s_OperServ, nick, "%s", modes); + ircdproto->SendMode(s_OperServ, nick, "%s", modes); common_svsmode(u2, modes, NULL); -- cgit