summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/modules/paged_results.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-13 00:10:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:29 -0500
commit7f63cebd331793d059b1dbfd2f7d7ce38105c4fe (patch)
treeb23bdbb55ec7f8b4598bd3da0022a25873e49afe /source4/lib/ldb/modules/paged_results.c
parent1a5978445199a1d8697a5604761899aa065059fe (diff)
downloadsamba-7f63cebd331793d059b1dbfd2f7d7ce38105c4fe.tar.gz
samba-7f63cebd331793d059b1dbfd2f7d7ce38105c4fe.tar.bz2
samba-7f63cebd331793d059b1dbfd2f7d7ce38105c4fe.zip
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)
Diffstat (limited to 'source4/lib/ldb/modules/paged_results.c')
-rw-r--r--source4/lib/ldb/modules/paged_results.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index 52d26502ee..43c3fc0246 100644
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -190,10 +190,7 @@ static int paged_search_callback(struct ldb_context *ldb, void *context, struct
ac->store->num_entries++;
- ac->store->last->r = talloc_steal(ac->store->last, ares);
- if (ac->store->last->r == NULL) {
- goto error;
- }
+ ac->store->last->r = talloc_move(ac->store->last, ares);
ac->store->last->next = NULL;
}
@@ -208,19 +205,13 @@ static int paged_search_callback(struct ldb_context *ldb, void *context, struct
goto error;
}
- ac->store->last_ref->r = talloc_steal(ac->store->last, ares);
- if (ac->store->last_ref->r == NULL) {
- goto error;
- }
+ ac->store->last_ref->r = talloc_move(ac->store->last, ares);
ac->store->last_ref->next = NULL;
}
if (ares->type == LDB_REPLY_DONE) {
if (ares->controls) {
- ac->store->controls = talloc_steal(ac->store, ares->controls);
- if (! ac->store->controls) {
- goto error;
- }
+ ac->store->controls = talloc_move(ac->store, ares->controls);
}
talloc_free(ares);
}
@@ -394,7 +385,7 @@ static int paged_results(struct ldb_handle *handle)
ares->controls = ac->store->controls;
while (ares->controls[i]) i++; /* counting */
- ares->controls = talloc_steal(ares, ac->store->controls);
+ ares->controls = talloc_move(ares, ac->store->controls);
num_ctrls += i;
}