unimportant DOS fix

[wxWidgets.git] / src / unix / gsocket.c

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index e26f4fb5a3d4f5828847ad1471035b8f07703e8d..0da32b61eb9741d64628d705b87af43a80b9bc57 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -25,7 +25,8 @@
 
 #ifdef __VMS__
 #include <socket.h>
-struct sockaddr_un {
+struct sockaddr_un
+{
     u_char  sun_len;        /* sockaddr len including null */
     u_char  sun_family;     /* AF_UNIX */
     char    sun_path[108];  /* path name (gag) */
@@ -115,16 +116,16 @@ struct sockaddr_un {
 
 /* debugging helpers */
 #ifdef __GSOCKET_DEBUG__
-    #define GSocket_Debug(args)       printf args
+#  define GSocket_Debug(args) printf args
 #else
-    #define GSocket_Debug(args)
-#endif // __GSOCKET_DEBUG__
+#  define GSocket_Debug(args)
+#endif /* __GSOCKET_DEBUG__ */
 
 /* Global initialisers */
 
-bool GSocket_Init(void)
+int GSocket_Init(void)
 {
-  return TRUE;
+  return 1;
 }
 
 void GSocket_Cleanup(void)
@@ -350,7 +351,6 @@ GAddress *GSocket_GetPeer(GSocket *socket)
  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {
-  int type;
   int arg = 1;
 
   assert(sck != NULL);
@@ -895,7 +895,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);
 
@@ -1242,22 +1242,38 @@ void _GSocket_Detected_Write(GSocket *socket)
  * -------------------------------------------------------------------------
  */
 
-/* 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;
@@ -1372,7 +1388,8 @@ GSocketError _GAddress_translate_to(GAddress *address,
 
   *len = address->m_len;
   *addr = (struct sockaddr *)malloc(address->m_len);
-  if (*addr == NULL) {
+  if (*addr == NULL)
+  {
     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
@@ -1412,7 +1429,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);
 
@@ -1456,7 +1473,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;
@@ -1471,7 +1488,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)
   {
@@ -1482,7 +1499,9 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   se = getservbyname(port, protocol);
   if (!se)
   {
-    if (isdigit(port[0]))
+    /* the cast to int suppresses compiler warnings about subscript having the
+       type char */
+    if (isdigit((int)port[0]))
     {
       int port_int;
 
@@ -1507,7 +1526,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);
@@ -1522,7 +1541,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);
@@ -1544,7 +1563,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;
 
@@ -1556,7 +1575,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);
@@ -1583,7 +1602,7 @@ GSocketError _GAddress_Init_UNIX(GAddress *address)
   ((struct sockaddr_un *)address->m_addr)->sun_family = AF_UNIX;
   ((struct sockaddr_un *)address->m_addr)->sun_path[0] = 0;
 
-  return TRUE;
+  return GSOCK_NOERROR;
 }
 
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
@@ -1592,7 +1611,7 @@ GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 
   assert(address != NULL); 
 
-  CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR); 
+  CHECK_ADDRESS(address, UNIX); 
 
   addr = ((struct sockaddr_un *)address->m_addr);
   memcpy(addr->sun_path, path, strlen(path));
@@ -1605,7 +1624,7 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
   struct sockaddr_un *addr;
 
   assert(address != NULL);
-  CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, UNIX);
 
   addr = (struct sockaddr_un *)address->m_addr;