[asterisk-commits] trunk - r7509 in /trunk: ./ include/asterisk/linkedlists.h

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Fri Dec 16 19:07:44 2005
New Revision: 7509

URL: http://svn.digium.com/view/asterisk?rev=7509&view=rev
Log:
Merged revisions 7508 via svnmerge from
/branches/1.2

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/linkedlists.h

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec 16 19:07:44 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7470
+/branches/1.2:1-7470,7508

Modified: trunk/include/asterisk/linkedlists.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/linkedlists.h?rev=7509&r1=7508&r2=7509&view=diff
==============================================================================
--- trunk/include/asterisk/linkedlists.h (original)
+++ trunk/include/asterisk/linkedlists.h Fri Dec 16 19:07:44 2005
@@ -381,7 +381,8 @@
   used to link entries of this list together.
 
   Note: The link field in the appended entry is \b not modified, so if it is
-  actually the head of a list itself, the entire list will be appended.
+  actually the head of a list itself, the entire list will be appended
+  temporarily (until the next AST_LIST_INSERT_TAIL is performed).
  */
 #define AST_LIST_INSERT_TAIL(head, elm, field) do {			\
       if (!(head)->first) {						\
@@ -431,7 +432,7 @@
 		while (curelm->field.next != (elm))			\
 			curelm = curelm->field.next;			\
 		curelm->field.next = (elm)->field.next;			\
-		if ((head)->last == curelm->field.next)			\
+		if ((head)->last == (elm))				\
 			(head)->last = curelm;				\
 	}								\
 } while (0)