svn commit: samba r2319 - in branches/SAMBA_4_0/source: lib ntvfs/cifs

[metze at samba.org]

Author: metze
Date: 2004-09-13 10:15:55 +0000 (Mon, 13 Sep 2004)
New Revision: 2319

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2319&nolog=1

Log:
let event_merge_contexts() return a pointer to the final context

metze

Modified:
   branches/SAMBA_4_0/source/lib/events.c
   branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/events.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events.c	2004-09-13 08:54:17 UTC (rev 2318)
+++ branches/SAMBA_4_0/source/lib/events.c	2004-09-13 10:15:55 UTC (rev 2319)
@@ -149,7 +149,7 @@
 
   this is used by modules that need to call on the events of a lower module
 */
-void event_context_merge(struct event_context *ev, struct event_context *ev2)
+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 *);
@@ -164,6 +164,8 @@
 	event_context_destroy(ev2);
 
 	calc_maxfd(ev);
+
+	return ev;
 }
 
 

Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2004-09-13 08:54:17 UTC (rev 2318)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2004-09-13 10:15:55 UTC (rev 2319)
@@ -163,11 +163,9 @@
 	private->transport->event.fde->handler = cifs_socket_handler;
 	private->transport->event.fde->private = private;
 
-	event_context_merge(tcon->smb_conn->connection->event.ctx,
-			    private->transport->event.ctx);
+	private->transport->event.ctx = event_context_merge(tcon->smb_conn->connection->event.ctx,
+			    					private->transport->event.ctx);
 
-	private->transport->event.ctx = tcon->smb_conn->connection->event.ctx;
-
 	return NT_STATUS_OK;
 }