Combine socket error to string conversion to common function in GlobalSock unit

Author: ultibohub

source/__version.id

@@ -1 +1 @@
-2.6.107
+2.6.109

source/rtl/ultibo/core/globalconst.pas

@@ -52,12 +52,12 @@ interface
 {Global constants}
 const
  {Version constants}
- ULTIBO_RELEASE_DATE = '2 October 2025';
+ ULTIBO_RELEASE_DATE = '8 October 2025';
  ULTIBO_RELEASE_NAME = 'Beetroot';
- ULTIBO_RELEASE_VERSION = '2.6.107';
+ ULTIBO_RELEASE_VERSION = '2.6.109';
  ULTIBO_RELEASE_VERSION_MAJOR = 2;
  ULTIBO_RELEASE_VERSION_MINOR = 6;
- ULTIBO_RELEASE_VERSION_REVISION = 107;
+ ULTIBO_RELEASE_VERSION_REVISION = 109;
 
  FPC_COMPILER_VERSION = {$I %FPCVERSION%}; {The version of FPC used to compile the RTL}
 

source/rtl/ultibo/core/globalsock.pas

@@ -1535,6 +1535,8 @@ function SequenceGEQ(A,B:LongInt):Boolean; inline;
 
 function ProtocolToString(Protocol:Word):String;
 
+function SocketErrorToString(Error:LongInt):String;
+
 {==============================================================================}
 {==============================================================================}
 
@@ -1667,6 +1669,100 @@ function ProtocolToString(Protocol:Word):String;
  end;
 end;
 
