diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-13 02:33:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:29 -0500 |
| commit | 05cdd9ccafeeb384792b9ce7ca044bcec1bfc839 (patch) | |
| tree | 5e34e06ecfa90d4248e4d511af80f67636c759ac /source4/lib/ldb/modules/sort.c | |
| parent | 24fe49a3d10633fa9be5547e89d10be1d5f9ccb1 (diff) | |
| download | samba-05cdd9ccafeeb384792b9ce7ca044bcec1bfc839.tar.gz samba-05cdd9ccafeeb384792b9ce7ca044bcec1bfc839.tar.bz2 samba-05cdd9ccafeeb384792b9ce7ca044bcec1bfc839.zip | |
r18439: 2nd try at a talloc_move() api. This type with the ** ptr interface
exposed.
Unfortunately this generates a large number of type punning
warnings. We'll have to find some magic to hide those.
(This used to be commit 254cbf09dee5a1e20c47e47a298f1a8d172b41b9)
Diffstat (limited to 'source4/lib/ldb/modules/sort.c')
| -rw-r--r-- | source4/lib/ldb/modules/sort.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c index acee40833b..3a0598c528 100644 --- a/source4/lib/ldb/modules/sort.c +++ b/source4/lib/ldb/modules/sort.c @@ -185,7 +185,7 @@ static int server_sort_search_callback(struct ldb_context *ldb, void *context, s ac->msgs[ac->num_msgs + 1] = NULL; - ac->msgs[ac->num_msgs] = talloc_move(ac->msgs, ares->message); + ac->msgs[ac->num_msgs] = talloc_move(ac->msgs, &ares->message); ac->num_msgs++; } @@ -196,13 +196,13 @@ static int server_sort_search_callback(struct ldb_context *ldb, void *context, s } ac->referrals[ac->num_refs + 1] = NULL; - ac->referrals[ac->num_refs] = talloc_move(ac->referrals, ares->referral); + ac->referrals[ac->num_refs] = talloc_move(ac->referrals, &ares->referral); ac->num_refs++; } if (ares->type == LDB_REPLY_DONE) { - ac->controls = talloc_move(ac, ares->controls); + ac->controls = talloc_move(ac, &ares->controls); } talloc_free(ares); @@ -330,7 +330,7 @@ static int server_sort_results(struct ldb_handle *handle) } ares->type = LDB_REPLY_ENTRY; - ares->message = talloc_move(ares, ac->msgs[i]); + ares->message = talloc_move(ares, &ac->msgs[i]); handle->status = ac->up_callback(ac->module->ldb, ac->up_context, ares); if (handle->status != LDB_SUCCESS) { @@ -346,7 +346,7 @@ static int server_sort_results(struct ldb_handle *handle) } ares->type = LDB_REPLY_REFERRAL; - ares->referral = talloc_move(ares, ac->referrals[i]); + ares->referral = talloc_move(ares, &ac->referrals[i]); handle->status = ac->up_callback(ac->module->ldb, ac->up_context, ares); if (handle->status != LDB_SUCCESS) { @@ -361,7 +361,7 @@ static int server_sort_results(struct ldb_handle *handle) } ares->type = LDB_REPLY_DONE; - ares->controls = talloc_move(ares, ac->controls); + ares->controls = talloc_move(ares, &ac->controls); handle->status = ac->up_callback(ac->module->ldb, ac->up_context, ares); if (handle->status != LDB_SUCCESS) { |