eliminated a lot of hints and warnings

git-svn-id: file:///svnroot/lcore/trunk@94 b1de8a11-f9be-4011-bde0-cc7ace90066a

diff --git a/bfifo.pas b/bfifo.pas
index 55cc24ad0bdc2cdb3e5abc6f21bcfeb6ec3fa917..667c0da863da557c29d37f65f1c00b8d141e54ab 100644 (file)
--- a/bfifo.pas
+++ b/bfifo.pas
@@ -76,7 +76,6 @@ end;
 function tfifo.get;\r
 var\r
   p:tlinklist;\r
 function tfifo.get;\r
 var\r
   p:tlinklist;\r

-  a:integer;\r

 begin\r
   if len > size then len := size;\r
   if len <= 0 then begin\r
 begin\r
   if len > size then len := size;\r
   if len <= 0 then begin\r

diff --git a/binipstuff.pas b/binipstuff.pas
index 1f5fed4ecc62ff3ed505d4b39c2035c8a1ecb1a6..1cfa34deb4f3bd92429af58aa43f6ebe119feab2 100644 (file)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -4,6 +4,10 @@
   ----------------------------------------------------------------------------- }\r
 unit binipstuff;\r
 \r
   ----------------------------------------------------------------------------- }\r
 unit binipstuff;\r
 \r

+{$ifdef fpc}\r
+{$mode delphi}\r
+{$endif}\r
+\r

 interface\r
 \r
 {$include lcoreconfig.inc}\r
 interface\r
 \r
 {$include lcoreconfig.inc}\r


@@ -14,9 +18,6 @@ uses
 {$endif}\r
   pgtypes;\r
 \r
 {$endif}\r
   pgtypes;\r
 \r

-{$ifdef fpc}\r
-  {$mode delphi}\r
-{$endif}\r

 {$ifdef cpu386}{$define i386}{$endif}\r
 {$ifdef i386}{$define ENDIAN_LITTLE}{$endif}\r
 \r
 {$ifdef cpu386}{$define i386}{$endif}\r
 {$ifdef i386}{$define ENDIAN_LITTLE}{$endif}\r
 \r

diff --git a/btime.pas b/btime.pas
index 62b957df864c8f31d33cc2b505f363e4670829ce..c1301442b91233dc52e7e28355988bcf7645f778 100644 (file)
--- a/btime.pas
+++ b/btime.pas
@@ -226,7 +226,7 @@ var
   f,g:float;\r
   o:tosversioninfo;\r
   isnt:boolean;\r
   f,g:float;\r
   o:tosversioninfo;\r
   isnt:boolean;\r

-  is9x:boolean;\r
+{  is9x:boolean;}\r

 begin\r
   if (performancecountfreq = 0) then qpctimefloat;\r
   ticks_freq_known := false;\r
 begin\r
   if (performancecountfreq = 0) then qpctimefloat;\r
   ticks_freq_known := false;\r


@@ -239,7 +239,7 @@ begin
   o.dwOSVersionInfoSize := sizeof(o);\r
   getversionex(o);\r
   isnt := o.dwPlatformId = VER_PLATFORM_WIN32_NT;\r
   o.dwOSVersionInfoSize := sizeof(o);\r
   getversionex(o);\r
   isnt := o.dwPlatformId = VER_PLATFORM_WIN32_NT;\r

-  is9x := o.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;\r
+{  is9x := o.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;}\r

 \r
   ticks_freq2 := f;\r
   mmtime_synchedqpc := false;\r
 \r
   ticks_freq2 := f;\r
   mmtime_synchedqpc := false;\r


@@ -327,14 +327,14 @@ const
   maxretries=5;\r
   margin=0.002;\r
 var\r
   maxretries=5;\r
   margin=0.002;\r
 var\r

-  jump:float;\r
-  mm,f,qpc,newdrift,f1,f2:float;\r
+{  jump:float;}\r
+  mm,f,qpc,newdrift:float;\r

   qpcjumped:boolean;\r
   qpcjumped:boolean;\r