+{==============================================================================}
+
+function SocketErrorToString(Error:LongInt):String;
+begin
+ {}
+ Result:='';
+
+ case LongWord(Error) of {LongWord for WSA_WAIT_FAILED}
+ ERROR_SUCCESS:Result:='ERROR_SUCCESS';
+
+ WSAEINTR:Result:='WSAEINTR';
+ WSAEBADF:Result:='WSAEBADF';
+ WSAEACCES:Result:='WSAEACCES';
+ WSAEFAULT:Result:='WSAEFAULT';
+ WSAEINVAL:Result:='WSAEINVAL';
+ WSAEMFILE:Result:='WSAEMFILE';
+
+ WSAEWOULDBLOCK:Result:='WSAEWOULDBLOCK';
+ WSAEINPROGRESS:Result:='WSAEINPROGRESS';
+ WSAEALREADY:Result:='WSAEALREADY';
+ WSAENOTSOCK:Result:='WSAENOTSOCK';
+ WSAEDESTADDRREQ:Result:='WSAEDESTADDRREQ';
+ WSAEMSGSIZE:Result:='WSAEMSGSIZE';
+ WSAEPROTOTYPE:Result:='WSAEPROTOTYPE';
+ WSAENOPROTOOPT:Result:='WSAENOPROTOOPT';
+ WSAEPROTONOSUPPORT:Result:='WSAEPROTONOSUPPORT';
+ WSAESOCKTNOSUPPORT:Result:='WSAESOCKTNOSUPPORT';
+ WSAEOPNOTSUPP:Result:='WSAEOPNOTSUPP';
+ WSAEPFNOSUPPORT:Result:='WSAEPFNOSUPPORT';
+ WSAEAFNOSUPPORT:Result:='WSAEAFNOSUPPORT';
+ WSAEADDRINUSE:Result:='WSAEADDRINUSE';
+ WSAEADDRNOTAVAIL:Result:='WSAEADDRNOTAVAIL';
+ WSAENETDOWN:Result:='WSAENETDOWN';
+ WSAENETUNREACH:Result:='WSAENETUNREACH';
+ WSAENETRESET:Result:='WSAENETRESET';
+ WSAECONNABORTED:Result:='WSAECONNABORTED';
+ WSAECONNRESET:Result:='WSAECONNRESET';
+ WSAENOBUFS:Result:='WSAENOBUFS';
+ WSAEISCONN:Result:='WSAEISCONN';
+ WSAENOTCONN:Result:='WSAENOTCONN';
+ WSAESHUTDOWN:Result:='WSAESHUTDOWN';
+ WSAETOOMANYREFS:Result:='WSAETOOMANYREFS';
+ WSAETIMEDOUT:Result:='WSAETIMEDOUT';
+ WSAECONNREFUSED:Result:='WSAECONNREFUSED';
+ WSAELOOP:Result:='WSAELOOP';
+ WSAENAMETOOLONG:Result:='WSAENAMETOOLONG';
+ WSAEHOSTDOWN:Result:='WSAEHOSTDOWN';
+ WSAEHOSTUNREACH:Result:='WSAEHOSTUNREACH';
+ WSAENOTEMPTY:Result:='WSAENOTEMPTY';
+ WSAEPROCLIM:Result:='WSAEPROCLIM';
+ WSAEUSERS:Result:='WSAEUSERS';
+ WSAEDQUOT:Result:='WSAEDQUOT';
+ WSAESTALE:Result:='WSAESTALE';
+ WSAEREMOTE:Result:='WSAEREMOTE';
+
+ WSASYSNOTREADY:Result:='WSASYSNOTREADY';
+ WSAVERNOTSUPPORTED:Result:='WSAVERNOTSUPPORTED';
+ WSANOTINITIALISED:Result:='WSANOTINITIALISED';
+ WSAEDISCON:Result:='WSAEDISCON';
+ WSAENOMORE:Result:='WSAENOMORE';
+ WSAECANCELLED:Result:='WSAECANCELLED';
+ WSAEINVALIDPROCTABLE:Result:='WSAEINVALIDPROCTABLE';
+ WSAEINVALIDPROVIDER:Result:='WSAEINVALIDPROVIDER';
+ WSAEPROVIDERFAILEDINIT:Result:='WSAEPROVIDERFAILEDINIT';
+ WSASYSCALLFAILURE:Result:='WSASYSCALLFAILURE';
+ WSASERVICE_NOT_FOUND:Result:='WSASERVICE_NOT_FOUND';
+ WSATYPE_NOT_FOUND:Result:='WSATYPE_NOT_FOUND';
+ WSA_E_NO_MORE:Result:='WSA_E_NO_MORE';
+ WSA_E_CANCELLED:Result:='WSA_E_CANCELLED';
+ WSAEREFUSED:Result:='WSAEREFUSED';
+
+ WSAHOST_NOT_FOUND:Result:='WSAHOST_NOT_FOUND';
+ WSATRY_AGAIN:Result:='WSATRY_AGAIN';
+ WSANO_RECOVERY:Result:='WSANO_RECOVERY';
+ WSANO_DATA:Result:='WSANO_DATA';
+ {WSANO_ADDRESS:Result:='WSANO_ADDRESS';}
+
+ {WinSock 2 extensions}
+ WSA_IO_PENDING:Result:='WSA_IO_PENDING';
+ WSA_IO_INCOMPLETE:Result:='WSA_IO_INCOMPLETE';
+ WSA_INVALID_HANDLE:Result:='WSA_INVALID_HANDLE';
+ WSA_INVALID_PARAMETER:Result:='WSA_INVALID_PARAMETER';
+ WSA_NOT_ENOUGH_MEMORY:Result:='WSA_NOT_ENOUGH_MEMORY';
+ WSA_OPERATION_ABORTED:Result:='WSA_OPERATION_ABORTED';
+ {WSA_INVALID_EVENT:Result:='WSA_INVALID_EVENT';}
+ WSA_MAXIMUM_WAIT_EVENTS:Result:='WSA_MAXIMUM_WAIT_EVENTS';
+ WSA_WAIT_FAILED:Result:='WSA_WAIT_FAILED';
+ {WSA_WAIT_EVENT_0:Result:='WSA_WAIT_EVENT_0';}
+ WSA_WAIT_IO_COMPLETION:Result:='WSA_WAIT_IO_COMPLETION';
+ WSA_WAIT_TIMEOUT:Result:='WSA_WAIT_TIMEOUT';
+ {WSA_INFINITE:Result:='WSA_INFINITE';}
+ end;
+end;
+
 {==============================================================================}
 {==============================================================================}
 

source/rtl/ultibo/core/winsock.pas

