More string type fixes

git-svn-id: file:///svnroot/lcore/branches/delphi2010@70 b1de8a11-f9be-4011-bde0-cc7ace90066a

diff --git a/binipstuff.pas b/binipstuff.pas
index 675b03efeba7d488ad37825de0269da0f5b78a29..40b5f9fa35b996f9d45f2d0e0a58ac1c543ed52b 100644 (file)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -8,11 +8,9 @@ interface
 \r
 {$include lcoreconfig.inc}\r
 \r
-{$ifndef win32}\r
-{$ifdef ipv6}\r
-uses sockets;\r
-{$endif}\r
-{$endif}\r
+uses\r
+  {$ifndef win32}{$ifdef ipv6}sockets,{$endif}{$endif}\r
+  pgtypes;\r
 \r
 {$ifdef fpc}\r
   {$mode delphi}\r
@@ -23,7 +21,7 @@ uses sockets;
 {$include uint32.inc}\r
 \r
 const\r
-  hexchars:array[0..15] of char='0123456789abcdef';\r
+  hexchars:array[0..15] of ansichar='0123456789abcdef';\r
   AF_INET=2;\r
   {$ifdef win32}\r
     AF_INET6=23;\r
@@ -120,7 +118,7 @@ bin IP list code, by beware
 while this is really just a string, on the interface side it must be treated\r
 as an opaque var which is passed as "var" when it needs to be modified}\r
 \r
-  tbiniplist=string;\r
+  tbiniplist=tipstring;\r
 \r
 function biniplist_new:tbiniplist;\r
 procedure biniplist_add(var l:tbiniplist;ip:tbinip);\r
@@ -130,18 +128,18 @@ procedure biniplist_set(var l:tbiniplist;index:integer;ip:tbinip);
 procedure biniplist_setcount(var l:tbiniplist;newlen:integer);\r
 procedure biniplist_free(var l:tbiniplist);\r
 procedure biniplist_addlist(var l:tbiniplist;const l2:tbiniplist);\r
-function biniplist_tostr(const l:tbiniplist):string;\r
+function biniplist_tostr(const l:tbiniplist):tipstring;\r
 function isbiniplist(const l:tbiniplist):boolean;\r
 \r
 function htons(w:word):word;\r
 function htonl(i:uint32):uint32;\r
 \r
-function ipstrtobin(const s:string;var binip:tbinip):boolean;\r
-function ipstrtobinf(const s:string):tbinip;\r
-function ipbintostr(const binip:tbinip):string;\r
+function ipstrtobin(const s:tipstring;var binip:tbinip):boolean;\r
+function ipstrtobinf(const s:tipstring):tbinip;\r
+function ipbintostr(const binip:tbinip):tipstring;\r
 {$ifdef ipv6}\r
-function ip6bintostr(const bin:tin6_addr):string;\r
-function ip6strtobin(const s:string;var bin:tin6_addr):boolean;\r
+function ip6bintostr(const bin:tin6_addr):tipstring;\r
+function ip6strtobin(const s:tipstring;var bin:tin6_addr):boolean;\r
 {$endif}\r
 \r
 function comparebinip(const ip1,ip2:tbinip):boolean;\r
@@ -151,13 +149,13 @@ function comparebinipmask(ip1,ip2:tbinip;bits:integer):boolean;
 procedure addipsoffamily(var l:tbiniplist;const l2:tbiniplist;family:integer);\r
 \r
 {deprecated}\r
-function longip(s:string):longint;\r
+function longip(s:tipstring):longint;\r
 \r
 function needconverttov4(const ip:tbinip):boolean;\r
 procedure converttov4(var ip:tbinip);\r
 \r
 function inaddrvtobinip(inaddrv:tinetsockaddrv):tbinip;\r
-function makeinaddrv(addr:tbinip;port:string;var inaddr:tinetsockaddrv):integer;\r
+function makeinaddrv(addr:tbinip;port:ansistring;var inaddr:tinetsockaddrv):integer;\r
 function inaddrsize(inaddr:tinetsockaddrv):integer;\r
 \r
 implementation\r
@@ -192,7 +190,7 @@ begin
   {$endif}\r
 end;\r
 \r
