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 5c3391d..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
@@ -54,14 +54,14 @@ var
   linklistdebug:integer;\r
 \r
 implementation\r
-
-uses sysutils;
+\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');
+  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
@@ -73,8 +73,8 @@ procedure linklistdel(var baseptr:tlinklist;item:tlinklist);
 begin\r
   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;
-  item.prev := nil;
+  if item.next <> nil then item.next.prev := item.prev;\r
+  item.prev := nil;\r
   item.next := nil;\r
 end;\r
 \r
@@ -82,7 +82,7 @@ procedure linklist2add(var baseptr,newptr:tlinklist2);
 var\r
   p:tlinklist2;\r
 begin\r
-  if (newptr=baseptr) or assigned(newptr.prev2) then raise exception.create('linklist2 double insertion detected');
+  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
@@ -94,8 +94,8 @@ procedure linklist2del(var baseptr:tlinklist2;item:tlinklist2);
 begin\r
   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;
-  item.prev2 := nil;
+  if item.next2 <> nil then item.next2.prev2 := item.prev2;\r
+  item.prev2 := nil;\r
   item.next2 := nil;\r
 end;\r
 \r