diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-09-13 10:15:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:43 -0500 |
| commit | 59b0902d0864101b9861d8ab59402b3088db7ff7 (patch) | |
| tree | 8f0a55a3f463c27b06036a772b690edc097dbd09 /source4 | |
| parent | d5b119e0bf141c96b1c4aa1e718f1e7d80d773ec (diff) | |
| download | samba-59b0902d0864101b9861d8ab59402b3088db7ff7.tar.gz samba-59b0902d0864101b9861d8ab59402b3088db7ff7.tar.bz2 samba-59b0902d0864101b9861d8ab59402b3088db7ff7.zip | |
r2319: let event_merge_contexts() return a pointer to the final context
metze
(This used to be commit 71aa5eeea73ea42e04ae224914b6815d72c1690a)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/events.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/cifs/vfs_cifs.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/events.c b/source4/lib/events.c index 06d956a014..298aa6a7b8 100644 --- a/source4/lib/events.c +++ b/source4/lib/events.c @@ -149,7 +149,7 @@ static void calc_maxfd(struct event_context *ev) 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 @@ void event_context_merge(struct event_context *ev, struct event_context *ev2) event_context_destroy(ev2); calc_maxfd(ev); + + return ev; } diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 078075a11f..c9073b04cf 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -163,10 +163,8 @@ static NTSTATUS cvfs_connect(struct smbsrv_request *req, const char *sharename) 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 = tcon->smb_conn->connection->event.ctx; + private->transport->event.ctx = event_context_merge(tcon->smb_conn->connection->event.ctx, + private->transport->event.ctx); return NT_STATUS_OK; } |