-function makeinaddrv(addr:tbinip;port:string;var inaddr:tinetsockaddrv):integer;\r
+function makeinaddrv(addr:tbinip;port:ansistring;var inaddr:tinetsockaddrv):integer;\r
 begin\r
   result := 0;\r
 {  biniptemp := forwardlookup(addr,10);}\r
@@ -224,11 +222,11 @@ end;
 \r
 {internal}\r
 {converts dotted v4 IP to longint. returns host endian order}\r
-function longip(s:string):longint;\r
+function longip(s:tipstring):longint;\r
 var\r
   l:longint;\r
   a,b:integer;\r
-function convertbyte(const s:string):integer;\r
+function convertbyte(const s:ansistring):integer;\r
 begin\r
   result := strtointdef(s,-1);\r
   if result < 0 then begin\r
@@ -279,7 +277,7 @@ begin
   ipstrtobin(s,result);\r
 end;\r
 \r
-function ipstrtobin(const s:string;var binip:tbinip):boolean;\r
+function ipstrtobin(const s:tipstring;var binip:tbinip):boolean;\r
 begin\r
   binip.family := 0;\r
   result := false;\r
@@ -301,7 +299,7 @@ begin
   end;\r
 end;\r
 \r
-function ipbintostr(const binip:tbinip):string;\r
+function ipbintostr(const binip:tbinip):tipstring;\r
 var\r
   a:integer;\r
 begin\r
@@ -337,9 +335,9 @@ written by beware
 {fpc has hostaddrtostr6 and strtohostaddr6 but the later isnt implemented yet}\r
 \r
 \r
-function ip6bintostr(const bin:tin6_addr):string;\r
+function ip6bintostr(const bin:tin6_addr):tipstring;\r
 {base16 with lowercase output}\r
-function makehex(w:word):string;\r
+function makehex(w:word):ansistring;\r
 begin\r
   result := '';\r
   if w >= 4096 then result := result + hexchars[w shr 12];\r
@@ -395,10 +393,10 @@ begin
   end;\r
 end;\r
 \r
-function ip6strtobin(const s:string;var bin:tin6_addr):boolean;\r
+function ip6strtobin(const s:tipstring;var bin:tin6_addr):boolean;\r
 var\r
   a,b:integer;\r
-  fields:array[0..7] of string;\r
+  fields:array[0..7] of ansistring;\r
   fieldcount:integer;\r
   emptyfield:integer;\r
   wordcount:integer;\r
@@ -538,7 +536,7 @@ end;
 {-----------biniplist stuff--------------------------------------------------}\r
 \r
 const\r
-  biniplist_prefix='bipl'#0;\r
+  biniplist_prefix: ansistring = 'bipl'#0;\r
   //fpc 1.0.x doesn't seem to like use of length function in a constant \r
   //definition\r
   //biniplist_prefixlen=length(biniplist_prefix);\r
@@ -594,7 +592,7 @@ begin
   l := l + copy(l2,biniplist_prefixlen+1,maxlongint);\r
 end;\r
 \r
-function biniplist_tostr(const l:tbiniplist):string;\r
+function biniplist_tostr(const l:tbiniplist):tipstring;\r
 var\r
   a:integer;\r
 begin\r

diff --git a/blinklist.pas b/blinklist.pas
index 5ab153a58f0a5252a9b438f94ef49603cd20eb62..6ce58d8d6b7245214d3e33fd4924e24d3a434ed8 100644 (file)
--- 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

diff --git a/bsearchtree.pas b/bsearchtree.pas
index ad61751e498b6b291e982f55792c625468eb0467..d9e3ea26523f94a13b1c8819b38301725061e6de 100644 (file)
--- a/bsearchtree.pas
+++ b/bsearchtree.pas
@@ -17,24 +17,24 @@ const
 type\r
   thashitem=class(tlinklist)\r
     hash:integer;\r
-    s:string;\r
+    s:ansistring;\r
     p:pointer;\r
   end;\r
   thashtable=array[0..hashtable_size-1] of thashitem;\r
   phashtable=^thashtable;\r
 \r
 {adds "item" to the tree for name "s". the name must not exist (no checking done)}\r