-  a,b,c:integer;\r
-  retrycount:integer;\r
+  a,b:integer;\r
+{  retrycount:integer;}\r

 begin\r
   if not ticks_freq_known then measure_ticks_freq;\r
 begin\r
   if not ticks_freq_known then measure_ticks_freq;\r

-  retrycount := maxretries;\r
+{  retrycount := maxretries;}\r

 \r
   qpc := qpctimefloat;\r
   mm := mmtimefloat;\r
 \r
   qpc := qpctimefloat;\r
   mm := mmtimefloat;\r


@@ -351,7 +351,7 @@ begin
       mmtime_prev_lastsyncqpc := mmtime_lastsyncqpc;\r
 \r
       mm := mmtimefloat;\r
       mmtime_prev_lastsyncqpc := mmtime_lastsyncqpc;\r
 \r
       mm := mmtimefloat;\r

-      dec(retrycount);\r
+    {  dec(retrycount);}\r

       settc;\r
       result := qpctimefloat;\r
       f := mmtimefloat;\r
       settc;\r
       result := qpctimefloat;\r
       f := mmtimefloat;\r


@@ -382,6 +382,7 @@ begin
 {          mmtime_drift := mmtime_drift + mmtime_driftavg[a];}\r
         end;\r
 {        mmtime_drift := mmtime_drift / b;}\r
 {          mmtime_drift := mmtime_drift + mmtime_driftavg[a];}\r
         end;\r
 {        mmtime_drift := mmtime_drift / b;}\r

+        a := 5;\r

         if (b = 1) then a := 5 else if (b = 2) then a := 15 else if (b = 3) then a := 30 else if (b = 4) then a := 60 else if (b = 5) then a := 120 else if (b >= 5) then a := 120;\r
         mmtime_nextdriftcorrection := qpc + a;\r
         if (b >= 2) then warmup_finished := true;\r
         if (b = 1) then a := 5 else if (b = 2) then a := 15 else if (b = 3) then a := 30 else if (b = 4) then a := 60 else if (b = 5) then a := 120 else if (b >= 5) then a := 120;\r
         mmtime_nextdriftcorrection := qpc + a;\r
         if (b >= 2) then warmup_finished := true;\r


@@ -399,10 +400,10 @@ begin
     qpc := qpctimefloat;\r
 \r
     result := (qpc - mmtime_lastsyncqpc) * mmtime_drift + mmtime_lastsyncmm;\r
     qpc := qpctimefloat;\r
 \r
     result := (qpc - mmtime_lastsyncqpc) * mmtime_drift + mmtime_lastsyncmm;\r

-    f := (qpc - mmtime_prev_lastsyncqpc) * mmtime_prev_drift + mmtime_prev_lastsyncmm;\r

 \r
 \r

+    {f := (qpc - mmtime_prev_lastsyncqpc) * mmtime_prev_drift + mmtime_prev_lastsyncmm;\r

     jump := result-f;\r
     jump := result-f;\r

-    {writeln('jump ',formatfloat('0.000000',jump),'   drift ',formatfloat('0.00000000',mmtime_drift),' duration ',formatfloat('0.000',(mmtime_lastsyncqpc-mmtime_prev_lastsyncqpc)),' ',formatfloat('0.00000000',jump/(mmtime_lastsyncqpc-mmtime_prev_lastsyncqpc)));}\r
+    writeln('jump ',formatfloat('0.000000',jump),'   drift ',formatfloat('0.00000000',mmtime_drift),' duration ',formatfloat('0.000',(mmtime_lastsyncqpc-mmtime_prev_lastsyncqpc)),' ',formatfloat('0.00000000',jump/(mmtime_lastsyncqpc-mmtime_prev_lastsyncqpc)));}\r

 \r
     f := result;\r
   end;\r
 \r
     f := result;\r
   end;\r

diff --git a/dnssync.pas b/dnssync.pas
index 7d6631c97b73011641e8bd0b778855e408d5c72c..c603b9267a892b071ec96631dca3fa4e5d371539 100644 (file)
--- a/dnssync.pas
+++ b/dnssync.pas
@@ -75,14 +75,14 @@ implementation
 \r
 {$i unixstuff.inc}\r
 \r
 \r
 {$i unixstuff.inc}\r
 \r

