From 54fc99e04b3475a9cc04274fa365edbd700d3491 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 6 Feb 2010 12:38:47 +1100 Subject: s3-ldb: update the old ldb in s3 to use new DLIST macros (cherry picked from commit a7d8bfd373392eecf4fff33d39b85e1b55ad901d) --- source3/lib/ldb/modules/paged_results.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'source3/lib/ldb/modules') diff --git a/source3/lib/ldb/modules/paged_results.c b/source3/lib/ldb/modules/paged_results.c index 63f9ee6752..e16b710413 100644 --- a/source3/lib/ldb/modules/paged_results.c +++ b/source3/lib/ldb/modules/paged_results.c @@ -78,17 +78,7 @@ int store_destructor(struct results_store *store); int store_destructor(struct results_store *store) { - if (store->prev) { - store->prev->next = store->next; - } - if (store->next) { - store->next->prev = store->prev; - } - - if (store == store->priv->store) { - store->priv->store = NULL; - } - + DLIST_REMOVE(store->priv->store, store); return 0; } @@ -120,10 +110,7 @@ static struct results_store *new_store(struct private_data *priv) newr->controls = NULL; /* put this entry as first */ - newr->prev = NULL; - newr->next = priv->store; - if (priv->store != NULL) priv->store->prev = newr; - priv->store = newr; + DLIST_ADD(priv->store, newr); talloc_set_destructor(newr, store_destructor); -- cgit