summaryrefslogtreecommitdiff
path: root/lib/async_req
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-03-17 09:38:14 +0100
committerKarolin Seeger <kseeger@samba.org>2009-04-15 09:06:54 +0200
commit1303cdbcb92e4d8625881bbb4973ca8f00ef3ff2 (patch)
tree8bf6bd3381e71865039c47895014f5ecc68d84b5 /lib/async_req
parent668d40899b24cef8ecbf34f5fb63af29fdc43901 (diff)
downloadsamba-1303cdbcb92e4d8625881bbb4973ca8f00ef3ff2.tar.gz
Remove some transitional code in writev_send
(cherry picked from commit fc0dfba28f3c6e22b1d4bb19577e735c3db16f1e)
Diffstat (limited to 'lib/async_req')
-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;