Changeset 165 for branches/samba-3.0/source/lib/events.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/lib/events.c (modified) (3 diffs)

branches/samba-3.0/source/lib/events.c

@@ -65 +65 @@
         DEBUG(10, ("Destroying timed event %lx \"%s\"\n", (unsigned long)te,
                 te->event_name));
-        DLIST_REMOVE(te->event_ctx->timed_events, te);
+        if (te->event_ctx) {
+                DLIST_REMOVE(te->event_ctx->timed_events, te);
+        }
         return 0;
 }
@@ -135 +137 @@
         struct event_context *event_ctx = fde->event_ctx;
 
-        DLIST_REMOVE(event_ctx->fd_events, fde);
+        if (event_ctx) {
+                DLIST_REMOVE(event_ctx->fd_events, fde);
+        }
         return 0;
 }
@@ -298 +302 @@
 }
 
+static int event_context_destructor(struct event_context *ev)
+{
+        while (ev->fd_events != NULL) {
+                ev->fd_events->event_ctx = NULL;
+                DLIST_REMOVE(ev->fd_events, ev->fd_events);
+        }
+        while (ev->timed_events != NULL) {
+                ev->timed_events->event_ctx = NULL;
+                DLIST_REMOVE(ev->timed_events, ev->timed_events);
+        }
+        return 0;
+}
+
+void event_context_reinit(struct event_context *ev)
+{
+        event_context_destructor(ev);
+        return;
+}
+
 struct event_context *event_context_init(TALLOC_CTX *mem_ctx)
 {
-        return TALLOC_ZERO_P(NULL, struct event_context);
-}
-
-int set_event_dispatch_time(struct event_context *event_ctx,
-                            const char *event_name, struct timeval when)
-{
-        struct timed_event *te;
-
-        for (te = event_ctx->timed_events; te; te = te->next) {
-                if (strcmp(event_name, te->event_name) == 0) {
-                        DLIST_REMOVE(event_ctx->timed_events, te);
-                        te->when = when;
-                        add_event_by_time(te);
-                        return 1;
-                }
-        }
-        return 0;
-}
-
-/* Returns 1 if event was found and cancelled, 0 otherwise. */
-
-int cancel_named_event(struct event_context *event_ctx,
-                       const char *event_name)
-{
-        struct timed_event *te;
-
-        for (te = event_ctx->timed_events; te; te = te->next) {
-                if (strcmp(event_name, te->event_name) == 0) {
-                        TALLOC_FREE(te);
-                        return 1;
-                }
-        }
-        return 0;
-}
+        struct event_context *result;
+
+        result = TALLOC_ZERO_P(mem_ctx, struct event_context);
+        if (result == NULL) {
+                return NULL;
+        }
+
+        talloc_set_destructor(result, event_context_destructor);
+        return result;
+}