summaryrefslogtreecommitdiff
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:31:22 +0100
commitb693f7f067d378858affe0b7ffa6ca8a6d2b82ee (patch)
tree4651f8333553c7cfbb398743541d8480304f72a6
parentbce98d8c031f9f093ec3adfcf6de9a61cdd3730e (diff)
downloadsamba-b693f7f067d378858affe0b7ffa6ca8a6d2b82ee.tar.gz
samba-b693f7f067d378858affe0b7ffa6ca8a6d2b82ee.tar.bz2
samba-b693f7f067d378858affe0b7ffa6ca8a6d2b82ee.zip
Remove some transitional code in writev_send
-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 be24bae6df..77df406044 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;