summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-03-17 09:38:14 +0100
committerVolker Lendecke <vl@samba.org>2009-03-17 17:32:27 +0100
commitfc0dfba28f3c6e22b1d4bb19577e735c3db16f1e (patch)
treef82cbb4c74046210101073e0e1aae5184acacf25 /lib
parent1f9bfa0673d47adcd62ceee5605788cc11201f3c (diff)
downloadsamba-fc0dfba28f3c6e22b1d4bb19577e735c3db16f1e.tar.gz
Remove some transitional code in writev_send
Diffstat (limited to 'lib')
-rw-r--r--lib/async_req/async_sock.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index be24bae6dfd..77df4060449 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -389,7 +389,6 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
{
struct tevent_req *result;
struct writev_state *state;
- struct tevent_fd *fde;
result = tevent_req_create(mem_ctx, &state, struct writev_state);
if (result == NULL) {
@@ -405,22 +404,7 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
goto fail;
}
- /*
- * This if () should go away once our callers are converted to always
- * pass in a queue.
- */
-
- if (queue != NULL) {
- if (!tevent_queue_add(queue, ev, result, writev_trigger,
- NULL)) {
- goto fail;
- }
- return result;
- }
-
- fde = tevent_add_fd(ev, state, fd, TEVENT_FD_WRITE, writev_handler,
- result);
- if (fde == NULL) {
+ if (!tevent_queue_add(queue, ev, result, writev_trigger, NULL)) {
goto fail;
}
return result;