+\r
+{$ifdef syncdnscore}\r

 var\r
   numsockused:integer;\r
   fd:array[0..numsock-1] of integer;\r
   state:array[0..numsock-1] of tdnsstate;\r
   toaddr:array[0..numsock-1] of tbinip;\r
 \r
 var\r
   numsockused:integer;\r
   fd:array[0..numsock-1] of integer;\r
   state:array[0..numsock-1] of tdnsstate;\r
   toaddr:array[0..numsock-1] of tbinip;\r
 \r

-{$ifdef syncdnscore}\r
-\r

 {$ifdef win32}\r
   const\r
     winsocket = 'wsock32.dll';\r
 {$ifdef win32}\r
   const\r
     winsocket = 'wsock32.dll';\r


@@ -109,7 +109,6 @@ end;
 \r
 function sendquery(socknum:integer;const packet:tdnspacket;len:integer):boolean;\r
 var\r
 \r
 function sendquery(socknum:integer;const packet:tdnspacket;len:integer):boolean;\r
 var\r

-  a:integer;\r

   addr       : ansistring;\r
   port       : ansistring;\r
   inaddr     : TInetSockAddrV;\r
   addr       : ansistring;\r
   port       : ansistring;\r
   inaddr     : TInetSockAddrV;\r


@@ -177,7 +176,6 @@ var
   currenttime  : integer;\r
 \r
   lag            : ttimeval;\r
   currenttime  : integer;\r
 \r
   lag            : ttimeval;\r

-  currenttimeout : ttimeval;\r

   selecttimeout         : ttimeval;\r
   socknum:integer;\r
   needprocessing:array[0..numsock-1] of boolean;\r
   selecttimeout         : ttimeval;\r
   socknum:integer;\r
   needprocessing:array[0..numsock-1] of boolean;\r


@@ -299,7 +297,7 @@ end;
 function forwardlookuplist(name:ansistring;timeout:integer):tbiniplist;\r
 var\r
   dummy : integer;\r
 function forwardlookuplist(name:ansistring;timeout:integer):tbiniplist;\r
 var\r
   dummy : integer;\r

-  a,b:integer;\r
+  a:integer;\r

   biniptemp:tbinip;\r
   l:tbiniplist;\r
 begin\r
   biniptemp:tbinip;\r
   l:tbiniplist;\r
 begin\r

diff --git a/dnswin.pas b/dnswin.pas
index 847f0fd9bfa88a4ba971898e5ee27d20e4538335..567ea68f04424b720616f36070a62106b0779d0a 100644 (file)
--- a/dnswin.pas
+++ b/dnswin.pas
@@ -21,7 +21,6 @@ type
   tdnswinasync=class(tthread)\r
   private\r
     freverse : boolean;\r
   tdnswinasync=class(tthread)\r
   private\r
     freverse : boolean;\r

-    error : integer;\r

     freewhendone : boolean;\r
     hadevent : boolean;\r
   protected\r
     freewhendone : boolean;\r
     hadevent : boolean;\r
   protected\r


@@ -88,6 +87,7 @@ var
   hostent : phostent;\r
   addrlist:^pointer;\r
 begin\r
   hostent : phostent;\r
   addrlist:^pointer;\r
 begin\r

+  output := nil;\r

   if hints.ai_family <> af_inet6 then begin\r
     result := 0;\r
 \r
   if hints.ai_family <> af_inet6 then begin\r
     result := 0;\r
 \r


@@ -264,6 +264,7 @@ begin
     if assigned (dwas.onrequestdone) then dwas.onrequestdone(dwas,awparam);\r
     dwas.hadevent := true;\r
     if dwas.freewhendone then dwas.free;\r
     if assigned (dwas.onrequestdone) then dwas.onrequestdone(dwas,awparam);\r
     dwas.hadevent := true;\r
     if dwas.freewhendone then dwas.free;\r

