diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-18 17:27:41 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-18 17:27:41 +0100 |
| commit | 6ffe233f9442792a0e8e52167a01b76eabd83be9 (patch) | |
| tree | 37a461845d9395c2290bbde73c3c7f95a7d3a37f /source3/lib/async_sock.c | |
| parent | bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b (diff) | |
| parent | 0dbd3968626445b4dcb00307e45206b37dd0e8ad (diff) | |
| download | samba-6ffe233f9442792a0e8e52167a01b76eabd83be9.tar.gz samba-6ffe233f9442792a0e8e52167a01b76eabd83be9.tar.bz2 samba-6ffe233f9442792a0e8e52167a01b76eabd83be9.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/lib/async_sock.c')
| -rw-r--r-- | source3/lib/async_sock.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/source3/lib/async_sock.c b/source3/lib/async_sock.c index bb89a1353a..73ff6f2870 100644 --- a/source3/lib/async_sock.c +++ b/source3/lib/async_sock.c @@ -106,17 +106,10 @@ static struct async_req *async_syscall_new(TALLOC_CTX *mem_ctx, struct async_req *result; struct async_syscall_state *state; - result = async_req_new(mem_ctx); - if (result == NULL) { - return NULL; - } - - state = talloc(result, struct async_syscall_state); - if (state == NULL) { - TALLOC_FREE(result); + if (!async_req_setup(mem_ctx, &result, &state, + struct async_syscall_state)) { return NULL; } - state->syscall_type = type; result->private_data = state; @@ -569,15 +562,10 @@ struct async_req *async_connect_send(TALLOC_CTX *mem_ctx, struct fd_event *fde; NTSTATUS status; - result = async_req_new(mem_ctx); - if (result == NULL) { + if (!async_req_setup(mem_ctx, &result, &state, + struct async_connect_state)) { return NULL; } - state = talloc(result, struct async_connect_state); - if (state == NULL) { - goto fail; - } - result->private_data = state; /** * We have to set the socket to nonblocking for async connect(2). Keep |