Commit: 2821f57617d6ce94e7cfb218a9fc88559bd6260f - mingw-org-wsl (git)

The MinGW.org Windows System Libraries

Commit MetaInfo

• Revision: 2821f57617d6ce94e7cfb218a9fc88559bd6260f (tree)
• Time: 2020-07-06 06:32:09
• Author: Keith Marshall <keith@user...>
• Commiter: Keith Marshall

Log Message

Revert typedef of socklen_t to signed int type.

Change Summary

• modified: w32api/ChangeLog
• modified: w32api/include/ws2tcpip.h
• modified: w32api/include/wspiapi.h

Incremental Difference

--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,3 +1,13 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Revert typedef of socklen_t to signed int type.
+
+	* include/ws2tcpip.h (socklen_t): Change from unsigned int to int.
+
+	* include/wspiapi.h (__wspiapi_getnameinfo): In comparison...
+	[len < sizeof(struct sockaddr)]: ...cast RHS to socklen_t, which is
+	the type of len, to ensure type consistency.
+
 2020-06-03  Keith Marshall  <[e-mail]>
 
 	Prepare and publish MinGW.org WSL-5.3.3 release.

--- a/w32api/include/ws2tcpip.h
+++ b/w32api/include/ws2tcpip.h
@@ -396,7 +396,7 @@ extern const struct in6_addr in6addr_loopback;
 	 ) == 0							\
  )
 
-typedef unsigned int socklen_t;
+typedef int socklen_t;
 
 typedef
 struct ipv6_mreq

--- a/w32api/include/wspiapi.h
+++ b/w32api/include/wspiapi.h
@@ -914,7 +914,7 @@ WSAAPI int __wspiapi_getnameinfo
    * Microsoft's invalid parameter handler, while reporting it as an
    * EAI_SYSTEM exception.
    */
-  if( (sa == NULL) || (len < sizeof( struct sockaddr )) )
+  if( (sa == NULL) || (len < (socklen_t)(sizeof( struct sockaddr ))) )
     return __wspiapi_syserrout( EINVAL );
 
   { /* When the "sa" argument is valid, we delegate the call to the