X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a9c22462aec446d06267ac10b99f1115704b9d1..28be2e8a170979d476a5ea4f585505b8a2f5af27:/src/msw/gsocket.c

diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index eb4d669270..60d2c3f417 100644
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -11,16 +11,24 @@
  * PLEASE don't put C++ comments here - this is a C source file.
  */
 
-/* including rasasync.h (included from windows.h itself included from
- * wx/setup.h and/or winsock.h results in this warning for
- * RPCNOTIFICATION_ROUTINE
- */
 #ifdef _MSC_VER
-#  pragma warning(disable:4115) /* named type definition in parentheses */
-#endif
+   /* RPCNOTIFICATION_ROUTINE in rasasync.h (included from winsock.h),
+    * warning: conditional expression is constant.
+    */
+#  pragma warning(disable:4115)
+   /* FD_SET,
+    * warning: named type definition in parentheses.
+    */
+#  pragma warning(disable:4127)
+   /* GAddress_UNIX_GetPath,
+    * warning: unreferenced formal parameter.
+    */
+#  pragma warning(disable:4100)
+#endif /* _MSC_VER */
+
 
 #ifndef __GSOCKET_STANDALONE__
-#include "wx/setup.h"
+#  include "wx/setup.h"
 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
@@ -33,9 +41,9 @@
 #  include "gsocket.h"
 #endif /* __GSOCKET_STANDALONE__ */
 
-/* redefine some GUI-only functions to do nothing in console mode */
+/* Redefine some GUI-only functions to do nothing in console mode */
 #if defined(wxUSE_GUI) && !wxUSE_GUI
-#  define _GSocket_GUI_Init(socket) 1
+#  define _GSocket_GUI_Init(socket) (1)
 #  define _GSocket_GUI_Destroy(socket)
 #  define _GSocket_Enable_Events(socket)
 #  define _GSocket_Disable_Events(socket)
@@ -51,20 +59,12 @@
 
 #include <winsock.h>
 
-#ifdef _MSC_VER
-#  pragma warning(default:4115) /* named type definition in parentheses */
-#endif
 
 /* if we use configure for MSW SOCKLEN_T will be already defined */
 #ifndef SOCKLEN_T
 #  define SOCKLEN_T int
 #endif
 
-/* using FD_SET results in this warning */
-#ifdef _MSC_VER
-#  pragma warning(disable:4127) /* conditional expression is constant */
-#endif
-
 
 /* Constructors / Destructors for GSocket */
 
@@ -97,7 +97,7 @@ GSocket *GSocket_new(void)
   if (!success)
   {
     free(socket);
-    return NULL;
+    socket = NULL;
   }
 
   return socket;
@@ -768,7 +768,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
  *  Sets the socket to non-blocking mode. All IO calls will return
  *  immediately.
  */
-void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
+void GSocket_SetNonBlocking(GSocket *socket, int non_block)
 {
   assert(socket != NULL);
 
@@ -1015,22 +1015,38 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
  * -------------------------------------------------------------------------
  */
 
-/* CHECK_ADDRESS verifies that the current family is either GSOCK_NOFAMILY
- * or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it initalizes address
- * to be a GSOCK_*family*. In other cases, it returns GSOCK_INVADDR.
+/* CHECK_ADDRESS verifies that the current address family is either
+ * GSOCK_NOFAMILY or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it
+ * initalizes it to be a GSOCK_*family*. In other cases, it returns
+ * an appropiate error code.
+ *
+ * CHECK_ADDRESS_RETVAL does the same but returning 'retval' on error.
  */
-#define CHECK_ADDRESS(address, family, retval)                      \
+#define CHECK_ADDRESS(address, family)                              \
 {                                                                   \
   if (address->m_family == GSOCK_NOFAMILY)                          \
     if (_GAddress_Init_##family(address) != GSOCK_NOERROR)          \
       return address->m_error;                                      \
   if (address->m_family != GSOCK_##family)                          \
+  {                                                                 \
+    address->m_error = GSOCK_INVADDR;                               \
+    return GSOCK_INVADDR;                                           \
+  }                                                                 \
+}
+
+#define CHECK_ADDRESS_RETVAL(address, family, retval)               \
+{                                                                   \
+  if (address->m_family == GSOCK_NOFAMILY)                          \
+    if (_GAddress_Init_##family(address) != GSOCK_NOERROR)          \
+      return retval;                                                \
+  if (address->m_family != GSOCK_##family)                          \
   {                                                                 \
     address->m_error = GSOCK_INVADDR;                               \
     return retval;                                                  \
   }                                                                 \
 }
 
+
 GAddress *GAddress_new(void)
 {
   GAddress *address;
@@ -1074,7 +1090,9 @@ void GAddress_destroy(GAddress *address)
 {
   assert(address != NULL);
 
-  free(address->m_addr);
+  if (address->m_addr)
+    free(address->m_addr);
+
   free(address);
 }
 
@@ -1184,7 +1202,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
 
   assert(address != NULL);
 
-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
 
@@ -1220,7 +1238,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
 
   assert(address != NULL);
 
-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   addr->s_addr = hostaddr;
@@ -1235,7 +1253,7 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   struct sockaddr_in *addr;
 
   assert(address != NULL);
-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);
 
   if (!port)
   {
@@ -1271,7 +1289,7 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
   struct sockaddr_in *addr;
 
   assert(address != NULL);
-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);
 
   addr = (struct sockaddr_in *)address->m_addr;
   addr->sin_port = htons(port);
@@ -1286,7 +1304,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   struct sockaddr_in *addr;
 
   assert(address != NULL);
-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);
 
   addr = (struct sockaddr_in *)address->m_addr;
   addr_buf = (char *)&(addr->sin_addr);
@@ -1308,7 +1326,7 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
   struct sockaddr_in *addr;
 
   assert(address != NULL);
-  CHECK_ADDRESS(address, INET, 0);
+  CHECK_ADDRESS_RETVAL(address, INET, 0);
 
   addr = (struct sockaddr_in *)address->m_addr;
 
@@ -1320,7 +1338,7 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
   struct sockaddr_in *addr;
 
   assert(address != NULL);
-  CHECK_ADDRESS(address, INET, 0);
+  CHECK_ADDRESS_RETVAL(address, INET, 0);
 
   addr = (struct sockaddr_in *)address->m_addr;
   return ntohs(addr->sin_port);
@@ -1332,10 +1350,6 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
  * -------------------------------------------------------------------------
  */
 
-#ifdef _MSC_VER
-    #pragma warning(disable:4100) /* unreferenced formal parameter */
-#endif /* Visual C++ */
-
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
   assert (address != NULL);