From 05cdd9ccafeeb384792b9ce7ca044bcec1bfc839 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 13 Sep 2006 02:33:51 +0000 Subject: 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) --- source4/lib/ldb/ldb_tdb/ldb_index.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/lib/ldb/ldb_tdb/ldb_index.c') diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c index f2816ec1da..59c1645ba8 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_index.c +++ b/source4/lib/ldb/ldb_tdb/ldb_index.c @@ -378,7 +378,7 @@ static int list_intersect(struct ldb_context *ldb, for (i=0;icount;i++) { if (ldb_list_find(list->dn[i], list2->dn, list2->count, sizeof(char *), (comparison_fn_t)strcmp) != -1) { - list3->dn[list3->count] = talloc_move(list3->dn, list->dn[i]); + list3->dn[list3->count] = talloc_move(list3->dn, &list->dn[i]); list3->count++; } else { talloc_free(list->dn[i]); @@ -386,7 +386,7 @@ static int list_intersect(struct ldb_context *ldb, } talloc_free(list->dn); - list->dn = talloc_move(list, list3->dn); + list->dn = talloc_move(list, &list3->dn); list->count = list3->count; talloc_free(list3); @@ -486,7 +486,7 @@ static int ltdb_index_dn_or(struct ldb_module *module, if (ret == -1) { ret = 1; - list->dn = talloc_move(list, list2->dn); + list->dn = talloc_move(list, &list2->dn); list->count = list2->count; } else { if (list_union(ldb, list, list2) == -1) { @@ -567,7 +567,7 @@ static int ltdb_index_dn_and(struct ldb_module *module, if (ret == -1) { ret = 1; talloc_free(list->dn); - list->dn = talloc_move(list, list2->dn); + list->dn = talloc_move(list, &list2->dn); list->count = list2->count; } else { if (list_intersect(ldb, list, list2) == -1) { -- cgit