+    result := 0; {added returning 0 when handling --beware}\r

   end else begin\r
     //not passing unknown messages on to defwindowproc will cause window\r
     //creation to fail! --plugwash\r
   end else begin\r
     //not passing unknown messages on to defwindowproc will cause window\r
     //creation to fail! --plugwash\r

diff --git a/lcore.pas b/lcore.pas
index 0f6eaef5025a5cbf3a9b8db87bf33b047108c24e..1a2f93cb45efbb83552b07ee63c57289020786c8 100755 (executable)
--- a/lcore.pas
+++ b/lcore.pas
@@ -258,18 +258,20 @@ implementation
 \r
 {!!! added sleep call -beware}\r
 procedure sleep(i:integer);\r
 \r
 {!!! added sleep call -beware}\r
 procedure sleep(i:integer);\r

+{$ifdef win32}\r
+begin\r
+  windows.sleep(i);\r
+{$else}\r

 var\r
   tv:ttimeval;\r
 begin\r
 var\r
   tv:ttimeval;\r
 begin\r

-  {$ifdef win32}\r
-    windows.sleep(i);\r
-  {$else}\r
-    tv.tv_sec := i div 1000;\r
-    tv.tv_usec := (i mod 1000) * 1000;\r
-    select(0,nil,nil,nil,@tv);\r
-  {$endif}\r
+  tv.tv_sec := i div 1000;\r
+  tv.tv_usec := (i mod 1000) * 1000;\r
+  select(0,nil,nil,nil,@tv);\r
+{$endif}\r

 end;\r
 \r
 end;\r
 \r

+\r

 destructor tlcomponent.destroy;\r
 begin\r
   disconnecttasks(self);\r
 destructor tlcomponent.destroy;\r
 begin\r
   disconnecttasks(self);\r

diff --git a/lcoreselect.pas b/lcoreselect.pas
index 659bfce58d8daf099acc0f7cab9fa888271fedd5..38da6ba29a2384ea3d56f8f0b9e4f37a2509af83 100755 (executable)
--- a/lcoreselect.pas
+++ b/lcoreselect.pas
@@ -64,7 +64,7 @@ type
 \r
 procedure processtimers;inline;\r
 var\r
 \r
 procedure processtimers;inline;\r
 var\r

-  tv           ,tvnow     : ttimeval ;\r
+  tvnow     : ttimeval ;\r

   currenttimer            : tltimer   ;\r
   temptimer               : tltimer  ;\r
 \r
   currenttimer            : tltimer   ;\r
   temptimer               : tltimer  ;\r
 \r


@@ -90,7 +90,6 @@ end;
 procedure processasios(var fdsr,fdsw:fdset);//inline;\r
 var\r
   currentsocket : tlasio  ;\r
 procedure processasios(var fdsr,fdsw:fdset);//inline;\r
 var\r
   currentsocket : tlasio  ;\r

-  tempsocket    : tlasio  ;\r

   socketcount   : integer ; // for debugging perposes :)\r
   dw,bt:integer;\r
   currentfdword:fdword;\r
   socketcount   : integer ; // for debugging perposes :)\r
   dw,bt:integer;\r
   currentfdword:fdword;\r

diff --git a/lsocket.pas b/lsocket.pas
index bcff6436d3fc92511cd33d6934f9c07e6f884345..642ec9a0cfe4c80e339ad34993d9969b5b5f8e10 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -134,6 +134,15 @@ type
 \r
       //this one has to be kept public for now because lcorewsaasyncselect calls it\r
       procedure connectionfailedhandler(error:word);\r
 \r
       //this one has to be kept public for now because lcorewsaasyncselect calls it\r
       procedure connectionfailedhandler(error:word);\r

+\r
+      {public in tlasio, and can't be private in both places, so should be public here. \r
+      fixes delphi warning --beware}\r
+      {$ifdef win32}\r
+        procedure myfdclose(fd : integer); override;\r
+        function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;\r
+        function myfdread(fd: LongInt;var buf;size: LongInt):LongInt; override;\r
+      {$endif}\r
+\r

     private\r
       {$ifdef ipv6}\r
         isv6socket : boolean; //identifies if the socket is v6, set by bindsocket\r
     private\r
       {$ifdef ipv6}\r
         isv6socket : boolean; //identifies if the socket is v6, set by bindsocket\r