-procedure addtree(t:phashtable;s:string;item:pointer);\r
+procedure addtree(t:phashtable;s:ansistring;item:pointer);\r
 \r
 {removes name "s" from the tree. the name must exist (no checking done)}\r
-procedure deltree(t:phashtable;s:string);\r
+procedure deltree(t:phashtable;s:ansistring);\r
 \r
 {returns the item pointer for s, or nil if not found}\r
-function findtree(t:phashtable;s:string):pointer;\r
+function findtree(t:phashtable;s:ansistring):pointer;\r
 \r
 implementation\r
 \r
-function makehash(s:string):integer;\r
+function makehash(s:ansistring):integer;\r
 const\r
   shifter=6;\r
 var\r
@@ -48,7 +48,7 @@ begin
   result := (result xor result shr 16) and (hashtable_size-1);\r
 end;\r
 \r
-procedure addtree(t:phashtable;s:string;item:pointer);\r
+procedure addtree(t:phashtable;s:ansistring;item:pointer);\r
 var\r
   hash:integer;\r
   p:thashitem;\r
@@ -61,7 +61,7 @@ begin
   linklistadd(tlinklist(t[hash]),tlinklist(p));\r
 end;\r
 \r
-procedure deltree(t:phashtable;s:string);\r
+procedure deltree(t:phashtable;s:ansistring);\r
 var\r
   p,p2:thashitem;\r
   hash:integer;\r
@@ -81,7 +81,7 @@ begin
 end;\r
 \r
 \r
-function findtree(t:phashtable;s:string):pointer;\r
+function findtree(t:phashtable;s:ansistring):pointer;\r
 var\r
   p:thashitem;\r
   hash:integer;\r

diff --git a/btime.pas b/btime.pas
index 9bb95502b13300569be20b37194f402ab646334b..de279dff7465919fea302d7dc1e707b66f818c70 100644 (file)
--- a/btime.pas
+++ b/btime.pas
@@ -20,7 +20,7 @@ const
 \r
 var\r
   timezone:integer;\r
-  timezonestr:string;\r
+  timezonestr:ansistring;\r
   irctime,unixtime:integer;\r
   tickcount:integer;\r
   settimebias:integer;\r
@@ -39,8 +39,8 @@ procedure gettimezone;
 procedure timehandler;\r
 procedure init;\r
 \r
-function timestring(i:integer):string;\r
-function timestrshort(i:integer):string;\r
+function timestring(i:integer):ansistring;\r
+function timestrshort(i:integer):ansistring;\r
 \r
 {$ifdef win32}\r
 function unixtimefloat_systemtime:float;\r
@@ -546,10 +546,10 @@ begin
   timezonestr := timezonestr + char(l div 600 mod 10+48)+char(l div 60 mod 10+48)+':'+char(l div 10 mod 6+48)+char(l mod 10+48);\r
 end;\r
 \r
-function timestrshort(i:integer):string;\r
+function timestrshort(i:integer):ansistring;\r
 const\r
-  weekday:array[0..6] of string[4]=('Thu','Fri','Sat','Sun','Mon','Tue','Wed');\r
-  month:array[0..11] of string[4]=('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');\r
+  weekday:array[0..6] of ansistring =('Thu','Fri','Sat','Sun','Mon','Tue','Wed');\r
+  month:array[0..11] of ansistring =('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');\r
 var\r
   y,m,d,h,min,sec,ms:word;\r
   t:tdatetime;\r
@@ -562,10 +562,10 @@ begin
   inttostr(y);\r
 end;\r
 \r
-function timestring(i:integer):string;\r
+function timestring(i:integer):ansistring;\r
 const\r
-  weekday:array[0..6] of string[10]=('Thursday','Friday','Saturday','Sunday','Monday','Tuesday','Wednesday');\r
-  month:array[0..11] of string[10]=('January','February','March','April','May','June','July','August','September','October','November','December');\r
+  weekday:array[0..6] of ansistring =('Thursday','Friday','Saturday','Sunday','Monday','Tuesday','Wednesday');\r
+  month:array[0..11] of ansistring =('January','February','March','April','May','June','July','August','September','October','November','December');\r
 var\r
   y,m,d,h,min,sec,ms:word;\r
   t:tdatetime;\r

