From: hno <>
Date: Sat, 2 Sep 2006 05:56:38 +0000 (+0000)
Subject: Resurrect the old API of eventDelete(func, NULL) deleting all events with that callback
X-Git-Tag: SQUID_3_0_PRE5~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa93f2105e76f91c1188d6e4e1440a91edfcd5a4;p=thirdparty%2Fsquid.git

Resurrect the old API of eventDelete(func, NULL) deleting all events with that callback

The eventApi defines eventDelete(func, NULL) as a wildcard delete. Mainly
used on shutdown etc.
---

diff --git a/src/event.cc b/src/event.cc
index d6fccd7694..dbcc890e17 100644
--- a/src/event.cc
+++ b/src/event.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: event.cc,v 1.43 2006/08/21 00:50:41 robertc Exp $
+ * $Id: event.cc,v 1.44 2006/09/01 23:56:38 hno Exp $
  *
  * DEBUG: section 41    Event Processing
  * AUTHOR: Henrik Nordstrom
@@ -163,7 +163,7 @@ EventScheduler::cancel(EVH * func, void *arg)
         if (event->func != func)
             continue;
 
-        if (event->arg != arg)
+        if (arg && event->arg != arg)
             continue;
 
         *E = event->next;
@@ -173,10 +173,12 @@ EventScheduler::cancel(EVH * func, void *arg)
 
         delete event;
 
-        return;
+	if (arg)
+	    return;
     }
 
-    debug_trap("eventDelete: event not found");
+    if (arg)
+	debug_trap("eventDelete: event not found");
 }
 
 int