@@ -142,11 +151,6 @@ type
 \r
       procedure connecttimeouthandler(sender:tobject);\r
       procedure connectsuccesshandler;\r
 \r
       procedure connecttimeouthandler(sender:tobject);\r
       procedure connectsuccesshandler;\r

-      {$ifdef win32}\r
-        procedure myfdclose(fd : integer); override;\r
-        function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;\r
-        function myfdread(fd: LongInt;var buf;size: LongInt):LongInt; override;\r
-      {$endif}\r

     end;\r
     tsocket=longint; // for compatibility with twsocket\r
 \r
     end;\r
     tsocket=longint; // for compatibility with twsocket\r
 \r


@@ -284,9 +288,6 @@ end;
 \r
 \r
 procedure tlsocket.connect;\r
 \r
 \r
 procedure tlsocket.connect;\r

-var\r
-  a:integer;\r
-  ip:tbinip;\r

 begin\r
   if state <> wsclosed then close;\r
   //prevtime := 0;\r
 begin\r
   if state <> wsclosed then close;\r
   //prevtime := 0;\r


@@ -345,7 +346,6 @@ end;
 \r
 procedure tlsocket.bindsocket;\r
 var\r
 \r
 procedure tlsocket.bindsocket;\r
 var\r

-  a:integer;\r

   inAddrtemp:TInetSockAddrV;\r
   inAddrtempx:{$ifdef win32}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;\r
   inaddrtempsize:integer;\r
   inAddrtemp:TInetSockAddrV;\r
   inAddrtempx:{$ifdef win32}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;\r
   inaddrtempsize:integer;\r


@@ -380,7 +380,9 @@ end;
 \r
 procedure tlsocket.listen;\r
 var\r
 \r
 procedure tlsocket.listen;\r
 var\r

+  {$ifndef win32}\r

   yes,no:longint;\r
   yes,no:longint;\r

+  {$endif}\r

   socktype:integer;\r
   biniptemp:tbinip;\r
   origaddr:thostname;\r
   socktype:integer;\r
   biniptemp:tbinip;\r
   origaddr:thostname;\r


@@ -427,10 +429,11 @@ begin
   state := wsclosed; // then set this back as it was an undesired side effect of dup\r
 \r
   try\r
   state := wsclosed; // then set this back as it was an undesired side effect of dup\r
 \r
   try\r

-    yes := $01010101;  {Copied this from existing code. Value is empiric,\r
-                    but works. (yes=true<>0) }\r
-    no := 0;\r

     {$ifndef win32}\r
     {$ifndef win32}\r

+      yes := $01010101;  {Copied this from existing code. Value is empiric,\r
+                    but works. (yes=true<>0) }\r
+      no := 0;\r
+\r

       if SetSocketOptions(fdhandlein, SOL_SOCKET, SO_REUSEADDR,yes,sizeof(yes))=-1 then begin\r
         raise ESocketException.create('unable to set SO_REUSEADDR socket option');\r
       end;\r
       if SetSocketOptions(fdhandlein, SOL_SOCKET, SO_REUSEADDR,yes,sizeof(yes))=-1 then begin\r
         raise ESocketException.create('unable to set SO_REUSEADDR socket option');\r
       end;\r


@@ -552,7 +555,7 @@ begin
   if result > absoloutemaxs then begin\r
     myfdclose(result);\r
     a := result;\r
   if result > absoloutemaxs then begin\r
     myfdclose(result);\r
     a := result;\r

-    result := -1;\r
+{    result := -1;}\r

     raise esocketexception.create('file discriptor out of range: '+inttostr(a));\r
   end;\r
 end;\r
     raise esocketexception.create('file discriptor out of range: '+inttostr(a));\r
   end;\r
 end;\r