summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/ldb_sqlite3
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/ldb_sqlite3
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/ldb_sqlite3')
-rw-r--r--source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index dcac88a6b9..9d71b9e8e8 100644
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -865,11 +865,7 @@ static int lsql_search_sync_callback(struct ldb_context *ldb, void *context, str
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++;
} else {
ldb_debug(ldb, LDB_DEBUG_ERROR, "unrecognized async reply in ltdb_search_sync_callback!\n");