Simplify cdiscrim_match() max tests.

src/opserv.c (opserv_cdiscrim_create): Explicitly initialize max_users
    and max_ts.
  (cdiscrim_match): Simplify the bounds tests for timestamp and users.
git-archimport-id: srvx@srvx.net--2006/srvx--devo--1.3--patch-18

diff --git a/ChangeLog b/ChangeLog
index 84c217b1328bd544aff72b4972f7392da31a1de7..bfeb9059a3d221d88c89ced449d83c58f87f94b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,21 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2006/srvx--devo--1.3
 #
 
+2006-07-18 01:49:56 GMT        Michael Poole <mdpoole@troilus.org>     patch-18
+
+    Summary:
+      Simplify cdiscrim_match() max tests.
+    Revision:
+      srvx--devo--1.3--patch-18
+
+    src/opserv.c (opserv_cdiscrim_create): Explicitly initialize max_users
+        and max_ts.
+      (cdiscrim_match): Simplify the bounds tests for timestamp and users.
+
+    modified files:
+     ChangeLog src/opserv.c
+
+
 2006-07-18 01:46:10 GMT        Michael Poole <mdpoole@troilus.org>     patch-17
 
     Summary:

diff --git a/src/opserv.c b/src/opserv.c
index 2496b8d3129c618a5a633e66da6b4530d3258721..83c7f93e6e1f9b5556b6a0de276869d313a60f2f 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -3462,6 +3462,8 @@ opserv_cdiscrim_create(struct userNode *user, unsigned int argc, char *argv[])
 
     discrim = calloc(1, sizeof(*discrim));
     discrim->limit = 25;
+    discrim->max_users = ~0;
+    discrim->max_ts = (time_t)~0;
 
     for (i = 0; i < argc; i++) {
        /* Assume all criteria require arguments. */
@@ -3532,10 +3534,10 @@ cdiscrim_match(cdiscrim_t discrim, struct chanNode *chan)
 {
     if ((discrim->name && !match_ircglob(chan->name, discrim->name)) ||
         (discrim->topic && !match_ircglob(chan->topic, discrim->topic)) ||
-        (discrim->min_users && chan->members.used < discrim->min_users) ||
-        (discrim->max_users && chan->members.used > discrim->max_users) ||
-        (discrim->min_ts && chan->timestamp < discrim->min_ts) ||
-            (discrim->max_ts && chan->timestamp > discrim->max_ts)) {
+        (chan->members.used < discrim->min_users) ||
+        (chan->members.used > discrim->max_users) ||
+        (chan->timestamp < discrim->min_ts) ||
+        (chan->timestamp > discrim->max_ts)) {
        return 0;
     }
     return 1;