Merged with delphi 2010 branch

[lcore.git] / blinklist.pas

diff --git a/blinklist.pas b/blinklist.pas
old mode 100755 (executable)
new mode 100644 (file)
index 27232f4..6ce58d8
--- a/blinklist.pas
+++ b/blinklist.pas
@@ -32,11 +32,11 @@ type
   end;\r
 \r
   tstringlinklist=class(tlinklist)\r
-    s:string;\r
+    s:ansistring;\r
   end;\r
 \r
   tthing=class(tlinklist)\r
-    name:string;      {name/nick}\r
+    name:ansistring;      {name/nick}\r
     hashname:integer; {hash of name}\r
   end;\r
 \r
@@ -55,10 +55,13 @@ var
 \r
 implementation\r
 \r
+uses sysutils;\r
+\r
 procedure linklistadd(var baseptr:tlinklist;newptr:tlinklist);\r
 var\r
   p:tlinklist;\r
 begin\r
+  if (newptr=baseptr) or assigned(newptr.prev) then raise exception.create('linklist double insertion detected');\r
   p := baseptr;\r
   baseptr := newptr;\r
   baseptr.prev := nil;\r
@@ -71,12 +74,15 @@ begin
   if item = baseptr then baseptr := item.next;\r
   if item.prev <> nil then item.prev.next := item.next;\r
   if item.next <> nil then item.next.prev := item.prev;\r
+  item.prev := nil;\r
+  item.next := nil;\r
 end;\r
 \r
 procedure linklist2add(var baseptr,newptr:tlinklist2);\r
 var\r
   p:tlinklist2;\r
 begin\r
+  if (newptr=baseptr) or assigned(newptr.prev2) then raise exception.create('linklist2 double insertion detected');\r
   p := baseptr;\r
   baseptr := newptr;\r
   baseptr.prev2 := nil;\r
@@ -89,6 +95,8 @@ begin
   if item = baseptr then baseptr := item.next2;\r
   if item.prev2 <> nil then item.prev2.next2 := item.next2;\r
   if item.next2 <> nil then item.next2.prev2 := item.prev2;\r
+  item.prev2 := nil;\r
+  item.next2 := nil;\r
 end;\r
 \r
 constructor tlinklist.create;\r