From 103b8164a5d69baf874b960aee91cabdedb01322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Sat, 14 Jan 2023 22:44:07 +0100 Subject: [PATCH] * PChar -> PAnsiChar --- packages/rtl-extra/src/amiga/sockets.pp | 12 ++++++------ packages/rtl-extra/src/aros/sockets.pp | 12 ++++++------ packages/rtl-extra/src/inc/sockovl.inc | 16 ++++++++-------- packages/rtl-extra/src/unix/sockets.pp | 12 ++++++------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/rtl-extra/src/amiga/sockets.pp b/packages/rtl-extra/src/amiga/sockets.pp index b57f3da19b..59fa764ab7 100644 --- a/packages/rtl-extra/src/amiga/sockets.pp +++ b/packages/rtl-extra/src/amiga/sockets.pp @@ -102,12 +102,12 @@ const { unix socket specific functions } {* -Procedure Str2UnixSockAddr(const addr:string;var t:TUnixSockAddr;var len:longint); deprecated; -Function Bind(Sock:longint;const addr:string):boolean; deprecated; -Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:text):Boolean; deprecated; -Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:file):Boolean; deprecated; -Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:text):Boolean; deprecated; -Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:File):Boolean; deprecated; +Procedure Str2UnixSockAddr(const addr:ansistring;var t:TUnixSockAddr;var len:longint); deprecated; +Function Bind(Sock:longint;const addr:ansistring):boolean; deprecated; +Function Connect(Sock:longint;const addr:ansistring;var SockIn,SockOut:text):Boolean; deprecated; +Function Connect(Sock:longint;const addr:ansistring;var SockIn,SockOut:file):Boolean; deprecated; +Function Accept(Sock:longint;var addr:ansistring;var SockIn,SockOut:text):Boolean; deprecated; +Function Accept(Sock:longint;var addr:ansistring;var SockIn,SockOut:File):Boolean; deprecated; *} //function fpaccept (s:cint; addrx : psockaddr; addrlen : psocklen):cint; maybelibc //function fpbind (s:cint; addrx : psockaddr; addrlen : tsocklen):cint; maybelibc diff --git a/packages/rtl-extra/src/aros/sockets.pp b/packages/rtl-extra/src/aros/sockets.pp index 6956139902..c7295bc8d2 100644 --- a/packages/rtl-extra/src/aros/sockets.pp +++ b/packages/rtl-extra/src/aros/sockets.pp @@ -101,12 +101,12 @@ const { unix socket specific functions } {* -Procedure Str2UnixSockAddr(const addr:string;var t:TUnixSockAddr;var len:longint); deprecated; -Function Bind(Sock:longint;const addr:string):boolean; deprecated; -Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:text):Boolean; deprecated; -Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:file):Boolean; deprecated; -Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:text):Boolean; deprecated; -Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:File):Boolean; deprecated; +Procedure Str2UnixSockAddr(const addr:ansistring;var t:TUnixSockAddr;var len:longint); deprecated; +Function Bind(Sock:longint;const addr:ansistring):boolean; deprecated; +Function Connect(Sock:longint;const addr:ansistring;var SockIn,SockOut:text):Boolean; deprecated; +Function Connect(Sock:longint;const addr:ansistring;var SockIn,SockOut:file):Boolean; deprecated; +Function Accept(Sock:longint;var addr:ansistring;var SockIn,SockOut:text):Boolean; deprecated; +Function Accept(Sock:longint;var addr:ansistring;var SockIn,SockOut:File):Boolean; deprecated; *} //function fpaccept (s:cint; addrx : psockaddr; addrlen : psocklen):cint; maybelibc //function fpbind (s:cint; addrx : psockaddr; addrlen : tsocklen):cint; maybelibc diff --git a/packages/rtl-extra/src/inc/sockovl.inc b/packages/rtl-extra/src/inc/sockovl.inc index 45c82053f9..7589729e13 100644 --- a/packages/rtl-extra/src/inc/sockovl.inc +++ b/packages/rtl-extra/src/inc/sockovl.inc @@ -23,7 +23,7 @@ UnixSock ******************************************************************************} -Procedure Str2UnixSockAddr(const addr:string;var t:TUnixSockAddr;var len:longint); +Procedure Str2UnixSockAddr(const addr:ansistring;var t:TUnixSockAddr;var len:longint); begin Move(Addr[1],t.Path,length(Addr)); t.Family:=AF_UNIX; @@ -32,7 +32,7 @@ begin end; -Function Bind(Sock:longint;const addr:string):boolean; +Function Bind(Sock:longint;const addr:ansistring):boolean; var UnixAddr : TUnixSockAddr; AddrLen : longint; @@ -42,7 +42,7 @@ begin end; -Function DoAccept(Sock:longint;var addr:string):longint; +Function DoAccept(Sock:longint;var addr:ansistring):longint; var UnixAddr : TUnixSockAddr; AddrLen : longint; @@ -55,7 +55,7 @@ end; -Function DoConnect(Sock:longint;const addr:string):Boolean; +Function DoConnect(Sock:longint;const addr:ansistring):Boolean; var UnixAddr : TUnixSockAddr; AddrLen : longint; @@ -64,7 +64,7 @@ begin DoConnect:=fpConnect(Sock,@UnixAddr,AddrLen)=0; end; -Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:text):Boolean; +Function Accept(Sock:longint;var addr:ansistring;var SockIn,SockOut:text):Boolean; var s : longint; begin @@ -78,7 +78,7 @@ begin Accept:=false; end; -Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:File):Boolean; +Function Accept(Sock:longint;var addr:ansistring;var SockIn,SockOut:File):Boolean; var s : longint; begin @@ -92,14 +92,14 @@ begin Accept:=false; end; -Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:text):Boolean; +Function Connect(Sock:longint;const addr:ansistring;var SockIn,SockOut:text):Boolean; begin Connect:=DoConnect(Sock,addr); If Connect then Sock2Text(Sock,SockIn,SockOut); end; -Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:file):Boolean; +Function Connect(Sock:longint;const addr:ansistring;var SockIn,SockOut:file):Boolean; begin Connect:=DoConnect(Sock,addr); if Connect then diff --git a/packages/rtl-extra/src/unix/sockets.pp b/packages/rtl-extra/src/unix/sockets.pp index 76005af782..b179b6fc32 100644 --- a/packages/rtl-extra/src/unix/sockets.pp +++ b/packages/rtl-extra/src/unix/sockets.pp @@ -63,12 +63,12 @@ const EsockADDRINUSE = ESysEADDRINUSE; { unix socket specific functions } -Procedure Str2UnixSockAddr(const addr:string;var t:TUnixSockAddr;var len:longint); deprecated; -Function Bind(Sock:longint;const addr:string):boolean; deprecated; -Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:text):Boolean; deprecated; -Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:file):Boolean; deprecated; -Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:text):Boolean; deprecated; -Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:File):Boolean; deprecated; +Procedure Str2UnixSockAddr(const addr:ansistring;var t:TUnixSockAddr;var len:longint); deprecated; +Function Bind(Sock:longint;const addr:ansistring):boolean; deprecated; +Function Connect(Sock:longint;const addr:ansistring;var SockIn,SockOut:text):Boolean; deprecated; +Function Connect(Sock:longint;const addr:ansistring;var SockIn,SockOut:file):Boolean; deprecated; +Function Accept(Sock:longint;var addr:ansistring;var SockIn,SockOut:text):Boolean; deprecated; +Function Accept(Sock:longint;var addr:ansistring;var SockIn,SockOut:File):Boolean; deprecated; //function fpaccept (s:cint; addrx : psockaddr; addrlen : psocklen):cint; maybelibc //function fpbind (s:cint; addrx : psockaddr; addrlen : tsocklen):cint; maybelibc