diff options
| author | Volker Lendecke <vl@samba.org> | 2008-08-28 15:44:14 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-08-28 18:22:49 +0200 |
| commit | f294f51bf0d136208fee1be343684ea890a499d0 (patch) | |
| tree | 2bb9001616d90f178f260ade4f3cdb1405181408 /source3/libsmb/clireadwrite.c | |
| parent | 228a12681bc7e6eb5bddb75b3b97a74c5eef1c3a (diff) | |
| download | samba-f294f51bf0d136208fee1be343684ea890a499d0.tar.gz samba-f294f51bf0d136208fee1be343684ea890a499d0.tar.bz2 samba-f294f51bf0d136208fee1be343684ea890a499d0.zip | |
Remove cli_request_get()
req->private_data==NULL at this point is definitely a bug.
(This used to be commit ce3dc9f616cafc1289a94ac7cae0beca967d836e)
Diffstat (limited to 'source3/libsmb/clireadwrite.c')
| -rw-r--r-- | source3/libsmb/clireadwrite.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index b64a4c68f3..ec63281630 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -83,7 +83,7 @@ struct async_req *cli_read_andx_send(TALLOC_CTX *mem_ctx, return NULL; } - req = cli_request_get(result); + req = talloc_get_type_abort(result->private_data, struct cli_request); req->data.read.ofs = offset; req->data.read.size = size; @@ -103,7 +103,8 @@ struct async_req *cli_read_andx_send(TALLOC_CTX *mem_ctx, NTSTATUS cli_read_andx_recv(struct async_req *req, ssize_t *received, uint8_t **rcvbuf) { - struct cli_request *cli_req = cli_request_get(req); + struct cli_request *cli_req = talloc_get_type_abort( + req->private_data, struct cli_request); uint8_t wct; uint16_t *vwv; uint16_t num_bytes; @@ -311,7 +312,8 @@ static void cli_pull_read_done(struct async_req *read_req) read_req->async.priv, struct async_req); struct cli_pull_state *state = talloc_get_type_abort( pull_req->private_data, struct cli_pull_state); - struct cli_request *read_state = cli_request_get(read_req); + struct cli_request *read_state = talloc_get_type_abort( + read_req->private_data, struct cli_request); NTSTATUS status; status = cli_read_andx_recv(read_req, &read_state->data.read.received, @@ -342,7 +344,9 @@ static void cli_pull_read_done(struct async_req *read_req) return; } - top_read = cli_request_get(state->reqs[state->top_req]); + top_read = talloc_get_type_abort( + state->reqs[state->top_req]->private_data, + struct cli_request); DEBUG(10, ("cli_pull_read_done: Pushing %d bytes, %d already " "pushed\n", (int)top_read->data.read.received, |