Committer  : entrope
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2007-10-30 01:15:00 UTC

Modified files:
  Tag: u2_10_12_branch
     ircd/send.c ChangeLog

Log message:

Clean up sendwallto_group_butone() macro usage.

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.205 ircu2.10/ChangeLog:1.710.2.206
--- ircu2.10/ChangeLog:1.710.2.205      Mon Aug 20 19:02:10 2007
+++ ircu2.10/ChangeLog  Mon Oct 29 18:14:50 2007
@@ -1,5 +1,11 @@
 2007-08-20  Michael Poole <[EMAIL PROTECTED]>
 
+       * 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 <[EMAIL PROTECTED]>
+
        * ircd/ircd_string.c (ircd_aton_ip4): Allow a sequence of *.* at
        the end of an IPv4 mask.
        (ipmask_parse): Likewise for *:* at the end of IPv6 masks.
Index: ircu2.10/ircd/send.c
diff -u ircu2.10/ircd/send.c:1.55.2.1 ircu2.10/ircd/send.c:1.55.2.2
--- ircu2.10/ircd/send.c:1.55.2.1       Sat Feb  3 20:16:16 2007
+++ ircu2.10/ircd/send.c        Mon Oct 29 18:14:50 2007
@@ -19,7 +19,7 @@
  */
 /** @file
  * @brief Send messages to certain targets.
- * @version $Id: send.c,v 1.55.2.1 2007/02/04 04:16:16 entrope Exp $
+ * @version $Id: send.c,v 1.55.2.2 2007/10/30 01:14:50 entrope Exp $
  */
 #include "config.h"
 
@@ -669,6 +669,7 @@
   struct DLink *lp;
   char *prefix=NULL;
   char *tok=NULL;
+  int his_wallops;
   int i;
 
   vd.vd_format = pattern;
@@ -695,15 +696,15 @@
   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);
   }
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches

Reply via email to