sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

s3-ldb: update the old ldb in s3 to use new DLIST macros

Browse Source 
(cherry picked from commit a7d8bfd373392eecf4fff33d39b85e1b55ad901d)
This commit is contained in:
Andrew Tridgell
2010-02-06 12:38:47 +11:00
committed by Jeremy Allison
parent ece7089918
commit 54fc99e04b
2 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
View File

@ -45,15 +45,7 @@ static struct ltdb_wrap *tdb_list;
static int ltdb_wrap_destructor(struct ltdb_wrap *w)
{
tdb_close(w->tdb);
if (w->next) {
w->next->prev = w->prev;
}
if (w->prev) {
w->prev->next = w->next;
}
if (w == tdb_list) {
tdb_list = w->next;
}
DLIST_REMOVE(tdb_list, w);
return 0;
}
@ -142,12 +134,7 @@ struct tdb_context *ltdb_wrap_open(TALLOC_CTX *mem_ctx,
talloc_set_destructor(w, ltdb_wrap_destructor);
w->next = tdb_list;
w->prev = NULL;
if (tdb_list) {
tdb_list->prev = w;
}
tdb_list = w;
DLIST_ADD(tdb_list, w);
return w->tdb;
}

17
source3/lib/ldb/modules/paged_results.c
View File

@ -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);