[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 73f46cf1a369c8b81b85c75f48daa4e08ecaf2fa
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 28 01:25:03 2002 +0000

    	* src/kwq/KWQListImpl.mm: (KWQListImpl::insert): Fix disastrous name
            collision which could lead to infinite loops.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@874 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f5937ed..4e15ee4 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-03-27  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQListImpl.mm: (KWQListImpl::insert): Fix disastrous name
+        collision which could lead to infinite loops.
+
+2002-03-27  Darin Adler  <darin at apple.com>
+
 	* src/kwq/KWQCString.mm: (QCString::isEmpty): The || should be &&.
 
 2002-03-27  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f5937ed..4e15ee4 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-03-27  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQListImpl.mm: (KWQListImpl::insert): Fix disastrous name
+        collision which could lead to infinite loops.
+
+2002-03-27  Darin Adler  <darin at apple.com>
+
 	* src/kwq/KWQCString.mm: (QCString::isEmpty): The || should be &&.
 
 2002-03-27  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f5937ed..4e15ee4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-03-27  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQListImpl.mm: (KWQListImpl::insert): Fix disastrous name
+        collision which could lead to infinite loops.
+
+2002-03-27  Darin Adler  <darin at apple.com>
+
 	* src/kwq/KWQCString.mm: (QCString::isEmpty): The || should be &&.
 
 2002-03-27  Darin Adler  <darin at apple.com>
diff --git a/WebCore/kwq/KWQListImpl.mm b/WebCore/kwq/KWQListImpl.mm
index 349cf9d..828a8d0 100644
--- a/WebCore/kwq/KWQListImpl.mm
+++ b/WebCore/kwq/KWQListImpl.mm
@@ -321,17 +321,17 @@ bool KWQListImpl::insert(uint n, const void *item)
 	
 	// iterate to one node before the insertion point, can't be null
 	// since we know n > 0 and n < d->count
-	KWQListNode *node = d->head;
+	KWQListNode *prevNode = d->head;
 
 	for (uint i = 0; i < n - 1; i++) {
-	    node = node->next;
+	    prevNode = prevNode->next;
 	}
-	node->prev = node;
-	node->next = node->next;
+	node->prev = prevNode;
+	node->next = prevNode->next;
 	if (node->next != NULL) {
 	    node->next->prev = node;
 	}
-	node->next = node;
+	prevNode->next = node;
     }
 
     d->count++;
diff --git a/WebCore/src/kwq/KWQListImpl.mm b/WebCore/src/kwq/KWQListImpl.mm
index 349cf9d..828a8d0 100644
--- a/WebCore/src/kwq/KWQListImpl.mm
+++ b/WebCore/src/kwq/KWQListImpl.mm
@@ -321,17 +321,17 @@ bool KWQListImpl::insert(uint n, const void *item)
 	
 	// iterate to one node before the insertion point, can't be null
 	// since we know n > 0 and n < d->count
-	KWQListNode *node = d->head;
+	KWQListNode *prevNode = d->head;
 
 	for (uint i = 0; i < n - 1; i++) {
-	    node = node->next;
+	    prevNode = prevNode->next;
 	}
-	node->prev = node;
-	node->next = node->next;
+	node->prev = prevNode;
+	node->next = prevNode->next;
 	if (node->next != NULL) {
 	    node->next->prev = node;
 	}
-	node->next = node;
+	prevNode->next = node;
     }
 
     d->count++;

-- 
WebKit Debian packaging