diff options
| author | Simo Sorce <idra@samba.org> | 2008-04-21 17:58:23 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-04-21 18:12:33 -0400 |
| commit | 4e83011f72ba3df387512755a17760b42a7bf2f2 (patch) | |
| tree | 8870bc1bf9181d3ed732db64324307fe533a07d6 /source4/client/cifsddio.c | |
| parent | 8a3e3391fb82c2ee8ef67dbded753d6fad564827 (diff) | |
| download | samba-4e83011f72ba3df387512755a17760b42a7bf2f2.tar.gz samba-4e83011f72ba3df387512755a17760b42a7bf2f2.tar.bz2 samba-4e83011f72ba3df387512755a17760b42a7bf2f2.zip | |
Remove more event_context_init() uses from function calls within deep down the code.
Make sure we pass around the event_context where we need it instead.
All test but a few python ones fail. Jelmer promised to fix them.
(This used to be commit 3045d391626fba169aa26be52174883e18d323e9)
Diffstat (limited to 'source4/client/cifsddio.c')
| -rw-r--r-- | source4/client/cifsddio.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/client/cifsddio.c b/source4/client/cifsddio.c index 7028e85078..4297c30012 100644 --- a/source4/client/cifsddio.c +++ b/source4/client/cifsddio.c @@ -221,6 +221,7 @@ static bool smb_write_func(void * handle, uint8_t * buf, uint64_t wanted, } static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ctx, + struct event_context *ev, const char * host, const char **ports, const char * share, @@ -233,8 +234,9 @@ static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ct * each connection, but for now, we just use the same one for both. */ ret = smbcli_full_connection(NULL, &cli, host, ports, share, - NULL /* devtype */, cmdline_credentials, resolve_ctx, - NULL /* events */, options); + NULL /* devtype */, + cmdline_credentials, resolve_ctx, + ev, options); if (!NT_STATUS_IS_OK(ret)) { fprintf(stderr, "%s: connecting to //%s/%s: %s\n", @@ -293,6 +295,7 @@ static int open_smb_file(struct smbcli_state * cli, } static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx, + struct event_context *ev, const char * host, const char **ports, const char * share, @@ -319,7 +322,7 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx smbh->h.io_write = smb_write_func; smbh->h.io_seek = smb_seek_func; - if ((smbh->cli = init_smb_session(resolve_ctx, host, ports, share, + if ((smbh->cli = init_smb_session(resolve_ctx, ev, host, ports, share, smb_options)) == NULL) { return(NULL); } @@ -336,6 +339,7 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx /* ------------------------------------------------------------------------- */ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx, + struct event_context *ev, const char * path, const char **ports, uint64_t io_size, @@ -355,7 +359,7 @@ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx, /* Skip over leading directory separators. */ while (*remain == '/' || *remain == '\\') { remain++; } - return(open_cifs_handle(resolve_ctx, host, ports, + return(open_cifs_handle(resolve_ctx, ev, host, ports, share, remain, io_size, options, smb_options)); } |