summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-03-17 10:17:50 +0100
committerKarolin Seeger <kseeger@samba.org>2009-04-15 09:07:13 +0200
commit107059499d592b169f5e827623dc2d2fb9d3d7ee (patch)
tree6e612f76ca0594ed68054627568ed6f39a273422 /lib
parented8777800c521835f766ba56f6f17f59a10133ac (diff)
downloadsamba-107059499d592b169f5e827623dc2d2fb9d3d7ee.tar.gz
tevent: use TALLOC_FREE() in tevent_req.c
metze (cherry picked from commit a78cd2a24b818bc7d843a8e56ffaafc9f6578662) (cherry picked from commit 54af7b9da45dcef881d9fee7c414d363ca6cdab4)
Diffstat (limited to 'lib')
-rw-r--r--lib/tevent/tevent_req.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
index 3832088b34c..3514f315142 100644
--- a/lib/tevent/tevent_req.c
+++ b/lib/tevent/tevent_req.c
@@ -265,14 +265,11 @@ bool tevent_req_is_in_progress(struct tevent_req *req)
*/
void tevent_req_received(struct tevent_req *req)
{
- talloc_free(req->data);
- req->data = NULL;
+ TALLOC_FREE(req->data);
req->private_print = NULL;
- talloc_free(req->internal.trigger);
- req->internal.trigger = NULL;
- talloc_free(req->internal.timer);
- req->internal.timer = NULL;
+ TALLOC_FREE(req->internal.trigger);
+ TALLOC_FREE(req->internal.timer);
req->internal.state = TEVENT_REQ_RECEIVED;
}
@@ -313,8 +310,7 @@ static void tevent_req_timedout(struct tevent_context *ev,
struct tevent_req *req = talloc_get_type(private_data,
struct tevent_req);
- talloc_free(req->internal.timer);
- req->internal.timer = NULL;
+ TALLOC_FREE(req->internal.timer);
tevent_req_finish(req, TEVENT_REQ_TIMED_OUT);
}
@@ -323,7 +319,7 @@ bool tevent_req_set_endtime(struct tevent_req *req,
struct tevent_context *ev,
struct timeval endtime)
{
- talloc_free(req->internal.timer);
+ TALLOC_FREE(req->internal.timer);
req->internal.timer = tevent_add_timer(ev, req, endtime,
tevent_req_timedout,