svn commit: samba r17861 - in branches: SAMBA_3_0/source/include SAMBA_3_0_23/source/include

jra at samba.org jra at samba.org
Mon Aug 28 01:44:42 GMT 2006


Author: jra
Date: 2006-08-28 01:44:40 +0000 (Mon, 28 Aug 2006)
New Revision: 17861

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17861

Log:
Fix inconsistency found in checking for NULL in DLIST_REMOVE
macro. Don't check for NULL if we would have already derefed.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/include/dlinklist.h
   branches/SAMBA_3_0_23/source/include/dlinklist.h


Changeset:
Modified: branches/SAMBA_3_0/source/include/dlinklist.h
===================================================================
--- branches/SAMBA_3_0/source/include/dlinklist.h	2006-08-27 23:39:09 UTC (rev 17860)
+++ branches/SAMBA_3_0/source/include/dlinklist.h	2006-08-28 01:44:40 UTC (rev 17861)
@@ -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 */

Modified: branches/SAMBA_3_0_23/source/include/dlinklist.h
===================================================================
--- branches/SAMBA_3_0_23/source/include/dlinklist.h	2006-08-27 23:39:09 UTC (rev 17860)
+++ branches/SAMBA_3_0_23/source/include/dlinklist.h	2006-08-28 01:44:40 UTC (rev 17861)
@@ -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 */



More information about the samba-cvs mailing list