mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-27 04:53:39 +02:00
Use cross platform sockets.CloseSocket call to close a socket.
This commit is contained in:
parent
95205d9bc2
commit
d56f77c2be
@ -94,8 +94,6 @@ type
|
||||
FConfig: TRemoteConfig;
|
||||
FSocketHandler: TSocketHandler;
|
||||
|
||||
procedure CloseSocket;
|
||||
|
||||
function WaitForData(timeout_ms: integer): integer; overload;
|
||||
// Wrappers to catch exceptions and set SockErr
|
||||
function SafeReadByte: byte;
|
||||
@ -158,6 +156,7 @@ implementation
|
||||
uses
|
||||
{$ifdef FORCE_LAZLOGGER_DUMMY} LazLoggerDummy {$else} LazLoggerBase {$endif}, StrUtils,
|
||||
FpImgReaderBase,
|
||||
sockets,
|
||||
{$IFNDEF WINDOWS}BaseUnix, termio;
|
||||
{$ELSE}winsock2, windows;
|
||||
{$ENDIF}
|
||||
@ -215,11 +214,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TRspConnection.CloseSocket;
|
||||
begin
|
||||
FpClose(FSocketHandler.Socket.Handle);
|
||||
end;
|
||||
|
||||
function TRspConnection.WaitForData(timeout_ms: integer): integer;
|
||||
{$if defined(unix) or defined(windows)}
|
||||
var
|
||||
@ -525,7 +519,7 @@ begin
|
||||
try
|
||||
SendCommandAck('k');
|
||||
result := true;
|
||||
CloseSocket;
|
||||
sockets.CloseSocket(FSocketHandler.Socket.Handle);
|
||||
finally
|
||||
LeaveCriticalSection(fCS);
|
||||
end;
|
||||
@ -539,7 +533,7 @@ begin
|
||||
try
|
||||
result := SendCmdWaitForReply('D', reply);
|
||||
result := true;
|
||||
CloseSocket;
|
||||
sockets.CloseSocket(FSocketHandler.Socket.Handle);
|
||||
finally
|
||||
LeaveCriticalSection(fCS);
|
||||
end;
|
||||
|
Loading…
Reference in New Issue
Block a user