diff --git a/fastmd5.pas b/fastmd5.pas
index 891d0fc03b74744b60b6803a7a940f4205e82afa..6455e5cff31b69b770fa3ad0f55552780224b0c6 100644 (file)
--- a/fastmd5.pas
+++ b/fastmd5.pas
@@ -55,13 +55,13 @@ procedure md5finish(var state:tmd5state;var result);
 \r
 procedure getmd5(const data;len:longint;var result);\r
 \r
-function md5tostr(const md5:tmd5):string;\r
+function md5tostr(const md5:tmd5):ansistring;\r
 \r
 implementation\r
 \r
-function inttohex(val,bits:integer):string;\r
+function inttohex(val,bits:integer):ansistring;\r
 const\r
-  hexchar:array[0..15] of char='0123456789abcdef';\r
+  hexchar:array[0..15] of ansichar='0123456789abcdef';\r
 begin\r
   inttohex := hexchar[val shr 4]+hexchar[val and $f];\r
 end;\r
@@ -284,10 +284,10 @@ begin
   md5finish(t,result);\r
 end;\r
 \r
-function md5tostr(const md5:tmd5):string;\r
+function md5tostr(const md5:tmd5):ansistring;\r
 var\r
   a:integer;\r
-  s:string;\r
+  s:ansistring;\r
 begin\r
   s := '';\r
   for a := 0 to 15 do s := s + inttohex(md5[a],2);\r

diff --git a/lcorernd.pas b/lcorernd.pas
index 673860fed0eb25d52205e6500f21523828b525c5..3e43bb124b2d6f1dd22869f2940b619c3bd27210 100644 (file)
--- a/lcorernd.pas
+++ b/lcorernd.pas
@@ -111,7 +111,7 @@ function randominteger(i:longint):longint;
 function randombits(b:integer):longint;\r
 \r
 {generate a version 4 random uuid}\r
-function generate_uuid:string;\r
+function generate_uuid:ansistring;\r
 \r
 {$ifndef nolcorernd}\r
 \r
@@ -402,12 +402,12 @@ begin
 end;\r
 \r
 const\r
-  ch:array[0..15] of char='0123456789abcdef';\r
+  ch:array[0..15] of ansichar='0123456789abcdef';\r
 \r
-function generate_uuid:string;\r
+function generate_uuid:ansistring;\r
 var\r
   buf:array[0..7] of word;\r
-function inttohex(w:word):string;\r
+function inttohex(w:word):ansistring;\r
 begin\r
   result := ch[w shr 12] + ch[(w shr 8) and $f] + ch[(w shr 4) and $f] + ch[w and $f];\r
 end;\r

diff --git a/readtxt2.pas b/readtxt2.pas
index 84c57652c4e90fe86d85cb4dc263b4261a4a8dd1..8f74e6cd99b1eafc88dd82c0b2c772bfa5064c33 100644 (file)
--- a/readtxt2.pas
+++ b/readtxt2.pas
@@ -32,9 +32,9 @@ type
     sourcestream:tstream;\r
     destroysourcestream:boolean;\r
     constructor create(asourcestream: tstream; adestroysourcestream:boolean);\r
-    constructor createf(filename : string);\r
+    constructor createf(filename : ansistring);\r
 \r
-    function readline:string;\r
+    function readline:ansistring;\r
     function eof:boolean;\r
     destructor destroy; override;\r
   private\r
@@ -59,7 +59,7 @@ begin
   destroysourcestream := false;\r
 end;\r
 \r
-constructor treadtxt.createf(filename : string);\r
+constructor treadtxt.createf(filename : ansistring);\r
 begin\r
   create(tfilestream.create(filename,fmOpenRead),true);\r
 end;\r

diff --git a/wcore.pas b/wcore.pas
index f88aa530c59d50e8bcbda25b48d90ae2415640a7..d15e803d40748b51547b8402b685cee4b891aa4b 100755 (executable)
--- a/wcore.pas
+++ b/wcore.pas
@@ -65,7 +65,7 @@ procedure exitmessageloop;
 procedure processmessages;\r
 \r
 var\r
-  onshutdown:procedure(s:string);\r
+  onshutdown:procedure(s:ansistring);\r
 \r
 implementation\r
 \r