Browse Source

* Some cosmetic improvements (fixed wrong method visibilities etc.)
* TSocketStream now closes the underlying file handle upon destruction

sg 24 years ago
parent
commit
1510d8016f
1 changed files with 15 additions and 4 deletions
  1. 15 4
      fcl/inc/ssockets.pp

+ 15 - 4
fcl/inc/ssockets.pp

@@ -49,6 +49,7 @@ type
     Constructor Create (AHandle : Longint);virtual;
     Constructor Create (AHandle : Longint);virtual;
     function Seek(Offset: Longint; Origin: Word): Longint; override;
     function Seek(Offset: Longint; Origin: Word): Longint; override;
     Property SocketOptions : TSocketOptions Read FSocketOptions
     Property SocketOptions : TSocketOptions Read FSocketOptions
+    destructor Destroy; override;
                                             Write SetSocketOptions;
                                             Write SetSocketOptions;
   end;
   end;
 
 
@@ -99,10 +100,10 @@ type
     FAddr : TINetSockAddr;
     FAddr : TINetSockAddr;
     Function  SockToStream (ASocket : Longint) : TSocketStream;Override;
     Function  SockToStream (ASocket : Longint) : TSocketStream;Override;
     Function Accept : Longint;override;
     Function Accept : Longint;override;
-  Public
     FPort : Word;
     FPort : Word;
-    Constructor Create(APort: Word);
+  Public
     Procedure Bind; Override;
     Procedure Bind; Override;
+    Constructor Create(APort: Word);
     Property Port : Word Read FPort;
     Property Port : Word Read FPort;
   end;
   end;
 
 
@@ -111,12 +112,12 @@ type
     FUnixAddr : TUnixSockAddr;
     FUnixAddr : TUnixSockAddr;
     FFileName : String;
     FFileName : String;
   Protected
   Protected
+    Procedure Bind; Override;
     Function Accept : Longint;override;
     Function Accept : Longint;override;
     Function SockToStream (ASocket : Longint) : TSocketStream;Override;
     Function SockToStream (ASocket : Longint) : TSocketStream;Override;
     Procedure Close; override;
     Procedure Close; override;
   Public
   Public
     Constructor Create(AFileName : String);
     Constructor Create(AFileName : String);
-    Procedure Bind; Override;
     Property FileName : String Read FFileName;
     Property FileName : String Read FFileName;
   end;
   end;
 
 
@@ -210,6 +211,12 @@ begin
   GetSockOptions;
   GetSockOptions;
 end;
 end;
 
 
+destructor TSocketStream.Destroy;
+begin
+  FileClose(Handle);
+  inherited Destroy;
+end;
+
 Procedure TSocketStream.GetSockOptions;
 Procedure TSocketStream.GetSockOptions;
 
 
 begin
 begin
@@ -517,7 +524,11 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.8  2001-11-24 20:59:13  carl
+  Revision 1.9  2001-12-17 20:21:35  sg
+  * Some cosmetic improvements (fixed wrong method visibilities etc.)
+  * TSocketStream now closes the underlying file handle upon destruction
+
+  Revision 1.8  2001/11/24 20:59:13  carl
   * fix compilation problems for version 1.0.x branch
   * fix compilation problems for version 1.0.x branch
 
 
   Revision 1.7  2001/11/20 18:53:29  peter
   Revision 1.7  2001/11/20 18:53:29  peter