[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3329-gaef7ad9

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  aef7ad9d2f65c5e2a3b9622b352cafd30be79663 (commit)
      from  7045272e5436e3a24d187945e405cb3cc407ce73 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit aef7ad9d2f65c5e2a3b9622b352cafd30be79663
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 5 18:06:20 2009 -0800

    Fix the build (event context init was different).
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/events.c |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/events.c b/source/lib/events.c
index 8c40d06..2dae56e 100644
--- a/source/lib/events.c
+++ b/source/lib/events.c
@@ -354,6 +354,19 @@ int event_loop_once(struct event_context *ev)
 	return 0;
 }
 
+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);
@@ -362,7 +375,15 @@ void event_context_reinit(struct event_context *ev)
 
 struct event_context *event_context_init(TALLOC_CTX *mem_ctx)
 {
-	return TALLOC_ZERO_P(NULL, struct event_context);
+	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;
 }
 
 int set_event_dispatch_time(struct event_context *event_ctx,


-- 
Samba Shared Repository