From 7f63cebd331793d059b1dbfd2f7d7ce38105c4fe Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 13 Sep 2006 00:10:38 +0000 Subject: r18436: converted ldb to use talloc_move() instead of talloc_steal() when appropriate. Note that I also removed the error checks that were being done on the result of talloc_steal(). They are pointless as talloc_steal() doesn't have any failure modes that wouldn't cause a segv anyway, and they tend to clutter the code (This used to be commit c0d9e7d473b8e3eb2524a9fc29cf88680f994b36) --- source4/lib/ldb/common/ldb.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'source4/lib/ldb/common') diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 991a810135..50ec106d84 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -528,11 +528,7 @@ static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ld res->msgs[res->count + 1] = NULL; - res->msgs[res->count] = talloc_steal(res->msgs, ares->message); - if (! res->msgs[res->count]) { - goto error; - } - + res->msgs[res->count] = talloc_move(res->msgs, ares->message); res->count++; } @@ -548,15 +544,12 @@ static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ld goto error; } - res->refs[n] = talloc_steal(res->refs, ares->referral); + res->refs[n] = talloc_move(res->refs, ares->referral); res->refs[n + 1] = NULL; } if (ares->controls) { - res->controls = talloc_steal(res, ares->controls); - if (! res->controls) { - goto error; - } + res->controls = talloc_move(res, ares->controls); } talloc_free(ares); -- cgit