Various changes to make pop up menus work

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

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index a36e36e8f6450fd1f083cf060e6437d84138bfbb..0da32b61eb9741d64628d705b87af43a80b9bc57 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -25,7 +25,8 @@
 
 #ifdef __VMS__
 #include <socket.h>
 
 #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) */
     u_char  sun_len;        /* sockaddr len including null */
     u_char  sun_family;     /* AF_UNIX */
     char    sun_path[108];  /* path name (gag) */


@@ -60,7 +61,7 @@ struct sockaddr_un {
 #else
 #  ifdef __GLIBC__
 #    if __GLIBC__ == 2
 #else
 #  ifdef __GLIBC__
 #    if __GLIBC__ == 2

-#       define SOCKLEN_T socklen_t
+#      define SOCKLEN_T socklen_t

 #    endif
 #  else
 #    define SOCKLEN_T int
 #    endif
 #  else
 #    define SOCKLEN_T int


@@ -69,10 +70,16 @@ struct sockaddr_un {
 
 #endif /* SOCKLEN_T */
 
 
 #endif /* SOCKLEN_T */
 

+/*
+ * MSW defines this, Unices don't.
+ */
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#endif

 
 /*
  * INADDR_BROADCAST is identical to INADDR_NONE which is not defined
 
 /*
  * INADDR_BROADCAST is identical to INADDR_NONE which is not defined

- * on all unices. INADDR_BROADCAST should be fine to indicate an error.
+ * on all systems. INADDR_BROADCAST should be fine to indicate an error.

  */
 #ifndef INADDR_NONE
 #define INADDR_NONE INADDR_BROADCAST
  */
 #ifndef INADDR_NONE
 #define INADDR_NONE INADDR_BROADCAST


@@ -109,16 +116,16 @@ struct sockaddr_un {
 
 /* debugging helpers */
 #ifdef __GSOCKET_DEBUG__
 
 /* debugging helpers */
 #ifdef __GSOCKET_DEBUG__

-    #define GSocket_Debug(args)       printf args
+#  define GSocket_Debug(args) printf args

 #else
 #else

-    #define GSocket_Debug(args)
-#endif // __GSOCKET_DEBUG__
+#  define GSocket_Debug(args)
+#endif /* __GSOCKET_DEBUG__ */

 
 /* Global initialisers */
 
 
 /* Global initialisers */
 

-bool GSocket_Init(void)
+int GSocket_Init(void)

 {
 {

-  return TRUE;
+  return 1;

 }
 
 void GSocket_Cleanup(void)
 }
 
 void GSocket_Cleanup(void)


@@ -137,7 +144,7 @@ GSocket *GSocket_new(void)
   if (socket == NULL)
     return NULL;
 
   if (socket == NULL)
     return NULL;
 

-  socket->m_fd                  = -1;
+  socket->m_fd                  = INVALID_SOCKET;

   for (i=0;i<GSOCK_MAX_EVENT;i++)
   {
     socket->m_cbacks[i]         = NULL;
   for (i=0;i<GSOCK_MAX_EVENT;i++)
   {
     socket->m_cbacks[i]         = NULL;


@@ -170,7 +177,7 @@ void GSocket_destroy(GSocket *socket)
   assert(socket != NULL);
 
   /* Check that the socket is really shutdowned */
   assert(socket != NULL);
 
   /* Check that the socket is really shutdowned */

-  if (socket->m_fd != -1)
+  if (socket->m_fd != INVALID_SOCKET)

     GSocket_Shutdown(socket);
 
   /* Per-socket GUI-specific cleanup */
     GSocket_Shutdown(socket);
 
   /* Per-socket GUI-specific cleanup */


@@ -198,11 +205,11 @@ void GSocket_Shutdown(GSocket *socket)
   assert(socket != NULL);
 
   /* If socket has been created, shutdown it */
   assert(socket != NULL);
 
   /* If socket has been created, shutdown it */

-  if (socket->m_fd != -1)
+  if (socket->m_fd != INVALID_SOCKET)

   {
     shutdown(socket->m_fd, 2);
     close(socket->m_fd);
   {
     shutdown(socket->m_fd, 2);
     close(socket->m_fd);

-    socket->m_fd = -1;
+    socket->m_fd = INVALID_SOCKET;

   }
 
   /* Disable GUI callbacks */
   }
 
   /* Disable GUI callbacks */


@@ -234,7 +241,7 @@ GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
   assert(socket != NULL);
 
   /* the socket must be initialized, or it must be a server */
   assert(socket != NULL);
 
   /* the socket must be initialized, or it must be a server */

-  if ((socket->m_fd != -1 && !socket->m_server))
+  if ((socket->m_fd != INVALID_SOCKET && !socket->m_server))

   {
     socket->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;
   {
     socket->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;


@@ -288,7 +295,7 @@ GAddress *GSocket_GetLocal(GSocket *socket)
     return GAddress_copy(socket->m_local);
 
   /* else, if the socket is initialized, try getsockname */
     return GAddress_copy(socket->m_local);
 
   /* else, if the socket is initialized, try getsockname */

-  if (socket->m_fd == -1)
+  if (socket->m_fd == INVALID_SOCKET)

   {
     socket->m_error = GSOCK_INVSOCK;
     return NULL;
   {
     socket->m_error = GSOCK_INVSOCK;
     return NULL;


@@ -344,13 +351,12 @@ GAddress *GSocket_GetPeer(GSocket *socket)
  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {
  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {

-  int type;

   int arg = 1;
 
   assert(sck != NULL);
 
   /* must not be in use */
   int arg = 1;
 
   assert(sck != NULL);
 
   /* must not be in use */

-  if (sck->m_fd != -1)
+  if (sck->m_fd != INVALID_SOCKET)

   {
     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;
   {
     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;


@@ -371,7 +377,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
   /* Create the socket */
   sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);
 
   /* Create the socket */
   sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);
 

-  if (sck->m_fd == -1)
+  if (sck->m_fd == INVALID_SOCKET)

   {
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   {
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;


@@ -391,7 +397,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
       (listen(sck->m_fd, 5) != 0))
   {
     close(sck->m_fd);
       (listen(sck->m_fd, 5) != 0))
   {
     close(sck->m_fd);

-    sck->m_fd = -1;
+    sck->m_fd = INVALID_SOCKET;

     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }


@@ -425,7 +431,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
   _GSocket_Enable(socket, GSOCK_CONNECTION);
 
   /* If the socket has already been created, we exit immediately */
   _GSocket_Enable(socket, GSOCK_CONNECTION);
 
   /* If the socket has already been created, we exit immediately */

-  if (socket->m_fd == -1 || !socket->m_server)
+  if (socket->m_fd == INVALID_SOCKET || !socket->m_server)

   {
     socket->m_error = GSOCK_INVSOCK;
     return NULL;
   {
     socket->m_error = GSOCK_INVSOCK;
     return NULL;


@@ -450,7 +456,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
 
   connection->m_fd = accept(socket->m_fd, &from, (SOCKLEN_T *) &fromlen);
 
 
   connection->m_fd = accept(socket->m_fd, &from, (SOCKLEN_T *) &fromlen);
 

-  if (connection->m_fd == -1)
+  if (connection->m_fd == INVALID_SOCKET)

   {
     if (errno == EWOULDBLOCK)
       socket->m_error = GSOCK_WOULDBLOCK;
   {
     if (errno == EWOULDBLOCK)
       socket->m_error = GSOCK_WOULDBLOCK;


@@ -489,71 +495,6 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
   return connection;
 }
 
   return connection;
 }
 

-/* Datagram sockets */
-
-/* GSocket_SetNonOriented:
- *  Sets up this socket as a non-connection oriented (datagram) socket.
- *  Before using this function, the local address must have been set
- *  with GSocket_SetLocal(), or the call will fail. Returns GSOCK_NOERROR
- *  on success, or one of the following otherwise.
- *
- *  Error codes:
- *    GSOCK_INVSOCK - the socket is in use.
- *    GSOCK_INVADDR - the local address has not been set.
- *    GSOCK_IOERR   - low-level error.
- */
-GSocketError GSocket_SetNonOriented(GSocket *sck)
-{
-  int arg = 1;
-
-  assert(sck != NULL);
-
-  if (sck->m_fd != -1)
-  {
-    sck->m_error = GSOCK_INVSOCK;
-    return GSOCK_INVSOCK;
-  }
-
-  if (!sck->m_local)
-  {
-    sck->m_error = GSOCK_INVADDR;
-    return GSOCK_INVADDR;
-  }
-
-  /* Initialize all fields */
-  sck->m_stream   = FALSE;
-  sck->m_server   = FALSE;
-  sck->m_oriented = FALSE;
-
-  /* Create the socket */
-  sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0);
-
-  if (sck->m_fd < 0)
-  {
-    sck->m_error = GSOCK_IOERR;
-    return GSOCK_IOERR;
-  }
-
-  ioctl(sck->m_fd, FIONBIO, &arg);
-  _GSocket_Enable_Events(sck);
-
-  /* Bind to the local address,
-   * and retrieve the actual address bound.
-   */
-  if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
-      (getsockname(sck->m_fd,
-                   sck->m_local->m_addr,
-                   (SOCKLEN_T *) &sck->m_local->m_len) != 0))
-  {
-    close(sck->m_fd);
-    sck->m_fd    = -1;
-    sck->m_error = GSOCK_IOERR;
-    return GSOCK_IOERR;
-  }
-
-  return GSOCK_NOERROR;
-}
-

 /* Client specific parts */
 
 /* GSocket_Connect:
 /* Client specific parts */
 
 /* GSocket_Connect:


@@ -589,7 +530,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
   /* Enable CONNECTION events (needed for nonblocking connections) */
   _GSocket_Enable(sck, GSOCK_CONNECTION);
 
   /* Enable CONNECTION events (needed for nonblocking connections) */
   _GSocket_Enable(sck, GSOCK_CONNECTION);
 

-  if (sck->m_fd != -1)
+  if (sck->m_fd != INVALID_SOCKET)

   {
     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;
   {
     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;


@@ -611,7 +552,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
   sck->m_fd = socket(sck->m_peer->m_realfamily,
                      sck->m_stream? SOCK_STREAM : SOCK_DGRAM, 0);
 
   sck->m_fd = socket(sck->m_peer->m_realfamily,
                      sck->m_stream? SOCK_STREAM : SOCK_DGRAM, 0);
 

-  if (sck->m_fd == -1)
+  if (sck->m_fd == INVALID_SOCKET)

   {
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   {
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;


@@ -637,7 +578,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {
         close(sck->m_fd);
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {
         close(sck->m_fd);

-        sck->m_fd = -1;
+        sck->m_fd = INVALID_SOCKET;

         /* sck->m_error is set in _GSocket_Output_Timeout */
         return GSOCK_TIMEDOUT;
       }
         /* sck->m_error is set in _GSocket_Output_Timeout */
         return GSOCK_TIMEDOUT;
       }


@@ -670,7 +611,72 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
      * then the call to GSocket_Connect has failed.
      */
     close(sck->m_fd);
      * then the call to GSocket_Connect has failed.
      */
     close(sck->m_fd);

-    sck->m_fd = -1;
+    sck->m_fd = INVALID_SOCKET;
+    sck->m_error = GSOCK_IOERR;
+    return GSOCK_IOERR;
+  }
+
+  return GSOCK_NOERROR;
+}
+
+/* Datagram sockets */
+
+/* GSocket_SetNonOriented:
+ *  Sets up this socket as a non-connection oriented (datagram) socket.
+ *  Before using this function, the local address must have been set
+ *  with GSocket_SetLocal(), or the call will fail. Returns GSOCK_NOERROR
+ *  on success, or one of the following otherwise.
+ *
+ *  Error codes:
+ *    GSOCK_INVSOCK - the socket is in use.
+ *    GSOCK_INVADDR - the local address has not been set.
+ *    GSOCK_IOERR   - low-level error.
+ */
+GSocketError GSocket_SetNonOriented(GSocket *sck)
+{
+  int arg = 1;
+
+  assert(sck != NULL);
+
+  if (sck->m_fd != INVALID_SOCKET)
+  {
+    sck->m_error = GSOCK_INVSOCK;
+    return GSOCK_INVSOCK;
+  }
+
+  if (!sck->m_local)
+  {
+    sck->m_error = GSOCK_INVADDR;
+    return GSOCK_INVADDR;
+  }
+
+  /* Initialize all fields */
+  sck->m_stream   = FALSE;
+  sck->m_server   = FALSE;
+  sck->m_oriented = FALSE;
+
+  /* Create the socket */
+  sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0);
+
+  if (sck->m_fd == INVALID_SOCKET)
+  {
+    sck->m_error = GSOCK_IOERR;
+    return GSOCK_IOERR;
+  }
+
+  ioctl(sck->m_fd, FIONBIO, &arg);
+  _GSocket_Enable_Events(sck);
+
+  /* Bind to the local address,
+   * and retrieve the actual address bound.
+   */
+  if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
+      (getsockname(sck->m_fd,
+                   sck->m_local->m_addr,
+                   (SOCKLEN_T *) &sck->m_local->m_len) != 0))
+  {
+    close(sck->m_fd);
+    sck->m_fd    = INVALID_SOCKET;

     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }


@@ -690,7 +696,7 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
   /* Reenable INPUT events */
   _GSocket_Enable(socket, GSOCK_INPUT);
 
   /* Reenable INPUT events */
   _GSocket_Enable(socket, GSOCK_INPUT);
 

-  if (socket->m_fd == -1 || socket->m_server)
+  if (socket->m_fd == INVALID_SOCKET || socket->m_server)

   {
     socket->m_error = GSOCK_INVSOCK;
     return -1;
   {
     socket->m_error = GSOCK_INVSOCK;
     return -1;


@@ -725,7 +731,7 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
   
   GSocket_Debug(( "GSocket_Write #1, size %d\n", size ));
 
   
   GSocket_Debug(( "GSocket_Write #1, size %d\n", size ));
 

-  if (socket->m_fd == -1 || socket->m_server)
+  if (socket->m_fd == INVALID_SOCKET || socket->m_server)

   {
     socket->m_error = GSOCK_INVSOCK;
     return -1;
   {
     socket->m_error = GSOCK_INVSOCK;
     return -1;


@@ -889,10 +895,12 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
  *  Sets the socket to non-blocking mode. All IO calls will return
  *  immediately.
  */
  *  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);
 
 {
   assert(socket != NULL);
 

+  GSocket_Debug( ("GSocket_SetNonBlocking: %d\n", (int)non_block) );
+

   socket->m_non_blocking = non_block;
 }
 
   socket->m_non_blocking = non_block;
 }
 


@@ -1059,6 +1067,8 @@ GSocketError _GSocket_Output_Timeout(GSocket *socket)
   tv.tv_sec  = (socket->m_timeout / 1000);
   tv.tv_usec = (socket->m_timeout % 1000) * 1000;
 
   tv.tv_sec  = (socket->m_timeout / 1000);
   tv.tv_usec = (socket->m_timeout % 1000) * 1000;
 

+  GSocket_Debug( ("m_non_blocking has: %d\n", (int)socket->m_non_blocking) );
+

   if (!socket->m_non_blocking)
   {
     FD_ZERO(&writefds);
   if (!socket->m_non_blocking)
   {
     FD_ZERO(&writefds);


@@ -1080,7 +1090,16 @@ GSocketError _GSocket_Output_Timeout(GSocket *socket)
       socket->m_error = GSOCK_TIMEDOUT;
       return GSOCK_TIMEDOUT;
     }
       socket->m_error = GSOCK_TIMEDOUT;
       return GSOCK_TIMEDOUT;
     }

+    if ( ! FD_ISSET(socket->m_fd, &writefds) )
+      GSocket_Debug(( "GSocket_Output_Timeout is buggy!\n" ));
+    else
+      GSocket_Debug(( "GSocket_Output_Timeout seems correct\n" ));

   }
   }

+  else
+  {
+    GSocket_Debug(( "GSocket_Output_Timeout, didn't try select!\n" ));
+  }
+

   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 


@@ -1223,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)                          \
 {                                                                   \
   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;                                                  \
   }                                                                 \
 }
 
   {                                                                 \
     address->m_error = GSOCK_INVADDR;                               \
     return retval;                                                  \
   }                                                                 \
 }
 

+

 GAddress *GAddress_new(void)
 {
   GAddress *address;
 GAddress *GAddress_new(void)
 {
   GAddress *address;


@@ -1353,7 +1388,8 @@ GSocketError _GAddress_translate_to(GAddress *address,
 
   *len = address->m_len;
   *addr = (struct sockaddr *)malloc(address->m_len);
 
   *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;
   }
     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }


@@ -1393,7 +1429,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
 
   assert(address != NULL);
 
 
   assert(address != NULL);
 

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);

 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
 
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
 


@@ -1437,7 +1473,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
 
   assert(address != NULL);
 
 
   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;
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   addr->s_addr = hostaddr;


@@ -1452,7 +1488,7 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   struct sockaddr_in *addr;
 
   assert(address != NULL);
   struct sockaddr_in *addr;
 
   assert(address != NULL);

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);

 
   if (!port)
   {
 
   if (!port)
   {


@@ -1463,7 +1499,9 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   se = getservbyname(port, protocol);
   if (!se)
   {
   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;
 
     {
       int port_int;
 


@@ -1488,7 +1526,7 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
   struct sockaddr_in *addr;
 
   assert(address != NULL);
   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);
  
   addr = (struct sockaddr_in *)address->m_addr;
   addr->sin_port = htons(port);


@@ -1503,7 +1541,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   struct sockaddr_in *addr;
 
   assert(address != NULL); 
   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);
 
   addr = (struct sockaddr_in *)address->m_addr;
   addr_buf = (char *)&(addr->sin_addr);


@@ -1525,7 +1563,7 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
   struct sockaddr_in *addr;
 
   assert(address != NULL); 
   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;
 
 
   addr = (struct sockaddr_in *)address->m_addr;
 


@@ -1537,7 +1575,7 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
   struct sockaddr_in *addr;
 
   assert(address != NULL); 
   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);
 
   addr = (struct sockaddr_in *)address->m_addr;
   return ntohs(addr->sin_port);


@@ -1564,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;
 
   ((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)
 }
 
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)


@@ -1573,7 +1611,7 @@ GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 
   assert(address != NULL); 
 
 
   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));
 
   addr = ((struct sockaddr_un *)address->m_addr);
   memcpy(addr->sun_path, path, strlen(path));


@@ -1586,7 +1624,7 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
   struct sockaddr_un *addr;
 
   assert(address != NULL);
   struct sockaddr_un *addr;
 
   assert(address != NULL);

-  CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, UNIX);

 
   addr = (struct sockaddr_un *)address->m_addr;
 
 
   addr = (struct sockaddr_un *)address->m_addr;