r5104: - added support for task based servers. These are servers that within

  themselves are run as a single process, but run as a child of the
  main process when smbd is run in the standard model, and run as part
  of the main process when in the single mode.

- rewrote the winbind template code to use the new task services. Also
  fixed the packet queueing

- got rid of event_context_merge() as it is no longer needed
(This used to be commit 339964a596689278d2138cff05d7d444798a3504)

1 files changed, 0 insertions, 26 deletions

diff --git a/source4/lib/events.c b/source4/lib/events.c
index d32a1344e0..c09d9b5030 100644
--- a/source4/lib/events.c
+++ b/source4/lib/events.c
@@ -110,32 +110,6 @@ static void calc_maxfd(struct event_context *ev)
 	}
 }
 
-/*
-  move the event structures from ev2 into ev, upping the reference
-  count on ev. The event context ev2 is then destroyed.
-
-  this is used by modules that need to call on the events of a lower module
-*/
-struct event_context *event_context_merge(struct event_context *ev, 
-					  struct event_context *ev2)
-{
-	DLIST_CONCATENATE(ev->fd_events, ev2->fd_events, struct fd_event *);
-	DLIST_CONCATENATE(ev->timed_events, ev2->timed_events, struct timed_event *);
-	DLIST_CONCATENATE(ev->loop_events, ev2->loop_events, struct loop_event *);
-
-	ev2->fd_events = NULL;
-	ev2->timed_events = NULL;
-	ev2->loop_events = NULL;
-
-	talloc_steal(ev->events, ev2->events);
-
-	event_context_destroy(ev2);
-
-	calc_maxfd(ev);
-
-	return ev;
-}
-
 /* to mark the ev->maxfd invalid
  * this means we need to recalculate it
  */