r17861: Fix inconsistency found in checking for NULL in DLIST_REMOVE

macro. Don't check for NULL if we would have already derefed.
Jeremy.
(This used to be commit 1cb379315a45a0c47feab0df1f07ec5d808a4259)

diff --git a/source3/include/dlinklist.h b/source3/include/dlinklist.h
index c856aaa7625794dc20d2305ec66e4099c502e2e9..daec7640e40e1c7abc8182e9ab772f5ce4390a69 100644 (file)
--- a/source3/include/dlinklist.h
+++ b/source3/include/dlinklist.h
@@ -46,7 +46,7 @@
                if ((p)->prev) (p)->prev->next = (p)->next; \
                if ((p)->next) (p)->next->prev = (p)->prev; \
        } \
-       if ((p) && ((p) != (list))) (p)->next = (p)->prev = NULL; \
+       if ((p) != (list)) (p)->next = (p)->prev = NULL; \
 }
 
 /* promote an element to the top of the list */