Type fix for binipstuff and revert btime

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

diff --git a/binipstuff.pas b/binipstuff.pas
index 40b5f9fa35b996f9d45f2d0e0a58ac1c543ed52b..cfc7c1b5b145c64d728ccb4ae41e96dcd17b532f 100644 (file)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -118,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=tipstring;\r
+  tbiniplist=tbufferstring;\r
 \r
 function biniplist_new:tbiniplist;\r
 procedure biniplist_add(var l:tbiniplist;ip:tbinip);\r
@@ -128,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):tipstring;\r
+function biniplist_tostr(const l:tbiniplist):thostname;\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:tipstring;var binip:tbinip):boolean;\r
-function ipstrtobinf(const s:tipstring):tbinip;\r
-function ipbintostr(const binip:tbinip):tipstring;\r
+function ipstrtobin(const s:thostname;var binip:tbinip):boolean;\r
+function ipstrtobinf(const s:thostname):tbinip;\r
+function ipbintostr(const binip:tbinip):thostname;\r
 {$ifdef ipv6}\r
-function ip6bintostr(const bin:tin6_addr):tipstring;\r
-function ip6strtobin(const s:tipstring;var bin:tin6_addr):boolean;\r
+function ip6bintostr(const bin:tin6_addr):thostname;\r
+function ip6strtobin(const s:thostname;var bin:tin6_addr):boolean;\r
 {$endif}\r
 \r
 function comparebinip(const ip1,ip2:tbinip):boolean;\r
@@ -149,7 +149,7 @@ 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:tipstring):longint;\r
+function longip(s:thostname):longint;\r
 \r
 function needconverttov4(const ip:tbinip):boolean;\r
 procedure converttov4(var ip:tbinip);\r
@@ -222,7 +222,7 @@ end;
 \r
 {internal}\r
 {converts dotted v4 IP to longint. returns host endian order}\r
-function longip(s:tipstring):longint;\r
+function longip(s:thostname):longint;\r
 var\r
   l:longint;\r
   a,b:integer;\r
@@ -277,7 +277,7 @@ begin
   ipstrtobin(s,result);\r
 end;\r
 \r
-function ipstrtobin(const s:tipstring;var binip:tbinip):boolean;\r
+function ipstrtobin(const s:thostname;var binip:tbinip):boolean;\r
 begin\r
   binip.family := 0;\r
   result := false;\r
@@ -299,7 +299,7 @@ begin
   end;\r
 end;\r
 \r
-function ipbintostr(const binip:tbinip):tipstring;\r
+function ipbintostr(const binip:tbinip):thostname;\r
 var\r
   a:integer;\r
 begin\r
@@ -335,7 +335,7 @@ written by beware
 {fpc has hostaddrtostr6 and strtohostaddr6 but the later isnt implemented yet}\r
 \r
 \r
-function ip6bintostr(const bin:tin6_addr):tipstring;\r
+function ip6bintostr(const bin:tin6_addr):thostname;\r
 {base16 with lowercase output}\r
 function makehex(w:word):ansistring;\r
 begin\r
@@ -393,7 +393,7 @@ begin
   end;\r
 end;\r
 \r
-function ip6strtobin(const s:tipstring;var bin:tin6_addr):boolean;\r
+function ip6strtobin(const s:thostname;var bin:tin6_addr):boolean;\r
 var\r
   a,b:integer;\r
   fields:array[0..7] of ansistring;\r
@@ -592,7 +592,7 @@ begin
   l := l + copy(l2,biniplist_prefixlen+1,maxlongint);\r
 end;\r
 \r
-function biniplist_tostr(const l:tbiniplist):tipstring;\r
+function biniplist_tostr(const l:tbiniplist):thostname;\r
 var\r
   a:integer;\r
 begin\r

diff --git a/btime.pas b/btime.pas
index ea199c615081be7da36ae3e9278d64f81016247b..9bb95502b13300569be20b37194f402ab646334b 100644 (file)
--- a/btime.pas
+++ b/btime.pas
@@ -20,7 +20,7 @@ const
 \r
 var\r
   timezone:integer;\r
-  timezonestr:ansistring;\r
+  timezonestr:string;\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):ansistring;\r
-function timestrshort(i:integer):ansistring;\r
+function timestring(i:integer):string;\r
+function timestrshort(i:integer):string;\r
 \r
 {$ifdef win32}\r
 function unixtimefloat_systemtime:float;\r
@@ -543,13 +543,13 @@ begin
 \r
   if timezone >= 0 then timezonestr := '+' else timezonestr := '-';\r
   l := abs(timezone) div 60;\r
-  timezonestr := timezonestr + ansichar(l div 600 mod 10+48)+ansichar(l div 60 mod 10+48)+':'+ansichar(l div 10 mod 6+48)+ansichar(l mod 10+48);\r
+  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):ansistring;\r
+function timestrshort(i:integer):string;\r
 const\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
+  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
 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):ansistring;\r
+function timestring(i:integer):string;\r
 const\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
+  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
 var\r
   y,m,d,h,min,sec,ms:word;\r
   t:tdatetime;\r

diff --git a/pgtypes.pas b/pgtypes.pas
index 4dfd66de36b555d50b4e59e54be09caa846c95f3..d42a6b2482e5d4482e5aed7a0a7d61450aa27e9d 100755 (executable)
--- a/pgtypes.pas
+++ b/pgtypes.pas
@@ -16,9 +16,10 @@ interface
     {$endif}\r
     paddrint=^taddrint;\r
 \r
+    { string type for storing hostnames or IP addresses as strings }\r
     thostname = ansistring;\r
+    { string type for storing data (bytes) }\r
     tbufferstring = ansistring;\r
-    tipstring = ansistring;\r
 \r
 implementation\r
 end.\r

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