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 2079b75..6ce58d8
--- a/blinklist.pas
+++ b/blinklist.pas
@@ -1,21 +1,9 @@
-(*\r
- *  beware IRC services, blinklist.pas\r
- *  Copyright (C) 2002 Bas Steendijk\r
- *\r
- *  This program is free software; you can redistribute it and/or modify\r
- *  it under the terms of the GNU General Public License as published by\r
- *  the Free Software Foundation; either version 2 of the License, or\r
- *  (at your option) any later version.\r
- *\r
- *  This program is distributed in the hope that it will be useful,\r
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- *  GNU General Public License for more details.\r
- *\r
- *  You should have received a copy of the GNU General Public License\r
- *  along with this program; if not, write to the Free Software\r
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- *)\r
+\r
+{ Copyright (C) 2005 Bas Steendijk\r
+  For conditions of distribution and use, see copyright notice in zlib_license.txt\r
+    which is included in the package\r
+      ----------------------------------------------------------------------------- }\r
+\r
 unit blinklist;\r
 {$ifdef fpc}\r
   {$mode delphi}\r
@@ -44,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
@@ -67,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
@@ -83,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
@@ -101,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