@@ -4109,66 +4109,7 @@ function WinsockRedirectOutput(s:TSocket):Boolean;
 function WinsockErrorToString(AError:LongInt):String;
 begin
  {}
- Result:='';
- case AError of
- ERROR_SUCCESS:Result:='ERROR_SUCCESS';
-
- WSAEINTR:Result:='WSAEINTR';
- WSAEBADF:Result:='WSAEBADF';
- WSAEACCES:Result:='WSAEACCES';
- WSAEFAULT:Result:='WSAEFAULT';
- WSAEINVAL:Result:='WSAEINVAL';
- WSAEMFILE:Result:='WSAEMFILE';
-
- WSAEWOULDBLOCK:Result:='WSAEWOULDBLOCK';
- WSAEINPROGRESS:Result:='WSAEINPROGRESS';
- WSAEALREADY:Result:='WSAEALREADY';
- WSAENOTSOCK:Result:='WSAENOTSOCK';
- WSAEDESTADDRREQ:Result:='WSAEDESTADDRREQ';
- WSAEMSGSIZE:Result:='WSAEMSGSIZE';
- WSAEPROTOTYPE:Result:='WSAEPROTOTYPE';
- WSAENOPROTOOPT:Result:='WSAENOPROTOOPT';
- WSAEPROTONOSUPPORT:Result:='WSAEPROTONOSUPPORT';
- WSAESOCKTNOSUPPORT:Result:='WSAESOCKTNOSUPPORT';
- WSAEOPNOTSUPP:Result:='WSAEOPNOTSUPP';
- WSAEPFNOSUPPORT:Result:='WSAEPFNOSUPPORT';
- WSAEAFNOSUPPORT:Result:='WSAEAFNOSUPPORT';
- WSAEADDRINUSE:Result:='WSAEADDRINUSE';
- WSAEADDRNOTAVAIL:Result:='WSAEADDRNOTAVAIL';
- WSAENETDOWN:Result:='WSAENETDOWN';
- WSAENETUNREACH:Result:='WSAENETUNREACH';
- WSAENETRESET:Result:='WSAENETRESET';
- WSAECONNABORTED:Result:='WSAECONNABORTED';
- WSAECONNRESET:Result:='WSAECONNRESET';
- WSAENOBUFS:Result:='WSAENOBUFS';
- WSAEISCONN:Result:='WSAEISCONN';
- WSAENOTCONN:Result:='WSAENOTCONN';
- WSAESHUTDOWN:Result:='WSAESHUTDOWN';
- WSAETOOMANYREFS:Result:='WSAETOOMANYREFS';
- WSAETIMEDOUT:Result:='WSAETIMEDOUT';
- WSAECONNREFUSED:Result:='WSAECONNREFUSED';
- WSAELOOP:Result:='WSAELOOP';
- WSAENAMETOOLONG:Result:='WSAENAMETOOLONG';
- WSAEHOSTDOWN:Result:='WSAEHOSTDOWN';
- WSAEHOSTUNREACH:Result:='WSAEHOSTUNREACH';
- WSAENOTEMPTY:Result:='WSAENOTEMPTY';
- WSAEPROCLIM:Result:='WSAEPROCLIM';
- WSAEUSERS:Result:='WSAEUSERS';
- WSAEDQUOT:Result:='WSAEDQUOT';
- WSAESTALE:Result:='WSAESTALE';
- WSAEREMOTE:Result:='WSAEREMOTE';
-
- WSASYSNOTREADY:Result:='WSASYSNOTREADY';
- WSAVERNOTSUPPORTED:Result:='WSAVERNOTSUPPORTED';
- WSANOTINITIALISED:Result:='WSANOTINITIALISED';
- WSAEDISCON:Result:='WSAEDISCON';
-
- WSAHOST_NOT_FOUND:Result:='WSAHOST_NOT_FOUND';
- WSATRY_AGAIN:Result:='WSATRY_AGAIN';
- WSANO_RECOVERY:Result:='WSANO_RECOVERY';
- WSANO_DATA:Result:='WSANO_DATA';
- {WSANO_ADDRESS:Result:='WSANO_ADDRESS';}
- end;
+ Result:=SocketErrorToString(AError);
 end;
 
 {==============================================================================}