diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/libcli/smb_composite/loadfile.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/libcli/smb_composite/loadfile.c')
| -rw-r--r-- | source4/libcli/smb_composite/loadfile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/libcli/smb_composite/loadfile.c b/source4/libcli/smb_composite/loadfile.c index 952f24b811..994c29c77d 100644 --- a/source4/libcli/smb_composite/loadfile.c +++ b/source4/libcli/smb_composite/loadfile.c @@ -61,7 +61,7 @@ static NTSTATUS setup_close(struct composite_context *c, /* call the handler again when the close is done */ state->req->async.fn = loadfile_handler; - state->req->async.private = c; + state->req->async.private_data = c; state->stage = LOADFILE_CLOSE; return NT_STATUS_OK; @@ -113,7 +113,7 @@ static NTSTATUS loadfile_open(struct composite_context *c, /* call the handler again when the first read is done */ state->req->async.fn = loadfile_handler; - state->req->async.private = c; + state->req->async.private_data = c; state->stage = LOADFILE_READ; talloc_free(state->io_open); @@ -152,7 +152,7 @@ static NTSTATUS loadfile_read(struct composite_context *c, /* call the handler again when the read is done */ state->req->async.fn = loadfile_handler; - state->req->async.private = c; + state->req->async.private_data = c; return NT_STATUS_OK; } @@ -180,7 +180,7 @@ static NTSTATUS loadfile_close(struct composite_context *c, */ static void loadfile_handler(struct smbcli_request *req) { - struct composite_context *c = (struct composite_context *)req->async.private; + struct composite_context *c = (struct composite_context *)req->async.private_data; struct loadfile_state *state = talloc_get_type(c->private_data, struct loadfile_state); /* when this handler is called, the stage indicates what @@ -250,7 +250,7 @@ struct composite_context *smb_composite_loadfile_send(struct smbcli_tree *tree, /* setup the callback handler */ state->req->async.fn = loadfile_handler; - state->req->async.private = c; + state->req->async.private_data = c; state->stage = LOADFILE_OPEN; return c; |