diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-13 00:10:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:29 -0500 |
| commit | 7f63cebd331793d059b1dbfd2f7d7ce38105c4fe (patch) | |
| tree | b23bdbb55ec7f8b4598bd3da0022a25873e49afe /source4/lib/ldb/tools/ldbsearch.c | |
| parent | 1a5978445199a1d8697a5604761899aa065059fe (diff) | |
| download | samba-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/tools/ldbsearch.c')
| -rw-r--r-- | source4/lib/ldb/tools/ldbsearch.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c index e6b8a48a95..181d857efc 100644 --- a/source4/lib/ldb/tools/ldbsearch.c +++ b/source4/lib/ldb/tools/ldbsearch.c @@ -81,12 +81,7 @@ static int store_message(struct ldb_message *msg, struct search_context *sctx) { return -1; } - sctx->store[sctx->num_stored] = talloc_steal(sctx->store, msg); - if (!sctx->store[sctx->num_stored]) { - fprintf(stderr, "talloc_steal failed while storing messages\n"); - return -1; - } - + sctx->store[sctx->num_stored] = talloc_move(sctx->store, msg); sctx->num_stored++; sctx->store[sctx->num_stored] = NULL; @@ -101,12 +96,7 @@ static int store_referral(char *referral, struct search_context *sctx) { return -1; } - sctx->refs_store[sctx->refs] = talloc_steal(sctx->refs_store, referral); - if (!sctx->refs_store[sctx->refs]) { - fprintf(stderr, "talloc_steal failed while storing referrals\n"); - return -1; - } - + sctx->refs_store[sctx->refs] = talloc_move(sctx->refs_store, referral); sctx->refs++; sctx->refs_store[sctx->refs] = NULL; |