* disable the 1:1 aliases of the legacy errorhandling.

   Leave the more complex functions under deprecated. 
   Also keep the errorhandling for at least another cycle.

git-svn-id: trunk@13498 -

rtl/inc/socketsh.inc

@@ -156,7 +156,6 @@ type
 
   Tsocket=longint;   {To easy porting code from Kylix libc unit to sockets unit.}
 
-
 function socketerror : cint; 
 
 function  fpsocket      (domain:cint; xtype:cint; protocol: cint):cint;
@@ -175,9 +174,11 @@ function  fpgetsockopt  (s:cint; level:cint; optname:cint; optval:pointer; optle
 function  fpsetsockopt  (s:cint; level:cint; optname:cint; optval:pointer; optlen : tsocklen):cint;
 function  fpsocketpair  (d:cint; xtype:cint; protocol:cint; sv:pcint):cint;
 
+Function CloseSocket(Sock:Longint):Longint; // vote is still out on this one
+
 {Basic Socket Functions}
+{$ifdef legacysocket}
 Function Socket(Domain,SocketType,Protocol:Longint):Longint; deprecated;
-Function CloseSocket(Sock:Longint):Longint; // vote is still out on this one
 Function Send(Sock:Longint;Const Buf;BufLen,Flags:Longint):Longint; deprecated;
 Function SendTo(Sock:Longint;Const Buf;BufLen,Flags:Longint;Var Addr; AddrLen : Longint):Longint; deprecated;
 Function Recv(Sock:Longint;Var Buf;BufLen,Flags:Longint):Longint; deprecated;
@@ -192,18 +193,16 @@ Function GetPeerName(Sock:Longint;Var Addr;Var Addrlen:Longint):Longint;deprecat
 Function SetSocketOptions(Sock,Level,OptName:Longint;const OptVal;optlen:longint):Longint;deprecated;
 Function GetSocketOptions(Sock,Level,OptName:Longint;Var OptVal;Var optlen:longint):Longint;deprecated;
 Function SocketPair(Domain,SocketType,Protocol:Longint;var Pair:TSockArray):Longint;deprecated;
+{$endif}
 
-{Text Support}
-Procedure Sock2Text(Sock:Longint;Var SockIn,SockOut:Text);deprecated;
-
-{Untyped File Support}
-Procedure Sock2File(Sock:Longint;Var SockIn,SockOut:File);deprecated;
+{ untyped/text filetype support }
 
+Procedure Sock2Text(Sock:Longint;Var SockIn,SockOut:Text);deprecated;
 Function Accept(Sock:longint;var addr:TInetSockAddr;var SockIn,SockOut:File):Boolean; deprecated;
 Function Accept(Sock:longint;var addr:TInetSockAddr;var SockIn,SockOut:text):Boolean;deprecated;
 Function Connect(Sock:longint;const addr:TInetSockAddr;var SockIn,SockOut:text):Boolean; deprecated;
 Function Connect(Sock:longint;const addr:TInetSockAddr;var SockIn,SockOut:file):Boolean;deprecated;
-
+Procedure Sock2File(Sock:Longint;Var SockIn,SockOut:File);deprecated;
 
 { Utility routines}
 function htonl( host : longint):longint; inline;

rtl/inc/sockovl.inc

@@ -18,6 +18,7 @@
                           Basic Socket Functions
 ******************************************************************************}
 
+{$ifdef legacysocket}
 Function socket(Domain,SocketType,Protocol:Longint):Longint;
 begin
   Socket:=fpsocket(domain,sockettype,protocol);
@@ -95,6 +96,7 @@ Function SocketPair(Domain,SocketType,Protocol:Longint;var Pair:TSockArray):Long
 begin
   SocketPair:=fpsocketpair(domain,sockettype,protocol,@pair[1]);
 end;
+{$endif}
 
 {******************************************************************************
                                UnixSock
@@ -115,18 +117,17 @@ var
   AddrLen  : longint;
 begin
   Str2UnixSockAddr(addr,UnixAddr,AddrLen);
-  Bind := Bind(Sock, UnixAddr, AddrLen); // what the flying fuck were you thinking?
+  Bind := fpBind(Sock, @UnixAddr, AddrLen)=0; // what the flying fuck were you thinking?
 end;
 
 
-
 Function DoAccept(Sock:longint;var addr:string):longint;
 var
   UnixAddr : TUnixSockAddr;
   AddrLen  : longint;
 begin
   AddrLen:=length(addr)+3;
-  DoAccept:=Accept(Sock,UnixAddr,AddrLen);
+  DoAccept:=fpAccept(Sock,@UnixAddr,@AddrLen);
   Move(UnixAddr.Path,Addr[1],AddrLen);
   SetLength(Addr,AddrLen);
 end;
@@ -139,7 +140,7 @@ var
   AddrLen  : longint;
 begin
   Str2UnixSockAddr(addr,UnixAddr,AddrLen);
-  DoConnect:=Connect(Sock,UnixAddr,AddrLen);
+  DoConnect:=fpConnect(Sock,@UnixAddr,AddrLen)=0;
 end;
 
 Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:text):Boolean;
@@ -156,8 +157,6 @@ begin
    Accept:=false;
 end;
 
-
-
 Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:File):Boolean;
 var
   s : longint;
@@ -172,8 +171,6 @@ begin
    Accept:=false;
 end;
 
-
-
 Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:text):Boolean;
 begin
   Connect:=DoConnect(Sock,addr);
@@ -181,8 +178,6 @@ begin
      Sock2Text(Sock,SockIn,SockOut);
 end;
 
-
-
 Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:file):Boolean;
 begin
   Connect:=DoConnect(Sock,addr);
@@ -190,7 +185,6 @@ begin
      Sock2File(Sock,SockIn,SockOut);
 end;
 
-
 Function CloseSocket (Sock:Longint):Longint;
 begin
   if fpclose(Sock)=0 then