From 213ee18ce43747bf0fccd8709f8bbdab01611745 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Tue, 30 Oct 2007 01:14:50 +0000 Subject: [PATCH] Clean up sendwallto_group_butone() macro usage. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1835 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 6 ++++++ ircd/send.c | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 303bead..dd54d35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-20 Michael Poole + + * ircd/send.c (sendwallto_group_butone): Move a feature_bool() + call out of a loop. Convert HasFlag() uses to appropriate macros + from client.h. + 2007-08-20 Michael Poole * ircd/ircd_string.c (ircd_aton_ip4): Allow a sequence of *.* at diff --git a/ircd/send.c b/ircd/send.c index 728edaa..b443e30 100644 --- a/ircd/send.c +++ b/ircd/send.c @@ -669,6 +669,7 @@ void sendwallto_group_butone(struct Client *from, int type, struct Client *one, struct DLink *lp; char *prefix=NULL; char *tok=NULL; + int his_wallops; int i; vd.vd_format = pattern; @@ -695,15 +696,15 @@ void sendwallto_group_butone(struct Client *from, int type, struct Client *one, va_end(vd.vd_args); /* send buffer along! */ + his_wallops = feature_bool(FEAT_HIS_WALLOPS); for (i = 0; i <= HighestFd; i++) { if (!(cptr = LocalClientArray[i]) || (cli_fd(cli_from(cptr)) < 0) || - (type == WALL_DESYNCH && !HasFlag(cptr, FLAG_DEBUG)) || + (type == WALL_DESYNCH && !SendDebug(cptr)) || (type == WALL_WALLOPS && - (!HasFlag(cptr, FLAG_WALLOP) || (feature_bool(FEAT_HIS_WALLOPS) && - !IsAnOper(cptr)))) || - (type == WALL_WALLUSERS && !HasFlag(cptr, FLAG_WALLOP))) + (!SendWallops(cptr) || (his_wallops && !IsAnOper(cptr)))) || + (type == WALL_WALLUSERS && !SendWallops(cptr))) continue; /* skip it */ send_buffer(cptr, mb, 1); } -- 2.20.1