diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-23 12:17:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:08 -0500 |
| commit | 6c14b0133dede38294a812be7f5f5bd5ec3d498b (patch) | |
| tree | 6b60ad912d6ff06e1624580ba6e8cbeda3341d1b /source4/libcli/nbt | |
| parent | fd62df64188c0f992876c72fdda8a6da5dba3090 (diff) | |
| download | samba-6c14b0133dede38294a812be7f5f5bd5ec3d498b.tar.gz samba-6c14b0133dede38294a812be7f5f5bd5ec3d498b.tar.bz2 samba-6c14b0133dede38294a812be7f5f5bd5ec3d498b.zip | |
r4944: every event_add_*() caller was having to call talloc_steal() to take
control of the event, so instead build that into the function. If you
pass NULL as mem_ctx then it leaves it as a child of the events
structure.
(This used to be commit 7f981b9ed96f39027cbfd500f41e0c2be64cbb50)
Diffstat (limited to 'source4/libcli/nbt')
| -rw-r--r-- | source4/libcli/nbt/nbtsocket.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c index d970f8e4e0..1eea77d356 100644 --- a/source4/libcli/nbt/nbtsocket.c +++ b/source4/libcli/nbt/nbtsocket.c @@ -266,9 +266,7 @@ struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx, fde.flags = 0; fde.handler = nbt_name_socket_handler; fde.private = nbtsock; - nbtsock->fde = event_add_fd(nbtsock->event_ctx, &fde); - - talloc_steal(nbtsock, nbtsock->fde); + nbtsock->fde = event_add_fd(nbtsock->event_ctx, &fde, nbtsock); return nbtsock; @@ -344,8 +342,7 @@ struct nbt_name_request *nbt_name_request_send(struct nbt_name_socket *nbtsock, te.next_event = timeout; te.handler = nbt_name_socket_timeout; te.private = req; - req->te = event_add_timed(nbtsock->event_ctx, &te); - talloc_steal(req, req->te); + req->te = event_add_timed(nbtsock->event_ctx, &te, req); talloc_set_destructor(req, nbt_name_request_destructor); |