diff options
author | Jeremy Allison <jra@samba.org> | 2006-08-28 01:44:40 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:54 -0500 |
commit | 16c8f09a1f48af0ad2ddd6e5ea59abd50a792a0e (patch) | |
tree | d517da0b05d0704d7ddf24140adea550ec2c37e0 /source3/include | |
parent | cb3e14d5a2fe03439fcfa628b0e95dc2501bbd52 (diff) | |
download | samba-16c8f09a1f48af0ad2ddd6e5ea59abd50a792a0e.tar.gz samba-16c8f09a1f48af0ad2ddd6e5ea59abd50a792a0e.tar.bz2 samba-16c8f09a1f48af0ad2ddd6e5ea59abd50a792a0e.zip |
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)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/dlinklist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/dlinklist.h b/source3/include/dlinklist.h index c856aaa762..daec7640e4 100644 --- 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 */ |